Rehandled menus; reworked dialog, added dialogsequences instead of dialogboxes
This commit is contained in:
13
main.lua
13
main.lua
@@ -3,8 +3,7 @@ function love.load()
|
||||
if logging then print("love: "..collectgarbage("count").." kB") end
|
||||
arrow = 0
|
||||
|
||||
do_pause = false
|
||||
|
||||
menu_type = "no"
|
||||
debug = false
|
||||
debug_collision = false
|
||||
editor_mode = false
|
||||
@@ -44,7 +43,7 @@ function love.load()
|
||||
LoadedParticles = {}
|
||||
LevelLoadTiles()
|
||||
|
||||
language = "ENG"
|
||||
language = "HEON"
|
||||
LocaleLoad(language)
|
||||
|
||||
main_Player = Player:New(75,50)
|
||||
@@ -90,13 +89,13 @@ function love.update(dt)
|
||||
if do_pause then
|
||||
do_pause = false
|
||||
else
|
||||
menuPage = "pauseMenu"
|
||||
MenuInit(menuPage)
|
||||
menu_type = "pause"
|
||||
MenuInit(menu_type)
|
||||
end
|
||||
end
|
||||
|
||||
--MenuStep
|
||||
if menuPage ~= nil then MenuStep(menuPage) end
|
||||
if menu_type ~= nil then MenuStep(menu_type) end
|
||||
|
||||
--editor
|
||||
if editor_mode then
|
||||
@@ -128,7 +127,7 @@ function love.draw()
|
||||
GameDraw()
|
||||
end
|
||||
|
||||
if menuPage ~= nil then MenuDraw(menuPage) end
|
||||
if menu_type ~= nil then MenuDraw(menu_type) end
|
||||
|
||||
love.graphics.print(game.scale,10,40)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user