aboutsummaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2015-11-13 12:51:07 -0500
committerdrumsetmonkey <abelleisle@roadrunner.com>2015-11-13 12:51:07 -0500
commit2efd19fa9cd3d24538242cbea828830ac07c324f (patch)
tree624f5b79391a676aec9abc5e174d6238ccd54459 /main.cpp
parenta32339dc700759ab44a360953c9c24d009b11ecc (diff)
Makefile supports 32 and 64 bit
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/main.cpp b/main.cpp
index 61aa3ae..744ed1b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -214,7 +214,7 @@ typedef enum {
RAIN
} WEATHER;
-#define DAY_CYCLE 300
+#define DAY_CYCLE 3000
static WEATHER weather = SUNNY;
static vec2 star[100];
@@ -575,10 +575,9 @@ void render(){
if(!worldInside){
if(player->loc.x - SCREEN_WIDTH/2 < currentWorld->getTheWidth() * -0.5f)
offset.x = ((currentWorld->getTheWidth() * -0.5f) + SCREEN_WIDTH / 2) + player->width / 2;
- if(player->loc.x + SCREEN_WIDTH/2 > currentWorld->getTheWidth() * 0.5f)
- offset.x = ((currentWorld->getTheWidth() * 0.5f) - SCREEN_WIDTH / 2) + player->width / 2;
+ if(player->loc.x + player->width + SCREEN_WIDTH/2 > currentWorld->getTheWidth() * 0.5f)
+ offset.x = ((currentWorld->getTheWidth() * 0.5f) - SCREEN_WIDTH / 2);// + player->width / 2;
}
-
if(player->loc.y > SCREEN_HEIGHT/2)
offset.y = player->loc.y + player->height;