aboutsummaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-03-21 04:22:09 -0400
committerClyne Sullivan <tullivan99@gmail.com>2016-03-21 04:22:09 -0400
commit3432a970912dac94d9ba527f10f0354dcc396bf4 (patch)
tree0a22f4f8cef9cd11f2970f780b4d6c4991063848 /main.cpp
parent8dae5eeac2c6254bb8288c0479c193ab185a312f (diff)
wip: dynamic font size loading stuff
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/main.cpp b/main.cpp
index 69aab76..acbc4f6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -35,7 +35,7 @@ using namespace tinyxml2;
* Defines how many milliseconds each game tick will take.
*/
-#define MSEC_PER_TICK (1000/TICKS_PER_SEC)
+#define MSEC_PER_TICK ( 1000 / TICKS_PER_SEC )
/**
* The window object returned by SDL when we create the main window.
@@ -69,7 +69,9 @@ float handAngle;
* logic operations have to go access members of this object in order to work.
*/
-World *currentWorld = NULL;
+World *currentWorld = NULL,
+ *currentWorldToLeft = NULL,
+ *currentWorldToRight = NULL;
/**
* The player object.
@@ -415,7 +417,7 @@ int main(int argc, char *argv[]){
//currentWorld->mob.back()->followee = player;
gameRunning = true;
-
+
while ( gameRunning )
mainLoop();