summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2016-05-15 22:22:04 +0200
committerAki <nthirtyone@gmail.com>2016-05-15 22:22:04 +0200
commit22f19497805c0ee4f4e5cfb6606673a9983dc191 (patch)
tree617f5230aa96210768c4b802bc563fc570b39394
parent8a51c55cfd5c22ff035f320c9128d6ec49009bf2 (diff)
downloadroflnauts-22f19497805c0ee4f4e5cfb6606673a9983dc191.zip
roflnauts-22f19497805c0ee4f4e5cfb6606673a9983dc191.tar.gz
roflnauts-22f19497805c0ee4f4e5cfb6606673a9983dc191.tar.bz2
Making it readable
-rw-r--r--conf.lua4
-rw-r--r--world.lua8
2 files changed, 6 insertions, 6 deletions
diff --git a/conf.lua b/conf.lua
index 434f7f9..6a9ccb2 100644
--- a/conf.lua
+++ b/conf.lua
@@ -2,7 +2,7 @@ function love.conf(t)
t.title = "notnauts"
t.version = "0.10.1"
t.window.icon = "assets/icon.png"
- t.window.width = 1260
- t.window.height = 800
+ t.window.width = 315*4
+ t.window.height = 200*4
t.console = false
end \ No newline at end of file
diff --git a/world.lua b/world.lua
index 963ae44..098e268 100644
--- a/world.lua
+++ b/world.lua
@@ -24,12 +24,12 @@ function World:new()
o.world = love.physics.newWorld(0, 9.81*64, true)
o.world:setCallbacks(o.beginContact, o.endContact)
-- Empty tables for objects
- local c = {}
- o.Clouds = c
local n = {}
o.Nauts = n
local p = {}
o.Platforms = {}
+ local c = {}
+ o.Clouds = c
-- Create camera
o.camera = Camera:new()
return o
@@ -90,12 +90,12 @@ function World:draw()
-- Draw ground
for _,platform in pairs(self.Platforms) do
- platform:draw(offset_x, offset_y, scale, false)
+ platform:draw(offset_x, offset_y, scale, debug)
end
-- Draw player
for _,naut in pairs(self.Nauts) do
- naut:draw(offset_x, offset_y, scale, false)
+ naut:draw(offset_x, offset_y, scale, debug)
end
end