From a00e29799a9fa4e8f140ef3f292f3200736fe957 Mon Sep 17 00:00:00 2001
From: Luke Bratch <l_bratch@yahoo.co.uk>
Date: Sat, 27 Nov 2010 23:21:41 +0000
Subject: Level: Scroll when near, rather than at, the right edge of the screen

---
 Level.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Level.cpp')

diff --git a/Level.cpp b/Level.cpp
index 2c358da..dc36e24 100644
--- a/Level.cpp
+++ b/Level.cpp
@@ -60,7 +60,7 @@ void Level::move() {
         }
     }
 
-    if (rect.x >= 0 && rect.x <= SCREEN_WIDTH - rect.w) {
+    if (rect.x >= 0 && rect.x <= SCREEN_WIDTH - rect.w - 32) {
         player.setX(rect.x);
     }
 
@@ -92,7 +92,8 @@ void Level::draw(Screen *screen) {
     screen->blit(player.getX(), player.getY(), player.image, player.getClip());
 
     // Scroll level
-    if (player.getX() == 0 || player.getX() >= SCREEN_WIDTH - player.getClip()->w - MOVE_AMOUNT) {
+    if (player.getX() == 0 || player.getX() >= SCREEN_WIDTH
+        - player.getClip()->w - 32 - MOVE_AMOUNT) {
         if (player.getXVel() < 0 || player.getXVel() > 0)
             cameraX -= player.getXVel();
     }
-- 
cgit v1.2.3