From bbee57ad4fbb9a12c5e3947fcee68657d0fa52c5 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Sun, 22 May 2016 16:29:12 +0200
Subject: Map loads from file

---
 player.lua | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'player.lua')

diff --git a/player.lua b/player.lua
index abaf37d..7eb5f53 100644
--- a/player.lua
+++ b/player.lua
@@ -149,8 +149,9 @@ function Player:update (dt)
 		
 	-- # DEATH
 	-- We all die in the end.
-	if (self.body:getX() < -600 or self.body:getX() > 780  or
-	    self.body:getY() < -500 or self.body:getY() > 500) and
+	local m = self.world.map
+	if (self.body:getX() < m.center_x - m.width*1.5 or self.body:getX() > m.center_x + m.width*1.5  or
+	    self.body:getY() < m.center_y - m.height*1.5 or self.body:getY() > m.center_y + m.height*1.5) and
 	    self.alive
 	then
 		self:die()
@@ -349,7 +350,7 @@ end
 function Player:respawn ()
 	self.alive = true
 	self.body:setLinearVelocity(0,0)
-	self.body:setPosition(290/2, 180/2-80)
+	self.body:setPosition(self.world:getSpawnPosition())
 	self.body:setActive(true)
 	self:createEffect("respawn")
 	self:changeAnimation("idle")
-- 
cgit v1.1