From 8ce2fb94f045ae7d341c5ae712f19aa67d5977fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erkki=20Sepp=C3=A4l=C3=A4?= <flux@modeemi.fi>
Date: Wed, 22 Oct 2014 22:06:25 +0300
Subject: [PATCH] settings: introduced WIDTH and HEIGHT, use them instead of
 window size

---
 conf.lua        | 5 +++--
 level.lua       | 8 ++++----
 level_state.lua | 4 ++--
 settings.lua    | 3 +++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/conf.lua b/conf.lua
index fc33b97..38b6a15 100644
--- a/conf.lua
+++ b/conf.lua
@@ -1,9 +1,10 @@
 -- LÖVE configuration values
+require 'settings'
 
 function love.conf(t)
     t.window.title = "Fysplane"
-    t.window.width = 1280
-    t.window.height = 768
+    t.window.width = WIDTH
+    t.window.height = HEIGHT
     t.window.resizable = false
     t.window.vsync = true
 
diff --git a/level.lua b/level.lua
index 559142a..3f17e8b 100644
--- a/level.lua
+++ b/level.lua
@@ -31,7 +31,7 @@ Level = Class{
 					     self)
                              end,
                             [2] = function()
-                                return Plane(love.window.getWidth() - 100 - 100, 300, -INITIAL_PLANE_SPEED, 0,
+                                return Plane(WIDTH - 100 - 100, 300, -INITIAL_PLANE_SPEED, 0,
 					     0, 255, 0, -- green
 					     self)
                             end }
@@ -80,11 +80,11 @@ Level = Class{
             if entity:isinstance(PhysicsEntity) then
 	        local jump_window = 70
 		local jump_amount = 50
-                while entity.body:getX() > love.window.getWidth() + jump_window do
-                    entity.body:setX(entity.body:getX() - love.window.getWidth() - jump_window - jump_amount)
+                while entity.body:getX() > WIDTH + jump_window do
+                    entity.body:setX(entity.body:getX() - WIDTH - jump_window - jump_amount)
                 end
                 while entity.body:getX() < -jump_window do
-                    entity.body:setX(entity.body:getX() + love.window.getWidth() + jump_window + jump_amount)
+                    entity.body:setX(entity.body:getX() + WIDTH + jump_window + jump_amount)
                 end
             end
             entity:update(dt)
diff --git a/level_state.lua b/level_state.lua
index 884a88f..926da0d 100644
--- a/level_state.lua
+++ b/level_state.lua
@@ -129,8 +129,8 @@ function level_state:update(dt)
 	local r = love.math.random()
 
 	if r <= POWERUP_POSSIBILITY * dt then
-	    local x = love.math.random(love.window.getWidth())
-	    local y = love.math.random(love.window.getHeight())
+	    local x = love.math.random(WIDTH)
+	    local y = love.math.random(HEIGHT)
 
 	    POWERUPS[love.math.random(1, #POWERUPS)](x, y, current_level)
 	end
diff --git a/settings.lua b/settings.lua
index b888a5d..40a48a1 100644
--- a/settings.lua
+++ b/settings.lua
@@ -6,6 +6,9 @@ PIXELS_PER_METER = 8
 GRAVITY_X = 0
 GRAVITY_Y = 9.82599 * PIXELS_PER_METER
 
+WIDTH = 1280
+HEIGHT = 768
+
 KEYMAP = {
     [1] = {
         ccw        = 'k',