diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-09-20 22:17:21 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-06 22:40:36 +0100 |
| commit | cf0b8753dadbcc6484b859a21544e437ef7d33eb (patch) | |
| tree | 5fb4e649754140bf15917a33be4510e66c4c1c8c /src/game.cpp | |
| parent | 6f08807edfa6719b73795a0630ba0affd4f9a7dc (diff) | |
| download | Mana-cf0b8753dadbcc6484b859a21544e437ef7d33eb.tar.gz Mana-cf0b8753dadbcc6484b859a21544e437ef7d33eb.tar.bz2 Mana-cf0b8753dadbcc6484b859a21544e437ef7d33eb.tar.xz Mana-cf0b8753dadbcc6484b859a21544e437ef7d33eb.zip | |
Added support for unicode charset in textfields and chat.
Conflicts:
src/Makefile.am
src/game.cpp
src/gui/browserbox.cpp
src/gui/gui.cpp
src/gui/textfield.cpp
src/main.cpp
(cherry picked from mainline commit 7b67e852086ad3ccd98a622f890b245ab6a0a321)
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp index a4d15548..efa0e859 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; |