summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-03 12:42:21 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-03 12:42:21 +0000
commitdf5ee2a5c32258e0d993c7d7c917c75299ee9ae4 (patch)
tree8303eec548a78ae1f8b543aea8658d37321e772b /src/game.cpp
parentdbda6463fd8a9c3136daf64e79b5515812a2e40f (diff)
downloadmana-df5ee2a5c32258e0d993c7d7c917c75299ee9ae4.tar.gz
mana-df5ee2a5c32258e0d993c7d7c917c75299ee9ae4.tar.bz2
mana-df5ee2a5c32258e0d993c7d7c917c75299ee9ae4.tar.xz
mana-df5ee2a5c32258e0d993c7d7c917c75299ee9ae4.zip
Separated graphic/graphic.cpp into graphics.cpp and engine.cpp.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/game.cpp b/src/game.cpp
index b089b234..1d704f2b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -21,11 +21,14 @@
* $Id$
*/
-#include "main.h"
-#include "map.h"
#include "being.h"
+#include "engine.h"
#include "floor_item.h"
+#include "graphics.h"
#include "log.h"
+#include "main.h"
+#include "map.h"
+#include "sound.h"
#include "gui/chat.h"
#include "gui/gui.h"
#include "gui/inventory.h"
@@ -33,9 +36,7 @@
#include "gui/npc.h"
#include "gui/stats.h"
#include "gui/ok_dialog.h"
-#include "graphic/graphic.h"
#include "resources/mapreader.h"
-#include "sound.h"
#include <SDL.h>
char map_path[480];
@@ -345,13 +346,13 @@ void do_input()
current_npc = id;
}
}
+ }
+ }
- }
- }
- // Push input to GUI when not used
- if (!used) {
- guiInput->pushInput(event);
- }
+ // Push input to GUI when not used
+ if (!used) {
+ guiInput->pushInput(event);
+ }
} // End while