summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/game.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d828d35..947e1534 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,5 @@
2005-09-17 Matthias Hartmann <hartmann.matthias@gmail.com>
-
* src/engine.cpp: [TARGET] text over player
* src/game.cpp: PVP
* src/game.h: PVP
@@ -13,6 +12,8 @@
2005-09-17 Björn Steinbrink <B.Steinbrink@gmx.de>
+ * src/game.h: Remove inclusion of being.h, there was a forward
+ declaration of class Being anyways...
* src/openglgraphics.cpp: Use gl{Push,Pop}Matrix instead of
calculating offsets, cause the values are stored as float and aren't
accurate enough.
diff --git a/src/game.h b/src/game.h
index b7916053..9ff8bc9b 100644
--- a/src/game.h
+++ b/src/game.h
@@ -25,7 +25,6 @@
#define _TMW_GAME_
#include <iosfwd>
-#include "being.h"
#define SPEECH_TIME 80
#define SPEECH_MAX_TIME 100
@@ -34,6 +33,7 @@
#define IDLE 255
class Being;
+
extern std::string map_path;
extern std::string tradePartnerName;
extern int fps, frame, current_npc;