summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2016-06-01 22:25:57 +0200
committerAki <nthirtyone@gmail.com>2016-06-01 22:25:57 +0200
commit728c8aa62add0310119017615c7e973e35daf146 (patch)
tree24f432c07acb52d23bb4945460cdc798d2b3b233
parent52609cc49d88f5b0d8610b5f6b792f0f423dc735 (diff)
downloadroflnauts-728c8aa62add0310119017615c7e973e35daf146.zip
roflnauts-728c8aa62add0310119017615c7e973e35daf146.tar.gz
roflnauts-728c8aa62add0310119017615c7e973e35daf146.tar.bz2
Making master playable
-rw-r--r--main.lua16
1 files changed, 9 insertions, 7 deletions
diff --git a/main.lua b/main.lua
index 1163516..da4c378 100644
--- a/main.lua
+++ b/main.lua
@@ -35,13 +35,13 @@ function love.load ()
m:assignController(Controllers[2])
-- ZU WARUDO!
- -- w = World:new("default", {"leon", Controllers[1]}, {"lonestar", Controllers[2]})
+ w = World:new("default", {"leon", Controllers[1]}, {"lonestar", Controllers[2]})
end
-- Update
function love.update (dt)
- -- w:update(dt)
- m:update(dt)
+ w:update(dt)
+ -- m:update(dt)
end
-- KeyPressed
@@ -59,8 +59,10 @@ function love.keypressed (key)
end
if key == "f5" and debug then
local new = World:new("default", {"leon", Controllers[1]}, {"lonestar", Controllers[2]})
- m = nil
- m = new
+ -- m = nil
+ -- m = new
+ w = nil
+ w = new
end
if key == "f6" then
m = m:startGame()
@@ -77,8 +79,8 @@ end
-- Draw
function love.draw ()
- -- w:draw()
- m:draw()
+ w:draw()
+ -- m:draw()
if debug then
love.graphics.print("Current FPS: "..tostring(love.timer.getFPS( )), 10, 10)
end