diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2004-12-13 02:25:58 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2004-12-13 02:25:58 +0000 |
| commit | d32386353d28093a5d03ad99f161f8133d73e056 (patch) | |
| tree | 7d0fa519d613a79b611b938c0929260625fff5c3 /src/gui | |
| parent | 75b19e771c527e8444aae70543b2b617dae2e892 (diff) | |
| download | mana-d32386353d28093a5d03ad99f161f8133d73e056.tar.gz mana-d32386353d28093a5d03ad99f161f8133d73e056.tar.bz2 mana-d32386353d28093a5d03ad99f161f8133d73e056.tar.xz mana-d32386353d28093a5d03ad99f161f8133d73e056.zip | |
Some header order, namespace and lib fixes to improve MSVC support.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/char_server.cpp | 1 | ||||
| -rw-r--r-- | src/gui/gui.cpp | 2 | ||||
| -rw-r--r-- | src/gui/gui.h | 6 | ||||
| -rw-r--r-- | src/gui/setup.cpp | 10 | ||||
| -rw-r--r-- | src/gui/setup.h | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp index c84fc167..caf02eed 100644 --- a/src/gui/char_server.cpp +++ b/src/gui/char_server.cpp @@ -32,7 +32,6 @@ gcn::ListBox *serverList; void ServerSelectListener::action(const std::string& eventId) { - printf("%s\n", eventId.c_str()); if (eventId == "ok") { server_char_server(serverList->getSelected()); } diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index b20d2e1d..6b574b45 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -19,11 +19,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "gui.h" #include <allegro.h> #include <allegro/internal/aintern.h> #include <math.h> #include <alfont.h> -#include "gui.h" #include "../log.h" #include "../sound/sound.h" diff --git a/src/gui/gui.h b/src/gui/gui.h index b3c989c2..af83ccac 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -22,15 +22,15 @@ #ifdef WIN32 #pragma warning (disable:4312) #endif -#include "login.h" + #ifndef _TMW_GUI #define _TMW_GUI +#include <guichan.hpp> +#include <guichan/allegro.hpp> #include <allegro.h> #include <alfont.h> #include <string.h> -#include <guichan.hpp> -#include <guichan/allegro.hpp> typedef struct { BITMAP *grid[9]; diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index c8b677db..07ade6d3 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -64,10 +64,12 @@ Setup::~Setup() { } void Setup::toggleVisible(bool toggle) { - if(visible == false && toggle == true) - visible == true; - else - if(visible == true && toggle == false) visible == false; + if (!visible && toggle) { + visible = true; + } + else if (visible && !toggle) { + visible = false; + } setupDialog->setVisible(visible); } diff --git a/src/gui/setup.h b/src/gui/setup.h index 1d8b859f..5c92f136 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -8,7 +8,7 @@ #include <allegro.h> #ifdef WIN32 -#include <winallegro.h> +#include <winalleg.h> #endif #include "gui.h" #include "../graphic/graphic.h" |