Skip to content

[WIP] Add option to resume game #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
coditva wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Add option to resume game #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions game.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,18 @@ function game.event.handlers.resetGame()
game.views.Map:update()
end

function game.loadComponent(component)
log.debug('game.loadComponent: ' .. component)
local model = require('models.' .. component):new({ name = component })
game.models[component] = model
game.views[component] = require('views.' .. component):new(model)
game.controllers[component] = require('controllers.' .. component)
game.event.handlers[component] = util.newEventHandler(
game.controllers[component], model)
function game.loadComponent(component, nameAs)
if not nameAs then
nameAs = component
end
log.debug('game.loadComponent: ' .. nameAs)

local model = require('models.' .. component):new({ name = nameAs })
game.models[nameAs] = model
game.views[nameAs] = require('views.' .. component):new(model)
game.controllers[nameAs] = require('controllers.' .. component)
game.event.handlers[nameAs] = util.newEventHandler(
game.controllers[nameAs], model)
end

function game.animateMap(callback)
Expand All @@ -125,6 +129,7 @@ end
function game.load()
game.loadComponent('Menu')
game.loadComponent('Map')
game.loadComponent('Menu', 'PauseMenu')

game.models.Menu:addItem('Start', function()
log.debug('Menu: new game')
Expand All @@ -137,6 +142,21 @@ function game.load()
end)
game.models.Menu:setHighlighted(1)

game.models.PauseMenu:addItem('Resume', function()
log.debug('PauseMenu: resume')
game.state:pop()
end)
game.models.PauseMenu:addItem('Restart', function()
log.debug('PauseMenu: new game')
game.event.push('resetMap')
game.event.push('startGame')
end)
game.models.PauseMenu:addItem('Quit', function()
log.debug('PauseMenu: quit')
love.event.quit() -- TODO
end)
game.models.PauseMenu:setHighlighted(1)

local width, height = love.graphics.getPixelDimensions()
game.views.Menu:load(width, height)
game.views.Map:load(width, height)
Expand Down
4 changes: 4 additions & 0 deletions lib/Stack.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ function Stack:top()
return self._stack[#self._stack]
end

function Stack:prev()
return self._stack[#self._stack - 1]
end

function Stack:empty()
self._stack = {}
end
Expand Down
6 changes: 3 additions & 3 deletions views/Map.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ function view:load(width, height, props)
end
},
{
label = 'Quit',
label = 'Menu',
callback = function()
self._parent.console:setMessage()
globals.game.state:push('Menu')
--self._parent.console:setMessage()
globals.game.state:push('PauseMenu')
end
},
},
Expand Down