summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-09 21:52:19 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-09 21:52:19 +0300
commit872368b15b84f1a2c945238b4e2a9a2ed411e849 (patch)
treeba99d9ec8653813f7d9f4007651f8650e2345295 /src/game.cpp
parentd3d879ac07ac45a623365b4db28c3b120a7bbb25 (diff)
downloadmv-872368b15b84f1a2c945238b4e2a9a2ed411e849.tar.gz
mv-872368b15b84f1a2c945238b4e2a9a2ed411e849.tar.bz2
mv-872368b15b84f1a2c945238b4e2a9a2ed411e849.tar.xz
mv-872368b15b84f1a2c945238b4e2a9a2ed411e849.zip
remove useless includes from some files.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 03f26c981..4eaa09a66 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -68,7 +68,6 @@
#endif
#include "gui/skilldialog.h"
#include "gui/statuswindow.h"
-#include "gui/textdialog.h"
#include "gui/tradewindow.h"
#include "gui/viewport.h"
#include "gui/questswindow.h"
@@ -87,7 +86,6 @@
#include "net/generalhandler.h"
#include "net/gamehandler.h"
#include "net/packetcounters.h"
-#include "net/playerhandler.h"
#include "resources/imagewriter.h"
#include "resources/mapdb.h"
@@ -101,10 +99,6 @@
#include "utils/process.h"
#include "utils/sdlcheckutils.h"
-#include <guichan/exception.hpp>
-#include <guichan/focushandler.hpp>
-
-#include <fstream>
#include <sstream>
#include <string>
@@ -397,7 +391,9 @@ Game::Game():
spellManager = new SpellManager;
spellShortcut = new SpellShortcut;
- assert(!mInstance);
+// assert(!mInstance);
+ if (mInstance)
+ logger->log("error: double game creation");
mInstance = this;
config.incValue("gamecount");