diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-01-22 13:31:13 +0000 |
|---|---|---|
| committer | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-01-22 13:31:13 +0000 |
| commit | bd56bf8afdab16383ed8ad08412a8c807f84af85 (patch) | |
| tree | 0e963ada63bcbe3c50dd77986aaa15b9ba49816a /src/gui/setup.cpp | |
| parent | 5359640b6f271af31f6423df9d661433eff89a3e (diff) | |
| download | Mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.gz Mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.bz2 Mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.xz Mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.zip | |
Merged NETWORK branch (includes BEING_OVERHAUL).
Diffstat (limited to 'src/gui/setup.cpp')
| -rw-r--r-- | src/gui/setup.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 2114e635..34f5b360 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -23,18 +23,24 @@ #include "setup.h" -#include <iostream> #include <sstream> #include <guichan/widgets/container.hpp> #include <guichan/widgets/label.hpp> #include "button.h" +#include "chat.h" #include "checkbox.h" +#include "equipmentwindow.h" +#include "help.h" +#include "inventorywindow.h" #include "listbox.h" #include "ok_dialog.h" +#include "minimap.h" #include "scrollarea.h" +#include "skill.h" #include "slider.h" +#include "status.h" #include "tabbedcontainer.h" #include "../configuration.h" @@ -44,13 +50,8 @@ #include "../sound.h" extern Graphics *graphics; -#include "chat.h" -#include "equipmentwindow.h" -#include "help.h" -#include "inventorywindow.h" -#include "minimap.h" -#include "skill.h" -#include "status.h" + +extern SDL_Joystick *joypad; extern SDL_Joystick *joypad; |