mirror of
https://github.com/linux-man/LoveFrames.git
synced 2024-11-26 05:14:21 +00:00
Fix several typos and inconsistencies
This commit is contained in:
parent
0d3010c880
commit
98c47eb9f9
2
init.lua
2
init.lua
@ -369,7 +369,7 @@ function loveframes.Create(data, parent)
|
|||||||
for k, v in pairs(t) do
|
for k, v in pairs(t) do
|
||||||
-- current default object
|
-- current default object
|
||||||
local object = validobjects[v.type]:new()
|
local object = validobjects[v.type]:new()
|
||||||
-- indert the object into the table of objects being created
|
-- insert the object into the table of objects being created
|
||||||
table.insert(objects, object)
|
table.insert(objects, object)
|
||||||
-- parent the new object by default to the base gui object
|
-- parent the new object by default to the base gui object
|
||||||
object.parent = loveframes.base
|
object.parent = loveframes.base
|
||||||
|
@ -45,7 +45,7 @@ function loveframes.util.BoundingBox(x1, x2, y1, y2, w1, w2, h1, h2)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--[[---------------------------------------------------------
|
--[[---------------------------------------------------------
|
||||||
- func: loveframes.util.GetCollisions(object, table)
|
- func: GetCollisions(object, table)
|
||||||
- desc: gets all objects colliding with the mouse
|
- desc: gets all objects colliding with the mouse
|
||||||
--]]---------------------------------------------------------
|
--]]---------------------------------------------------------
|
||||||
function loveframes.util.GetCollisions(object, t)
|
function loveframes.util.GetCollisions(object, t)
|
||||||
@ -101,7 +101,7 @@ function loveframes.util.GetCollisions(object, t)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--[[---------------------------------------------------------
|
--[[---------------------------------------------------------
|
||||||
- func: loveframes.util.GetAllObjects(object, table)
|
- func: GetAllObjects(object, table)
|
||||||
- desc: gets all active objects
|
- desc: gets all active objects
|
||||||
--]]---------------------------------------------------------
|
--]]---------------------------------------------------------
|
||||||
function loveframes.util.GetAllObjects(object, t)
|
function loveframes.util.GetAllObjects(object, t)
|
||||||
@ -254,7 +254,7 @@ function loveframes.util.RemoveAll()
|
|||||||
end
|
end
|
||||||
|
|
||||||
--[[---------------------------------------------------------
|
--[[---------------------------------------------------------
|
||||||
- func: loveframes.util.TableHasValue(table, value)
|
- func: TableHasValue(table, value)
|
||||||
- desc: checks to see if a table has a specific value
|
- desc: checks to see if a table has a specific value
|
||||||
--]]---------------------------------------------------------
|
--]]---------------------------------------------------------
|
||||||
function loveframes.util.TableHasValue(table, value)
|
function loveframes.util.TableHasValue(table, value)
|
||||||
@ -270,7 +270,7 @@ function loveframes.util.TableHasValue(table, value)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--[[---------------------------------------------------------
|
--[[---------------------------------------------------------
|
||||||
- func: loveframes.util.TableHasKey(table, key)
|
- func: TableHasKey(table, key)
|
||||||
- desc: checks to see if a table has a specific key
|
- desc: checks to see if a table has a specific key
|
||||||
--]]---------------------------------------------------------
|
--]]---------------------------------------------------------
|
||||||
function loveframes.util.TableHasKey(table, key)
|
function loveframes.util.TableHasKey(table, key)
|
||||||
@ -280,7 +280,7 @@ function loveframes.util.TableHasKey(table, key)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--[[---------------------------------------------------------
|
--[[---------------------------------------------------------
|
||||||
- func: loveframes.util.Error(message)
|
- func: Error(message)
|
||||||
- desc: displays a formatted error message
|
- desc: displays a formatted error message
|
||||||
--]]---------------------------------------------------------
|
--]]---------------------------------------------------------
|
||||||
function loveframes.util.Error(message)
|
function loveframes.util.Error(message)
|
||||||
@ -290,7 +290,7 @@ function loveframes.util.Error(message)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--[[---------------------------------------------------------
|
--[[---------------------------------------------------------
|
||||||
- func: loveframes.util.GetCollisionCount()
|
- func: GetCollisionCount()
|
||||||
- desc: gets the total number of objects colliding with
|
- desc: gets the total number of objects colliding with
|
||||||
the mouse
|
the mouse
|
||||||
--]]---------------------------------------------------------
|
--]]---------------------------------------------------------
|
||||||
@ -301,7 +301,7 @@ function loveframes.util.GetCollisionCount()
|
|||||||
end
|
end
|
||||||
|
|
||||||
--[[---------------------------------------------------------
|
--[[---------------------------------------------------------
|
||||||
- func: loveframes.util.GetHover()
|
- func: GetHover()
|
||||||
- desc: returns loveframes.hover, can be used to check
|
- desc: returns loveframes.hover, can be used to check
|
||||||
if the mouse is colliding with a visible
|
if the mouse is colliding with a visible
|
||||||
Love Frames object
|
Love Frames object
|
||||||
@ -325,7 +325,7 @@ function loveframes.util.RectangleCollisionCheck(rect1, rect2)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--[[---------------------------------------------------------
|
--[[---------------------------------------------------------
|
||||||
- func: loveframes.util.DeepCopy(orig)
|
- func: DeepCopy(orig)
|
||||||
- desc: copies a table
|
- desc: copies a table
|
||||||
- note: I take not credit for this function
|
- note: I take not credit for this function
|
||||||
--]]---------------------------------------------------------
|
--]]---------------------------------------------------------
|
||||||
@ -345,7 +345,7 @@ function loveframes.util.DeepCopy(orig)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--[[---------------------------------------------------------
|
--[[---------------------------------------------------------
|
||||||
- func: loveframes.util.GetHoverObject()
|
- func: GetHoverObject()
|
||||||
- desc: returns loveframes.hoverobject
|
- desc: returns loveframes.hoverobject
|
||||||
--]]---------------------------------------------------------
|
--]]---------------------------------------------------------
|
||||||
function loveframes.util.GetHoverObject()
|
function loveframes.util.GetHoverObject()
|
||||||
@ -355,7 +355,7 @@ function loveframes.util.GetHoverObject()
|
|||||||
end
|
end
|
||||||
|
|
||||||
--[[---------------------------------------------------------
|
--[[---------------------------------------------------------
|
||||||
- func: loveframes.util.IsCtrlDown()
|
- func: IsCtrlDown()
|
||||||
- desc: checks for ctrl, for use with multiselect, copy,
|
- desc: checks for ctrl, for use with multiselect, copy,
|
||||||
paste, and such. On OS X it actually looks for cmd.
|
paste, and such. On OS X it actually looks for cmd.
|
||||||
--]]---------------------------------------------------------
|
--]]---------------------------------------------------------
|
||||||
|
@ -8,7 +8,7 @@ local newobject = loveframes.NewObject("base", "loveframes_object_base")
|
|||||||
|
|
||||||
--[[---------------------------------------------------------
|
--[[---------------------------------------------------------
|
||||||
- func: initialize()
|
- func: initialize()
|
||||||
- desc: intializes the element
|
- desc: initializes the element
|
||||||
--]]---------------------------------------------------------
|
--]]---------------------------------------------------------
|
||||||
function newobject:initialize()
|
function newobject:initialize()
|
||||||
|
|
||||||
@ -407,7 +407,7 @@ end
|
|||||||
- desc: centers the object in the game window or in
|
- desc: centers the object in the game window or in
|
||||||
its parent if it has one
|
its parent if it has one
|
||||||
--]]---------------------------------------------------------
|
--]]---------------------------------------------------------
|
||||||
function newobject:Center(area)
|
function newobject:Center()
|
||||||
|
|
||||||
local base = loveframes.base
|
local base = loveframes.base
|
||||||
local parent = self.parent
|
local parent = self.parent
|
||||||
@ -1018,10 +1018,10 @@ function newobject:SetSkin(name)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--[[---------------------------------------------------------
|
--[[---------------------------------------------------------
|
||||||
- func: GetSkin(name)
|
- func: GetSkin()
|
||||||
- desc: gets the object's skin
|
- desc: gets the object's skin
|
||||||
--]]---------------------------------------------------------
|
--]]---------------------------------------------------------
|
||||||
function newobject:GetSkin(name)
|
function newobject:GetSkin()
|
||||||
|
|
||||||
local skins = loveframes.skins.available
|
local skins = loveframes.skins.available
|
||||||
local skinindex = loveframes.config["ACTIVESKIN"]
|
local skinindex = loveframes.config["ACTIVESKIN"]
|
||||||
|
Loading…
Reference in New Issue
Block a user