]> code.bitgloo.com Git - clyne/gamedev.git/commitdiff
Merge branch 'master' of https://github.com/tcsullivan/gamedev
authorClyne Sullivan <tullivan99@gmail.com>
Mon, 2 May 2016 12:49:54 +0000 (08:49 -0400)
committerClyne Sullivan <tullivan99@gmail.com>
Mon, 2 May 2016 12:49:54 +0000 (08:49 -0400)
1  2 
include/world.hpp
main.cpp
src/mob.cpp
src/ui.cpp
src/world.cpp
xml/playerSpawnHill1.xml

Simple merge
diff --cc main.cpp
index ba60fdda1c376d28f75816d0af9c23f8ddb1f87d,f64eeafe51bbf0a24baac0abdb5d6386412e9336..ac9eb5d5312feb633848b15c058372a3ab00dc19
+++ 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() {
diff --cc src/mob.cpp
Simple merge
diff --cc src/ui.cpp
Simple merge
diff --cc src/world.cpp
Simple merge
Simple merge