summaryrefslogtreecommitdiff
path: root/src/game.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-07 19:34:52 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-07 19:34:52 +0300
commit9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch)
treec084bdf8afabc6220779645dcb5dbf71af6a151f /src/game.h
parentbc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff)
downloadmanaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz
manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2
manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz
manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/game.h')
-rw-r--r--src/game.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game.h b/src/game.h
index 24ca7f0fc..2205e30de 100644
--- a/src/game.h
+++ b/src/game.h
@@ -26,6 +26,8 @@
#include <string>
#include "gui/sdlinput.h"
+#include "localconsts.h"
+
#define MAX_LASTKEYS 10
extern volatile int cur_time;
@@ -66,7 +68,7 @@ class Game
{ return mInstance; }
static void clearInstance()
- { mInstance = 0; }
+ { mInstance = nullptr; }
/**
* This method takes the game a small step further. It is called 100