diff options
| author | David Athay <ko2fan@gmail.com> | 2009-01-13 00:28:58 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-01-13 00:28:58 +0000 |
| commit | 224da21ea258450fcc78dd7635de84aba1d1df5e (patch) | |
| tree | dc4df492779986aff60ed785f4821daae968d023 /src/game.cpp | |
| parent | d7a5438d3c7b140c0966243bae98ff447385d246 (diff) | |
| parent | ed60c53eb2fe5ef377fc726df796d0aaf2005c6c (diff) | |
| download | mana-client-224da21ea258450fcc78dd7635de84aba1d1df5e.tar.gz mana-client-224da21ea258450fcc78dd7635de84aba1d1df5e.tar.bz2 mana-client-224da21ea258450fcc78dd7635de84aba1d1df5e.tar.xz mana-client-224da21ea258450fcc78dd7635de84aba1d1df5e.zip | |
Merge branch 'master' of git://gitorious.org/tmw/eathena
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp index a4d15548..a788c51a 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -26,7 +26,6 @@ #include <sstream> #include <string> -#include <guichan/sdl/sdlinput.hpp> #include <guichan/exception.hpp> #include "beingmanager.h" @@ -59,6 +58,7 @@ #include "gui/npclistdialog.h" #include "gui/npc_text.h" #include "gui/ok_dialog.h" +#include "gui/sdlinput.h" #include "gui/sell.h" #include "gui/setup.h" #include "gui/skill.h" @@ -83,7 +83,6 @@ #include "resources/imagewriter.h" extern Graphics *graphics; -extern gcn::SDLInput *guiInput; class Map; @@ -229,6 +228,7 @@ void createGuiWindows(Network *network) */ void destroyGuiWindows() { + logger->setChatWindow(NULL); delete chatWindow; delete statusWindow; delete miniStatusWindow; |