From: Clyne Sullivan <tullivan99@gmail.com>
Date: Mon, 2 May 2016 12:49:54 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/tcsullivan/gamedev
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=f102149e15ca1ac36cbb4e2627e5ce44f2d5273a;p=clyne%2Fgamedev.git

Merge branch 'master' of https://github.com/tcsullivan/gamedev
---

f102149e15ca1ac36cbb4e2627e5ce44f2d5273a
diff --cc main.cpp
index ba60fdd,f64eeaf..ac9eb5d
--- a/main.cpp
+++ b/main.cpp
@@@ -288,11 -288,11 +288,12 @@@ void mainLoop(void)
  			debugDiv=0;
  
  			fps = 1000 / game::time::getDeltaTime();
 -			if (!(debugDiv % 10))
 -				debugY = player->loc.y;
 +			debugY = player->loc.y;
  		}
+ 		SDL_Delay(1);
  	}
 +
 +	SDL_Delay(1);
  }
  
  void render() {