library-mirrors/tiny-ecs
1
0
Fork 0
mirror of https://github.com/bakpakin/tiny-ecs.git synced 2024-11-28 23:54:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add some comments.

Browse Source
This commit is contained in:
bakpakin 2015-07-07 20:58:25 -04:00
parent 176c80d0d9
commit 5ac81f5c4a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/gamestate.lua
View File

@ -45,7 +45,8 @@ function GS.push(to, ...)
assert(to, "Missing argument: Gamestate to switch to")
assert(to ~= GS, "Can't call push with colon operator")
local pre = stack[#stack]
;(to.load or __NULL__)(to)
;(to.load or __NULL__)(to) -- modified to use load instead of init so as
-- to not interfere with 30log.
to.load = nil
stack[#stack+1] = to
return (to.enter or __NULL__)(to, pre, ...)
@ -53,7 +54,7 @@ end
function GS.pop(...)
assert(#stack > 1, "No more states to pop!")
local pre, to = stack[#stack], stack[#stack-1]
local pre, to = stack[#stack], stack[#stack-1]
stack[#stack] = nil
;(pre.leave or __NULL__)(pre)
return (to.resume or __NULL__)(to, pre, ...)
@ -90,4 +91,4 @@ setmetatable(GS, {__index = function(_, func)
end
end})
return GS
return GS

2
main.lua
View File

@ -1,6 +1,6 @@
class = require "lib.30log"
tiny = require "lib.tiny"
gamestate = require "lib.gamestate"
gamestate = require "lib.gamestate" -- slightly modified to play nice;y with 30log
local Intro = require "src.states.Intro"
local Level = require "src.states.Level"