diff options
Diffstat (limited to 'src/gui')
117 files changed, 240 insertions, 1 deletions
diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp index b6c01758f..20d2c5c1e 100644 --- a/src/gui/beingpopup.cpp +++ b/src/gui/beingpopup.cpp @@ -35,6 +35,7 @@ #include <guichan/font.hpp> +#include "debug.h" BeingPopup::BeingPopup(): Popup("BeingPopup") diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp index 5d2fe2781..a15a7ed56 100644 --- a/src/gui/botcheckerwindow.cpp +++ b/src/gui/botcheckerwindow.cpp @@ -45,6 +45,7 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" #define COLUMNS_NR 5 // name plus listbox #define NAME_COLUMN 0 diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp index 00602e6f2..530c4020b 100644 --- a/src/gui/buydialog.cpp +++ b/src/gui/buydialog.cpp @@ -48,6 +48,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + BuyDialog::DialogList BuyDialog::instances; BuyDialog::BuyDialog(int npcId): diff --git a/src/gui/buyselldialog.cpp b/src/gui/buyselldialog.cpp index 961e744c0..14dcb0bc1 100644 --- a/src/gui/buyselldialog.cpp +++ b/src/gui/buyselldialog.cpp @@ -32,6 +32,8 @@ #include "utils/gettext.h" +#include "debug.h" + BuySellDialog::DialogList BuySellDialog::instances; BuySellDialog::BuySellDialog(int npcId): diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp index a8f016c9b..d424fff91 100644 --- a/src/gui/changeemaildialog.cpp +++ b/src/gui/changeemaildialog.cpp @@ -42,6 +42,8 @@ #include <string> #include <sstream> +#include "debug.h" + ChangeEmailDialog::ChangeEmailDialog(LoginData *loginData): Window(_("Change Email Address"), true), mWrongDataNoticeListener(new WrongDataNoticeListener), diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp index 1ea4662c4..dc640841a 100644 --- a/src/gui/changepassworddialog.cpp +++ b/src/gui/changepassworddialog.cpp @@ -44,6 +44,8 @@ #include <string> #include <sstream> +#include "debug.h" + ChangePasswordDialog::ChangePasswordDialog(LoginData *loginData): Window(_("Change Password"), true), mWrongDataNoticeListener(new WrongDataNoticeListener), diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp index 914e29f3c..91c284985 100644 --- a/src/gui/charcreatedialog.cpp +++ b/src/gui/charcreatedialog.cpp @@ -52,6 +52,8 @@ #include <guichan/font.hpp> +#include "debug.h" + CharCreateDialog::CharCreateDialog(CharSelectDialog *parent, int slot): Window(_("Create Character"), true, parent), mCharSelectDialog(parent), diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index bf4225df9..264df06e3 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -62,6 +62,8 @@ #include <string> #include <cassert> +#include "debug.h" + // Character slots per row in the dialog static const int SLOTS_PER_ROW = 5; diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index b2048eb0a..1712a3f16 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -65,6 +65,8 @@ #include <sys/stat.h> +#include "debug.h" + /** * The chat input hides when it loses focus. It is also invisible by default. */ diff --git a/src/gui/confirmdialog.cpp b/src/gui/confirmdialog.cpp index a9186a2ed..661168dd9 100644 --- a/src/gui/confirmdialog.cpp +++ b/src/gui/confirmdialog.cpp @@ -33,6 +33,8 @@ #include <guichan/font.hpp> +#include "debug.h" + ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg, bool ignore, bool modal, Window *parent): Window(title, modal, parent) diff --git a/src/gui/connectiondialog.cpp b/src/gui/connectiondialog.cpp index 05f4ef177..157398297 100644 --- a/src/gui/connectiondialog.cpp +++ b/src/gui/connectiondialog.cpp @@ -31,6 +31,8 @@ #include "utils/gettext.h" +#include "debug.h" + ConnectionDialog::ConnectionDialog(const std::string &text, State cancelState): Window(""), diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index b3e19e3e5..ecc3ada54 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -48,6 +48,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + DebugWindow::DebugWindow(): Window(_("Debug")) { diff --git a/src/gui/editdialog.cpp b/src/gui/editdialog.cpp index b8d999ce7..bb80f07ed 100644 --- a/src/gui/editdialog.cpp +++ b/src/gui/editdialog.cpp @@ -31,6 +31,8 @@ #include <guichan/font.hpp> +#include "debug.h" + EditDialog::EditDialog(const std::string &title, const std::string &msg, std::string eventOk, int width, Window *parent, bool modal): diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp index bd7e857f9..d23443a2f 100644 --- a/src/gui/emotepopup.cpp +++ b/src/gui/emotepopup.cpp @@ -41,6 +41,8 @@ #include <guichan/mouseinput.hpp> #include <guichan/selectionlistener.hpp> +#include "debug.h" + const int EmotePopup::gridWidth = 34; // emote icon width + 4 const int EmotePopup::gridHeight = 36; // emote icon height + 4 diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index bb1fc325b..edad33623 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -50,6 +50,8 @@ #include <guichan/font.hpp> +#include "debug.h" + static const int BOX_WIDTH = 36; static const int BOX_HEIGHT = 36; diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp index 2a3ed9f4a..ec854cf87 100644 --- a/src/gui/focushandler.cpp +++ b/src/gui/focushandler.cpp @@ -24,6 +24,8 @@ #include "gui/widgets/window.h" +#include "debug.h" + void FocusHandler::requestModalFocus(gcn::Widget *widget) { /* If there is another widget with modal focus, remove its modal focus diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index aecb6a6f8..9df692515 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -45,6 +45,8 @@ #include <guichan/exception.hpp> #include <guichan/image.hpp> +#include "debug.h" + // Guichan stuff Gui *gui = 0; SDLInput *guiInput = 0; diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp index c6afb0fd1..e0e42c0bb 100644 --- a/src/gui/helpwindow.cpp +++ b/src/gui/helpwindow.cpp @@ -37,6 +37,8 @@ #include "utils/gettext.h" +#include "debug.h" + HelpWindow::HelpWindow(): Window(_("Help")) { diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index a12f4cf61..056afee92 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -59,6 +59,8 @@ #include <string> +#include "debug.h" + InventoryWindow::WindowList InventoryWindow::instances; InventoryWindow::InventoryWindow(Inventory *inventory): diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp index 5506f1690..908a861dd 100644 --- a/src/gui/itemamountwindow.cpp +++ b/src/gui/itemamountwindow.cpp @@ -46,6 +46,8 @@ #include <math.h> +#include "debug.h" + class ItemsModal : public gcn::ListModel { public: diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index 5e50e2e55..e7def2234 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -45,6 +45,8 @@ #include <guichan/widgets/label.hpp> #include <guichan/widgets/container.hpp> +#include "debug.h" + ItemPopup::ItemPopup(): Popup("ItemPopup"), mIcon(0), diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp index 4b20d5270..610e76208 100644 --- a/src/gui/killstats.cpp +++ b/src/gui/killstats.cpp @@ -39,6 +39,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + KillStats::KillStats(): Window(_("Kill stats")), mKillCounter(0), mExpCounter(0), mKillTCounter(0), mExpTCounter(0), mKillTimer(0), diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp index e32caeb13..436e401a8 100644 --- a/src/gui/logindialog.cpp +++ b/src/gui/logindialog.cpp @@ -43,6 +43,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + static const int MAX_SERVER_LIST_SIZE = 15; static const int LOGIN_DIALOG_WIDTH = 300; static const int LOGIN_DIALOG_HEIGHT = 140; diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index 93f84bcf7..b85826679 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -41,6 +41,8 @@ #include <guichan/font.hpp> +#include "debug.h" + bool Minimap::mShow = true; Minimap::Minimap(): diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp index 213693e0a..6809a5149 100644 --- a/src/gui/ministatus.cpp +++ b/src/gui/ministatus.cpp @@ -46,6 +46,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + extern volatile int tick_time; MiniStatusWindow::MiniStatusWindow(): diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index a6a3f085e..d8dc68fd1 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -46,6 +46,8 @@ #include <guichan/font.hpp> +#include "debug.h" + #define CAPTION_WAITING _("Waiting for server") #define CAPTION_NEXT _("Next") #define CAPTION_CLOSE _("Close") diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp index 7ba8d301a..0ba4e44b6 100644 --- a/src/gui/npcpostdialog.cpp +++ b/src/gui/npcpostdialog.cpp @@ -34,6 +34,8 @@ #include "utils/gettext.h" +#include "debug.h" + NpcPostDialog::DialogList NpcPostDialog::instances; NpcPostDialog::NpcPostDialog(int npcId): diff --git a/src/gui/okdialog.cpp b/src/gui/okdialog.cpp index fde7d6670..122d7176f 100644 --- a/src/gui/okdialog.cpp +++ b/src/gui/okdialog.cpp @@ -31,6 +31,8 @@ #include <guichan/font.hpp> +#include "debug.h" + OkDialog::OkDialog(const std::string &title, const std::string &msg, bool modal, bool showCenter, Window *parent): Window(title, modal, parent) diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp index 57ad6ab21..6f2c35921 100644 --- a/src/gui/outfitwindow.cpp +++ b/src/gui/outfitwindow.cpp @@ -51,6 +51,8 @@ #include <vector> +#include "debug.h" + float OutfitWindow::mAlpha = 1.0; OutfitWindow::OutfitWindow(): diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp index 5a61c332a..f5c074f6c 100644 --- a/src/gui/palette.cpp +++ b/src/gui/palette.cpp @@ -34,6 +34,8 @@ #include <math.h> +#include "debug.h" + const gcn::Color Palette::BLACK = gcn::Color(0, 0, 0); Palette::Palettes Palette::mInstances; diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 88ae0e376..f84088cc1 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -78,6 +78,8 @@ #include <cassert> +#include "debug.h" + std::string tradePartnerName(""); PopupMenu::PopupMenu(): diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp index 423e2404d..28a3332bf 100644 --- a/src/gui/quitdialog.cpp +++ b/src/gui/quitdialog.cpp @@ -43,6 +43,8 @@ #include <assert.h> +#include "debug.h" + QuitDialog::QuitDialog(QuitDialog** pointerToMe): Window(_("Quit"), true, NULL), mMyPointer(pointerToMe) { diff --git a/src/gui/register.cpp b/src/gui/register.cpp index 4bce1b8b8..b7bbc4ab2 100644 --- a/src/gui/register.cpp +++ b/src/gui/register.cpp @@ -44,6 +44,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + WrongDataNoticeListener::WrongDataNoticeListener(): mTarget(0) { diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp index 655a00f05..9cbee4e89 100644 --- a/src/gui/sdlfont.cpp +++ b/src/gui/sdlfont.cpp @@ -35,6 +35,8 @@ #include <guichan/exception.hpp> +#include "debug.h" + const unsigned int CACHE_SIZE = 256; const unsigned int CACHE_SIZE_SMALL1 = 2; const unsigned int CACHE_SIZE_SMALL2 = 50; diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp index e1ed7c1b0..fdbc53ea8 100644 --- a/src/gui/selldialog.cpp +++ b/src/gui/selldialog.cpp @@ -45,6 +45,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + SellDialog::DialogList SellDialog::instances; SellDialog::SellDialog(int npcId): diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 76dada241..0dc817646 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -55,6 +55,8 @@ #include <iostream> #include <string> +#include "debug.h" + static const int MAX_SERVERLIST = 15; static std::string serverTypeToString(ServerInfo::Type type) diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 5db19b97d..76588a860 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -42,6 +42,8 @@ #include "utils/dtor.h" #include "utils/gettext.h" +#include "debug.h" + extern Window *statusWindow; Setup::Setup(): diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp index 92acdaabe..28e6d8cfa 100644 --- a/src/gui/setup_audio.cpp +++ b/src/gui/setup_audio.cpp @@ -36,6 +36,8 @@ #include "utils/gettext.h" +#include "debug.h" + Setup_Audio::Setup_Audio(): mMusicVolume(config.getIntValue("musicVolume")), mSfxVolume(config.getIntValue("sfxVolume")), diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp index a5b211d8f..4d9bc9876 100644 --- a/src/gui/setup_chat.cpp +++ b/src/gui/setup_chat.cpp @@ -37,6 +37,8 @@ #include "utils/gettext.h" +#include "debug.h" + #define ACTION_REMOVE_COLORS "remove colors" #define ACTION_MAGIC_IN_DEBUG "magic in debug" #define ACTION_ALLOW_COMMANDS_IN_CHATTABS "allow commands" diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp index 0b30aa08e..c3bda11bc 100644 --- a/src/gui/setup_colors.cpp +++ b/src/gui/setup_colors.cpp @@ -42,6 +42,8 @@ #include <string> #include <cmath> +#include "debug.h" + const std::string Setup_Colors::rawmsg = _("This is what the color looks like"); diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp index 2f45319a8..aadfc11e3 100644 --- a/src/gui/setup_joystick.cpp +++ b/src/gui/setup_joystick.cpp @@ -32,6 +32,8 @@ #include "utils/gettext.h" +#include "debug.h" + extern Joystick *joystick; Setup_Joystick::Setup_Joystick(): diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp index 0fc23cac7..5125541cf 100644 --- a/src/gui/setup_keyboard.cpp +++ b/src/gui/setup_keyboard.cpp @@ -39,6 +39,8 @@ #include <SDL_keyboard.h> +#include "debug.h" + /** * The list model for key function list. * diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp index bc1a07ed3..311a06bb5 100644 --- a/src/gui/setup_other.cpp +++ b/src/gui/setup_other.cpp @@ -35,6 +35,8 @@ #include "utils/gettext.h" +#include "debug.h" + #define ACTION_SHOW_TAKEDDAMAGE "taked damage" #define ACTION_ONLY_REACHABLE "only reachable" #define ACTION_ERRORS_IN_DEBUG "errors in debug" diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp index 0290c24d5..e071eee73 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -55,6 +55,8 @@ #define WIDGET_AT(row, column) (((row) * COLUMNS_NR) + column) +#include "debug.h" + static const char *table_titles[COLUMNS_NR] = { N_("Name"), diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp index faaeeb00f..b9ba8e3dc 100644 --- a/src/gui/setup_theme.cpp +++ b/src/gui/setup_theme.cpp @@ -42,6 +42,8 @@ #include "resources/resourcemanager.h" +#include "debug.h" + const char* ACTION_THEME = "theme"; const char* ACTION_FONT = "font"; const char* ACTION_BOLD_FONT = "bold font"; diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 9c84dd9d7..59f3ccf34 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -56,6 +56,8 @@ #include <string> #include <vector> +#include "debug.h" + extern Graphics *graphics; /** diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp index 81710dda3..549979905 100644 --- a/src/gui/shopwindow.cpp +++ b/src/gui/shopwindow.cpp @@ -65,6 +65,8 @@ #include <sys/stat.h> +#include "debug.h" + extern std::string tradePartnerName; ShopWindow::DialogList ShopWindow::instances; diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp index dce04d150..f9db35ff6 100644 --- a/src/gui/shortcutwindow.cpp +++ b/src/gui/shortcutwindow.cpp @@ -32,6 +32,8 @@ #include "gui/widgets/tab.h" #include "gui/widgets/tabbedarea.h" +#include "debug.h" + static const int SCROLL_PADDING = 0; int ShortcutWindow::mBoxesWidth = 0; diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index a58a3e169..ee1803604 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -56,10 +56,11 @@ #include <set> #include <string> +#include "debug.h" + class SkillModel; class SkillEntry; - struct SkillInfo { unsigned short id; diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index e943d7286..0be9dd70f 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -57,6 +57,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + class SocialTab : public Tab { protected: diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp index d3583e0f5..1c41752f3 100644 --- a/src/gui/specialswindow.cpp +++ b/src/gui/specialswindow.cpp @@ -51,6 +51,8 @@ #include <string> +#include "debug.h" + #define SPECIALS_WIDTH 200 #define SPECIALS_HEIGHT 32 diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index 877af76a1..7356cc633 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -34,6 +34,8 @@ #include <guichan/widgets/label.hpp> +#include "debug.h" + SpeechBubble::SpeechBubble(): Popup("Speech", "speechbubble.xml") { diff --git a/src/gui/spellpopup.cpp b/src/gui/spellpopup.cpp index 80fa9f378..3c6d17599 100644 --- a/src/gui/spellpopup.cpp +++ b/src/gui/spellpopup.cpp @@ -37,6 +37,8 @@ #include <guichan/font.hpp> #include <guichan/widgets/label.hpp> +#include "debug.h" + SpellPopup::SpellPopup(): Popup("SpellPopup") { diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp index f098ff9eb..9ac2cfad0 100644 --- a/src/gui/statuspopup.cpp +++ b/src/gui/statuspopup.cpp @@ -41,6 +41,8 @@ #include <guichan/font.hpp> #include <guichan/widgets/label.hpp> +#include "debug.h" + StatusPopup::StatusPopup(): Popup("StatusPopup") { diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index ef2ce78ed..bfd18c40f 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -52,6 +52,8 @@ #include "utils/mathutils.h" #include "utils/stringutils.h" +#include "debug.h" + class AttrDisplay : public Container { public: diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp index e169e9303..b3a1440e1 100644 --- a/src/gui/textcommandeditor.cpp +++ b/src/gui/textcommandeditor.cpp @@ -53,6 +53,8 @@ #include "resources/itemdb.h" #include "resources/iteminfo.h" +#include "debug.h" + class IconsModal : public gcn::ListModel { public: diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp index f8d3588fb..a80e25260 100644 --- a/src/gui/textdialog.cpp +++ b/src/gui/textdialog.cpp @@ -33,6 +33,8 @@ #include <guichan/font.hpp> +#include "debug.h" + int TextDialog::instances = 0; TextDialog::TextDialog(const std::string &title, const std::string &msg, diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp index 77bd4bae6..049f86d76 100644 --- a/src/gui/textpopup.cpp +++ b/src/gui/textpopup.cpp @@ -36,6 +36,8 @@ #include <guichan/font.hpp> #include <guichan/widgets/label.hpp> +#include "debug.h" + TextPopup::TextPopup(): Popup("TextPopup") { diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 98251948f..0817df564 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -42,6 +42,8 @@ #include <algorithm> #include <physfs.h> +#include "debug.h" + static std::string defaultThemePath; std::string Theme::mThemePath; diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp index 25c478c21..6ed09669a 100644 --- a/src/gui/tradewindow.cpp +++ b/src/gui/tradewindow.cpp @@ -53,6 +53,8 @@ #include <sstream> +#include "debug.h" + #define CAPTION_PROPOSE _("Propose trade") #define CAPTION_CONFIRMED _("Confirmed. Waiting...") #define CAPTION_ACCEPT _("Agree trade") diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp index 4d3483a30..8f845e746 100644 --- a/src/gui/unregisterdialog.cpp +++ b/src/gui/unregisterdialog.cpp @@ -44,6 +44,8 @@ #include <string> #include <sstream> +#include "debug.h" + UnRegisterDialog::UnRegisterDialog(LoginData *loginData): Window(_("Unregister"), true), mWrongDataNoticeListener(new WrongDataNoticeListener), diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index bc74aeb58..42ed1c289 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -50,6 +50,8 @@ #include <sys/stat.h> +#include "debug.h" + const std::string xmlUpdateFile = "resources.xml"; const std::string txtUpdateFile = "resources2.txt"; diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index bc5576469..40dddc4f1 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -34,6 +34,8 @@ #include <math.h> +#include "debug.h" + const std::string ColorTypeNames[] = { "ColorBeing", diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 09fc7d24c..3c13fcb7e 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -51,6 +51,8 @@ #include "utils/stringutils.h" +#include "debug.h" + extern volatile int tick_time; Viewport::Viewport(): diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index c1b7f03d1..dfb896778 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -48,6 +48,16 @@ // Curl should be included after Guichan to avoid Windows redefinitions #include <curl/curl.h> +#include "debug.h" + +#ifdef free +#undef free +#endif + +#ifdef malloc +#undef malloc +#endif + bool stringCompare(const std::string &left, const std::string &right); bool stringCompare(const std::string &left, const std::string &right ) diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index c1025e66d..c4737160b 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -40,6 +40,8 @@ #include <guichan/font.hpp> +#include "debug.h" + int AvatarListBox::instances = 0; Image *AvatarListBox::onlineIcon = 0; Image *AvatarListBox::offlineIcon = 0; diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp index e5f8c0f77..e72c78ee0 100644 --- a/src/gui/widgets/battletab.cpp +++ b/src/gui/widgets/battletab.cpp @@ -39,6 +39,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + BattleTab::BattleTab() : ChatTab(_("Battle")) { diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 5d144c5a9..f3ee7270b 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -44,6 +44,8 @@ #include <algorithm> +#include "debug.h" + BrowserBox::BrowserBox(unsigned int mode, bool opaque): gcn::Widget(), mLinkHandler(0), diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index c0f174b2c..ba3ac5f36 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -38,6 +38,8 @@ #include <guichan/exception.hpp> #include <guichan/font.hpp> +#include "debug.h" + int Button::mInstances = 0; float Button::mAlpha = 1.0; diff --git a/src/gui/widgets/channeltab.cpp b/src/gui/widgets/channeltab.cpp index df2df2790..87d87f7d1 100644 --- a/src/gui/widgets/channeltab.cpp +++ b/src/gui/widgets/channeltab.cpp @@ -29,6 +29,8 @@ #include "utils/gettext.h" +#include "debug.h" + ChannelTab::ChannelTab(Channel *channel) : ChatTab(channel->getName()), mChannel(channel) diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 3c277fc8d..76f74dec8 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -46,6 +46,8 @@ #include <guichan/widgets/tabbedarea.hpp> +#include "debug.h" + #define MAX_WORD_SIZE 50 ChatTab::ChatTab(const std::string &name) : diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index 9832c0cbd..0422345f7 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -33,6 +33,8 @@ #include <guichan/actionlistener.hpp> +#include "debug.h" + int CheckBox::instances = 0; float CheckBox::mAlpha = 1.0; Image *CheckBox::checkBoxNormal; diff --git a/src/gui/widgets/container.cpp b/src/gui/widgets/container.cpp index 136dedb97..96cea7119 100644 --- a/src/gui/widgets/container.cpp +++ b/src/gui/widgets/container.cpp @@ -22,6 +22,8 @@ #include "gui/widgets/container.h" +#include "debug.h" + Container::Container() { setOpaque(false); diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 09c106632..8b6217da2 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -36,6 +36,8 @@ #include "utils/stringutils.h" +#include "debug.h" + Desktop::Desktop() : mWallpaper(0) { diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 3fe015e2f..681d7736e 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -39,6 +39,8 @@ #include <algorithm> +#include "debug.h" + int DropDown::instances = 0; Image *DropDown::buttons[2][2]; ImageRect DropDown::skin; diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp index c3aaed829..0125558dc 100644 --- a/src/gui/widgets/dropshortcutcontainer.cpp +++ b/src/gui/widgets/dropshortcutcontainer.cpp @@ -43,6 +43,8 @@ #include "utils/stringutils.h" +#include "debug.h" + DropShortcutContainer::DropShortcutContainer(): ShortcutContainer(), mItemClicked(false), diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index 6e15d4bf9..c45c0a44c 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -41,6 +41,8 @@ #include "utils/dtor.h" +#include "debug.h" + static const int MAX_ITEMS = 44; EmoteShortcutContainer::EmoteShortcutContainer(): diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp index cf7c76d68..98b90cdc7 100644 --- a/src/gui/widgets/flowcontainer.cpp +++ b/src/gui/widgets/flowcontainer.cpp @@ -21,6 +21,8 @@ #include "flowcontainer.h" +#include "debug.h" + FlowContainer::FlowContainer(int boxWidth, int boxHeight): mBoxWidth(boxWidth), mBoxHeight(boxHeight), mGridWidth(1), mGridHeight(1) diff --git a/src/gui/widgets/horizontcontainer.cpp b/src/gui/widgets/horizontcontainer.cpp index 7863408b2..a04230871 100644 --- a/src/gui/widgets/horizontcontainer.cpp +++ b/src/gui/widgets/horizontcontainer.cpp @@ -21,6 +21,8 @@ #include "gui/widgets/horizontcontainer.h" +#include "debug.h" + HorizontContainer::HorizontContainer(int height, int spacing): mSpacing(spacing), mCount(0), diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp index ba1fa7e26..2799080b6 100644 --- a/src/gui/widgets/icon.cpp +++ b/src/gui/widgets/icon.cpp @@ -27,6 +27,8 @@ #include "resources/image.h" #include "resources/resourcemanager.h" +#include "debug.h" + Icon::Icon(const std::string &file) : mImage(0) { diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp index 1feedd503..021340fbe 100644 --- a/src/gui/widgets/inttextfield.cpp +++ b/src/gui/widgets/inttextfield.cpp @@ -26,6 +26,8 @@ #include "utils/stringutils.h" +#include "debug.h" + IntTextField::IntTextField(int def, int min, int max, bool enabled, int width): TextField(toString(def)), diff --git a/src/gui/widgets/inventoryfilter.cpp b/src/gui/widgets/inventoryfilter.cpp index 8c62849a1..a220fdb98 100644 --- a/src/gui/widgets/inventoryfilter.cpp +++ b/src/gui/widgets/inventoryfilter.cpp @@ -25,6 +25,8 @@ #include "log.h" +#include "debug.h" + InventoryFilter::InventoryFilter(std::string group, int height, int spacing): HorizontContainer(height, spacing), mGroup(group) diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 509c7b218..d4cecced2 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -50,6 +50,8 @@ #include <guichan/mouseinput.hpp> #include <guichan/selectionlistener.hpp> +#include "debug.h" + // TODO: Add support for adding items to the item shortcut window (global // itemShortcut). diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index 87d708cd0..0d6ef9990 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -32,6 +32,8 @@ #include "resources/itemdb.h" +#include "debug.h" + ItemLinkHandler::ItemLinkHandler() { mItemPopup = new ItemPopup; diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 513b7cb51..4d0758e3d 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -46,6 +46,8 @@ #include "utils/stringutils.h" +#include "debug.h" + ItemShortcutContainer::ItemShortcutContainer(unsigned number): ShortcutContainer(), mItemClicked(false), diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp index 56c604e64..16b813dd5 100644 --- a/src/gui/widgets/label.cpp +++ b/src/gui/widgets/label.cpp @@ -22,6 +22,8 @@ #include "gui/theme.h" +#include "debug.h" + Label::Label() { } diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp index 3dc4eb038..274c17d61 100644 --- a/src/gui/widgets/layout.cpp +++ b/src/gui/widgets/layout.cpp @@ -26,6 +26,8 @@ #include <cassert> +#include "debug.h" + ContainerPlacer ContainerPlacer::at(int x, int y) { return ContainerPlacer(mContainer, &mCell->at(x, y)); diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp index 17d4cb651..cded6313a 100644 --- a/src/gui/widgets/layouthelper.cpp +++ b/src/gui/widgets/layouthelper.cpp @@ -22,6 +22,8 @@ #include "gui/widgets/layouthelper.h" +#include "debug.h" + LayoutHelper::LayoutHelper(gcn::Container *container): mContainer(container) { diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 574cadf94..ae75d469e 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -34,6 +34,8 @@ #include <guichan/key.hpp> #include <guichan/listmodel.hpp> +#include "debug.h" + float ListBox::mAlpha = 1.0; ListBox::ListBox(gcn::ListModel *listModel): diff --git a/src/gui/widgets/passwordfield.cpp b/src/gui/widgets/passwordfield.cpp index 57ba6f695..34639b063 100644 --- a/src/gui/widgets/passwordfield.cpp +++ b/src/gui/widgets/passwordfield.cpp @@ -22,6 +22,8 @@ #include "passwordfield.h" +#include "debug.h" + PasswordField::PasswordField(const std::string &text): TextField(text) { diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index e3905e523..2efaa2088 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -34,6 +34,8 @@ #include "utils/dtor.h" +#include "debug.h" + int PlayerBox::instances = 0; float PlayerBox::mAlpha = 1.0; ImageRect PlayerBox::background; diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index bc15a4c2c..444d147ff 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -38,6 +38,8 @@ #include <guichan/exception.hpp> +#include "debug.h" + Popup::Popup(const std::string &name, const std::string &skin): mPopupName(name), mMinWidth(100), diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index bbde65207..363bab319 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -38,6 +38,8 @@ #include <guichan/font.hpp> +#include "debug.h" + ImageRect ProgressBar::mBorder; int ProgressBar::mInstances = 0; float ProgressBar::mAlpha = 1.0; diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp index 9ca6fe3b8..e885aa0ec 100644 --- a/src/gui/widgets/progressindicator.cpp +++ b/src/gui/widgets/progressindicator.cpp @@ -32,6 +32,8 @@ #include <guichan/widgets/label.hpp> +#include "debug.h" + ProgressIndicator::ProgressIndicator() { ImageSet *images = Theme::getImageSetFromTheme("progress-indicator.png", diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index ffea0f372..8e3fdb9bb 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -30,6 +30,8 @@ #include "resources/image.h" +#include "debug.h" + int RadioButton::instances = 0; float RadioButton::mAlpha = 1.0; Image *RadioButton::radioNormal; diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp index 3350adc6a..cf017b9ec 100644 --- a/src/gui/widgets/resizegrip.cpp +++ b/src/gui/widgets/resizegrip.cpp @@ -32,6 +32,8 @@ #include <guichan/graphics.hpp> +#include "debug.h" + Image *ResizeGrip::gripImage = 0; int ResizeGrip::mInstances = 0; float ResizeGrip::mAlpha = 1.0; diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index 59e323e94..e290be21a 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -34,6 +34,8 @@ #include "utils/dtor.h" +#include "debug.h" + int ScrollArea::instances = 0; float ScrollArea::mAlpha = 1.0; ImageRect ScrollArea::background; diff --git a/src/gui/widgets/setuptab.cpp b/src/gui/widgets/setuptab.cpp index 127cd0f96..e98e9c3ac 100644 --- a/src/gui/widgets/setuptab.cpp +++ b/src/gui/widgets/setuptab.cpp @@ -22,6 +22,8 @@ #include "gui/widgets/setuptab.h" +#include "debug.h" + SetupTab::SetupTab() { setOpaque(false); diff --git a/src/gui/widgets/shopitems.cpp b/src/gui/widgets/shopitems.cpp index 764f22a57..85ee0a181 100644 --- a/src/gui/widgets/shopitems.cpp +++ b/src/gui/widgets/shopitems.cpp @@ -26,6 +26,8 @@ #include "utils/dtor.h" +#include "debug.h" + ShopItems::ShopItems(bool mergeDuplicates) : mMergeDuplicates(mergeDuplicates) { diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index 2965cba5d..81a3b7b58 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -38,6 +38,8 @@ #include <guichan/font.hpp> #include <guichan/listmodel.hpp> +#include "debug.h" + const int ITEM_ICON_SIZE = 32; float ShopListBox::mAlpha = 1.0; diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp index a804f2658..d4065677a 100644 --- a/src/gui/widgets/shortcutcontainer.cpp +++ b/src/gui/widgets/shortcutcontainer.cpp @@ -28,6 +28,8 @@ #include "utils/stringutils.h" +#include "debug.h" + float ShortcutContainer::mAlpha = 1.0; ShortcutContainer::ShortcutContainer(): diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 8d452dfbf..7950f6a24 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -30,6 +30,8 @@ #include "resources/image.h" +#include "debug.h" + Image *Slider::hStart, *Slider::hMid, *Slider::hEnd, *Slider::hGrip; Image *Slider::vStart, *Slider::vMid, *Slider::vEnd, *Slider::vGrip; Image *Slider::hStartHi, *Slider::hMidHi, *Slider::hEndHi, *Slider::hGripHi; diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index 8f4cee1ac..bfeecbfa0 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -48,6 +48,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + SpellShortcutContainer::SpellShortcutContainer(unsigned number): ShortcutContainer(), mSpellClicked(false), diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index 5e4a147c0..7287d6a8e 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -39,6 +39,8 @@ #include <guichan/widgets/label.hpp> +#include "debug.h" + int Tab::mInstances = 0; float Tab::mAlpha = 1.0; diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index e76ac6d57..da6dfb64c 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -29,6 +29,8 @@ #include <guichan/widgets/container.hpp> +#include "debug.h" + TabbedArea::TabbedArea() : gcn::TabbedArea(), mTabsWidth(0), diff --git a/src/gui/widgets/table.cpp b/src/gui/widgets/table.cpp index ab8b3a339..d5325679f 100644 --- a/src/gui/widgets/table.cpp +++ b/src/gui/widgets/table.cpp @@ -34,6 +34,8 @@ #include <guichan/graphics.hpp> #include <guichan/key.hpp> +#include "debug.h" + float GuiTable::mAlpha = 1.0; class GuiTableActionListener : public gcn::ActionListener diff --git a/src/gui/widgets/tablemodel.cpp b/src/gui/widgets/tablemodel.cpp index f1bfd0832..6c932a411 100644 --- a/src/gui/widgets/tablemodel.cpp +++ b/src/gui/widgets/tablemodel.cpp @@ -26,6 +26,8 @@ #include <guichan/widget.hpp> +#include "debug.h" + void TableModel::installListener(TableModelListener *listener) { if (listener) diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index 8c8804b67..f31c8d129 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -28,6 +28,8 @@ #include <sstream> +#include "debug.h" + TextBox::TextBox() : mTextColor(&Theme::getThemeColor(Theme::TEXT)) { diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 8e61bce3c..fd50ee4d5 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -40,6 +40,8 @@ #undef DELETE //Win32 compatibility hack +#include "debug.h" + int TextField::instances = 0; float TextField::mAlpha = 1.0; ImageRect TextField::skin; diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp index 6d41bef06..07cf19b61 100644 --- a/src/gui/widgets/textpreview.cpp +++ b/src/gui/widgets/textpreview.cpp @@ -32,6 +32,8 @@ #include <typeinfo> +#include "debug.h" + float TextPreview::mAlpha = 1.0; TextPreview::TextPreview(const std::string &text): diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp index 0767dc5fe..99a145d86 100644 --- a/src/gui/widgets/tradetab.cpp +++ b/src/gui/widgets/tradetab.cpp @@ -38,6 +38,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + TradeTab::TradeTab() : ChatTab(_("Trade")) { diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp index ad5199f7c..d4cf0a13f 100644 --- a/src/gui/widgets/vertcontainer.cpp +++ b/src/gui/widgets/vertcontainer.cpp @@ -21,6 +21,8 @@ #include "gui/widgets/vertcontainer.h" +#include "debug.h" + VertContainer::VertContainer(int spacing): mSpacing(spacing), mCount(0) diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp index 0cfd41bcb..bee30b969 100644 --- a/src/gui/widgets/whispertab.cpp +++ b/src/gui/widgets/whispertab.cpp @@ -35,6 +35,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + WhisperTab::WhisperTab(const std::string &nick) : ChatTab(nick), mNick(nick) diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index df8599b95..2b6c4ef58 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -41,6 +41,8 @@ #include <guichan/exception.hpp> #include <guichan/focushandler.hpp> +#include "debug.h" + int Window::instances = 0; int Window::mouseResize = 0; diff --git a/src/gui/widgets/windowcontainer.cpp b/src/gui/widgets/windowcontainer.cpp index f68eb0220..5a3c16037 100644 --- a/src/gui/widgets/windowcontainer.cpp +++ b/src/gui/widgets/windowcontainer.cpp @@ -24,6 +24,8 @@ #include "utils/dtor.h" +#include "debug.h" + WindowContainer *windowContainer = NULL; void WindowContainer::logic() diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 5e93d5c69..719b67829 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -42,6 +42,8 @@ #include <string> +#include "debug.h" + extern Window *equipmentWindow; extern Window *inventoryWindow; extern Window *itemShortcutWindow; diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp index 3a35e3396..7e2afbaa3 100644 --- a/src/gui/worldselectdialog.cpp +++ b/src/gui/worldselectdialog.cpp @@ -39,6 +39,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + extern WorldInfo **server_info; /** |