summaryrefslogtreecommitdiffhomepage
path: root/not/SceneManager.lua
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-09-21 21:05:37 +0200
committerAki <nthirtyone@gmail.com>2017-09-21 21:05:37 +0200
commite9a450d65d4fb564691cdf651ef5771dd88303ae (patch)
treef49d29582dd6877f3b3c807c3f7d9d92d368f798 /not/SceneManager.lua
parenteb8302723cd85adca0fbaf505cfb315f1db0299a (diff)
parentb97985def64b8bd8f93a7b391b12333595432e52 (diff)
downloadroflnauts-e9a450d65d4fb564691cdf651ef5771dd88303ae.zip
roflnauts-e9a450d65d4fb564691cdf651ef5771dd88303ae.tar.gz
roflnauts-e9a450d65d4fb564691cdf651ef5771dd88303ae.tar.bz2
Merge branch 'maps'
Diffstat (limited to 'not/SceneManager.lua')
-rw-r--r--not/SceneManager.lua8
1 files changed, 6 insertions, 2 deletions
diff --git a/not/SceneManager.lua b/not/SceneManager.lua
index c076448..4f9edfd 100644
--- a/not/SceneManager.lua
+++ b/not/SceneManager.lua
@@ -9,7 +9,10 @@ end
-- This function should be removed when multiple scenes will be handled properly by SceneManager and other things.
function SceneManager:changeScene (scene)
- table.remove(self.scenes, #self.scenes)
+ local removed = table.remove(self.scenes, #self.scenes)
+ if removed then
+ removed:delete()
+ end
return self:addScene(scene)
end
@@ -20,7 +23,8 @@ end
-- Not nice, not nice.
function SceneManager:removeTopScene ()
- table.remove(self.scenes, #self.scenes)
+ local scene = table.remove(self.scenes, #self.scenes)
+ scene:delete()
end
function SceneManager:getAllScenes ()