Rebase on Radiance #71

Merged
kazhnuz merged 20 commits from wip/radiance-rebase into master 2022-08-12 10:37:35 +02:00
Showing only changes of commit f3d175266b - Show all commits

View file

@ -36,24 +36,24 @@ function Plateformer:new()
World(self, folder .. ".actors", "datas/maps/plateformer/platformer.lua") World(self, folder .. ".actors", "datas/maps/plateformer/platformer.lua")
Pause(self) --Pause(self)
self.menusystem:deactivate() --self.menusystem:deactivate()
self.menusystem:lockWorldWhenActive(true) --self.menusystem:lockWorldWhenActive(true)
self.menusystem:lockAssetsWhenActive(true) --self.menusystem:lockAssetsWhenActive(true)
self.world:loadMap() self.world:loadMap()
end end
function Plateformer:restart() function Plateformer:restart()
self.menusystem:deactivate() --self.menusystem:deactivate()
collectgarbage() collectgarbage()
self.world:reset() self.world:reset()
end end
function Plateformer:update(dt) function Plateformer:update(dt)
if (self.menusystem.isActive == true) and self.sources[1].keys["start"].isPressed then --if (self.menusystem.isActive == true) and self.sources[1].keys["start"].isPressed then
self.menusystem:deactivate() --self.menusystem:deactivate()
end --end
end end
function Plateformer:draw() function Plateformer:draw()