From 399bb2709e773847707a948610fd74c7f4b94e9f Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Mon, 11 Jul 2005 22:22:45 +0000 Subject: Committed header dependencies reducing patch by Doener --- src/gui/browserbox.cpp | 3 ++- src/gui/browserbox.h | 1 - src/gui/buy.cpp | 1 + src/gui/buy.h | 2 ++ src/gui/buysell.h | 2 ++ src/gui/char_select.cpp | 7 +++---- src/gui/char_select.h | 2 +- src/gui/char_server.cpp | 8 ++++++-- src/gui/char_server.h | 3 --- src/gui/chargedialog.cpp | 6 +----- src/gui/chargedialog.h | 2 ++ src/gui/chat.cpp | 5 +++-- src/gui/chat.h | 4 ++-- src/gui/chatinput.cpp | 1 + src/gui/checkbox.cpp | 3 ++- src/gui/confirm_dialog.h | 1 - src/gui/equipment.cpp | 4 ++-- src/gui/equipment.h | 3 ++- src/gui/gui.cpp | 5 ++++- src/gui/help.cpp | 2 +- src/gui/help.h | 2 ++ src/gui/inventory.cpp | 10 ++++------ src/gui/inventory.h | 6 ++---- src/gui/item_amount.cpp | 4 ++-- src/gui/itemcontainer.cpp | 5 ++++- src/gui/itemcontainer.h | 1 - src/gui/login.cpp | 5 +++-- src/gui/minimap.cpp | 1 - src/gui/minimap.h | 4 ++-- src/gui/newskill.cpp | 3 --- src/gui/npc.h | 2 ++ src/gui/npc_text.h | 2 ++ src/gui/ok_dialog.h | 1 - src/gui/passwordfield.cpp | 1 - src/gui/playerbox.cpp | 3 +-- src/gui/popupmenu.cpp | 4 +++- src/gui/popupmenu.h | 2 ++ src/gui/progressbar.cpp | 2 +- src/gui/radiobutton.cpp | 1 + src/gui/radiobutton.h | 2 +- src/gui/requesttrade.cpp | 1 - src/gui/scrollarea.cpp | 2 -- src/gui/scrollarea.h | 1 - src/gui/sell.cpp | 4 ++-- src/gui/sell.h | 2 ++ src/gui/setup.cpp | 2 +- src/gui/setup.h | 3 ++- src/gui/skill.cpp | 2 +- src/gui/skill.h | 2 ++ src/gui/slider.cpp | 2 +- src/gui/stats.cpp | 2 +- src/gui/stats.h | 2 ++ src/gui/status.cpp | 7 +++++-- src/gui/status.h | 2 ++ src/gui/textfield.h | 1 + src/gui/trade.cpp | 11 +++++------ src/gui/trade.h | 6 ++---- src/gui/updatewindow.h | 1 - src/gui/window.h | 2 -- src/gui/windowcontainer.cpp | 1 - 60 files changed, 98 insertions(+), 84 deletions(-) (limited to 'src/gui') diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp index a2b93c9d..23ed6c5c 100644 --- a/src/gui/browserbox.cpp +++ b/src/gui/browserbox.cpp @@ -22,8 +22,9 @@ */ #include "browserbox.h" +#ifndef USE_OPENGL #include "gui.h" -#include "../main.h" +#endif int BrowserBox::instances = 0; gcn::ImageFont* BrowserBox::browserFont; diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h index 81771289..d9c88b14 100644 --- a/src/gui/browserbox.h +++ b/src/gui/browserbox.h @@ -25,7 +25,6 @@ #define __TMW_BROWSERBOX_H__ #include -#include "window.h" #include "linkhandler.h" struct BROWSER_LINK { diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp index d291650d..8d1986d5 100644 --- a/src/gui/buy.cpp +++ b/src/gui/buy.cpp @@ -26,6 +26,7 @@ #include "slider.h" #include "scrollarea.h" #include "listbox.h" +#include "../resources/itemmanager.h" #include "../game.h" #include "../net/network.h" diff --git a/src/gui/buy.h b/src/gui/buy.h index 693ddffa..6ca66c7a 100644 --- a/src/gui/buy.h +++ b/src/gui/buy.h @@ -101,4 +101,6 @@ class BuyDialog : public Window, public gcn::ActionListener, int money; }; +extern BuyDialog *buyDialog; + #endif diff --git a/src/gui/buysell.h b/src/gui/buysell.h index ab2583cd..dcba4ac0 100644 --- a/src/gui/buysell.h +++ b/src/gui/buysell.h @@ -58,4 +58,6 @@ class BuySellDialog : public Window, public gcn::ActionListener gcn::Button *cancelButton; }; +extern BuySellDialog *buySellDialog; + #endif diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index ebe1a3c8..e4db6fab 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -21,15 +21,14 @@ * $Id$ */ -#include "../main.h" #include "char_select.h" #include "textfield.h" #include "button.h" #include "ok_dialog.h" -#include "../being.h" -#include "../graphics.h" +#include "../main.h" +#include "../game.h" +#include "../log.h" #include "../net/protocol.h" -#include "../resources/resourcemanager.h" #include CharSelectDialog::CharDeleteConfirm::CharDeleteConfirm(CharSelectDialog *m): diff --git a/src/gui/char_select.h b/src/gui/char_select.h index 8cc57e77..5cdb0712 100644 --- a/src/gui/char_select.h +++ b/src/gui/char_select.h @@ -24,7 +24,7 @@ #ifndef _CHAR_SELECT_H #define _CHAR_SELECT_H -#include "../main.h" +#include "../playerinfo.h" #include "../net/network.h" #include "gui.h" #include "confirm_dialog.h" diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp index 8674b6d4..bc53b3d3 100644 --- a/src/gui/char_server.cpp +++ b/src/gui/char_server.cpp @@ -22,12 +22,16 @@ */ #include "char_server.h" -#include "../graphics.h" #include "button.h" -#include "window.h" #include "scrollarea.h" #include "listbox.h" #include "ok_dialog.h" +#include "../log.h" +#include "../main.h" +#include "../playerinfo.h" +#include "../serverinfo.h" +#include "../net/network.h" +#include "gui.h" char server[30]; int showServerList = 1; diff --git a/src/gui/char_server.h b/src/gui/char_server.h index b6fd9f27..42627b9c 100644 --- a/src/gui/char_server.h +++ b/src/gui/char_server.h @@ -24,9 +24,6 @@ #ifndef _CHAR_SEL_SERVER_H #define _CHAR_SEL_SERVER_H -#include "../main.h" -#include "../net/network.h" -#include "gui.h" #include "window.h" diff --git a/src/gui/chargedialog.cpp b/src/gui/chargedialog.cpp index b5ffce44..726e73ff 100644 --- a/src/gui/chargedialog.cpp +++ b/src/gui/chargedialog.cpp @@ -25,11 +25,7 @@ */ #include "chargedialog.h" -#include "listbox.h" -#include "scrollarea.h" -#include "button.h" -#include "../main.h" -#include +#include "../playerinfo.h" ChargeDialog::ChargeDialog(): Window("") diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h index 6615fff6..e544a602 100644 --- a/src/gui/chargedialog.h +++ b/src/gui/chargedialog.h @@ -54,4 +54,6 @@ class ChargeDialog : public Window, public gcn::ActionListener void draw(gcn::Graphics *graphics); }; +extern ChargeDialog* chargeDialog; + #endif diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index b3e072a2..ce5593f9 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -26,9 +26,10 @@ #include "textbox.h" #include "chatinput.h" #include "gui.h" -#include "../graphics.h" -#include "../main.h" +#include "../playerinfo.h" +#include "../net/network.h" #include +#include ChatWindow::ChatWindow(const std::string &logfile): Window("") diff --git a/src/gui/chat.h b/src/gui/chat.h index f459b804..28c3ab0c 100644 --- a/src/gui/chat.h +++ b/src/gui/chat.h @@ -26,8 +26,6 @@ #include #include -#include "../resources/image.h" -#include "../net/network.h" #include "window.h" #include "scrollarea.h" #include "browserbox.h" @@ -213,5 +211,7 @@ class ChatWindow : public Window, public gcn::ActionListener, std::list::iterator curHist; /**< History iterator */ }; +extern ChatWindow *chatWindow; + #endif diff --git a/src/gui/chatinput.cpp b/src/gui/chatinput.cpp index 52e91f3a..028b7151 100644 --- a/src/gui/chatinput.cpp +++ b/src/gui/chatinput.cpp @@ -22,6 +22,7 @@ */ #include "chatinput.h" +#include "../graphics.h" ChatInput::ChatInput() { diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp index ab867b0f..9fb79060 100644 --- a/src/gui/checkbox.cpp +++ b/src/gui/checkbox.cpp @@ -22,8 +22,9 @@ */ #include "checkbox.h" +#include "graphics.h" #include "../resources/resourcemanager.h" -#include "../graphics.h" +#include int CheckBox::instances = 0; Image *CheckBox::checkBoxNormal; diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h index fcbd9b0f..3e24b0e2 100644 --- a/src/gui/confirm_dialog.h +++ b/src/gui/confirm_dialog.h @@ -24,7 +24,6 @@ #ifndef _TMW_OPTION_DIALOG_H #define _TMW_OPTION_DIALOG_H -#include "gui.h" #include "window.h" /** diff --git a/src/gui/equipment.cpp b/src/gui/equipment.cpp index b954eec7..b9cfd0c6 100644 --- a/src/gui/equipment.cpp +++ b/src/gui/equipment.cpp @@ -21,10 +21,10 @@ * $Id$ */ -#include "../main.h" -#include "../graphics.h" #include "equipment.h" +#include "../log.h" #include "../resources/resourcemanager.h" +#include "../resources/itemmanager.h" #include "../resources/image.h" #include diff --git a/src/gui/equipment.h b/src/gui/equipment.h index 2de0af03..87f543ca 100644 --- a/src/gui/equipment.h +++ b/src/gui/equipment.h @@ -25,7 +25,6 @@ #define _TMW_EQUIPMENT_H #include "../graphic/spriteset.h" -#include "gui.h" #include "window.h" typedef struct { @@ -82,4 +81,6 @@ class EquipmentWindow : public Window, gcn::ActionListener { }; +extern EquipmentWindow *equipmentWindow; + #endif diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 0ed123e3..7643c01f 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -25,10 +25,13 @@ #include "window.h" #include "windowcontainer.h" #include "focushandler.h" -#include "../engine.h" #include "../net/protocol.h" #include "../main.h" +#include "../engine.h" #include "../game.h" +#include "../log.h" + +extern Being* autoTarget; // Guichan stuff Gui *gui; diff --git a/src/gui/help.cpp b/src/gui/help.cpp index 5a5f42cc..cff36da8 100644 --- a/src/gui/help.cpp +++ b/src/gui/help.cpp @@ -25,7 +25,7 @@ #include "scrollarea.h" #include "button.h" #include "textbox.h" -#include "../main.h" +#include "../log.h" #include "../resources/resourcemanager.h" HelpWindow::HelpWindow(): diff --git a/src/gui/help.h b/src/gui/help.h index 3c5d95a1..21e27c34 100644 --- a/src/gui/help.h +++ b/src/gui/help.h @@ -69,4 +69,6 @@ class HelpWindow : public Window, public LinkHandler, gcn::ScrollArea *scrollArea; }; +extern HelpWindow *helpWindow; + #endif diff --git a/src/gui/inventory.cpp b/src/gui/inventory.cpp index 9d2669e5..73bf67f5 100644 --- a/src/gui/inventory.cpp +++ b/src/gui/inventory.cpp @@ -21,16 +21,14 @@ * $Id$ */ -#include "../main.h" -#include "../graphics.h" +#include "../playerinfo.h" #include "inventory.h" -#include "../resources/resourcemanager.h" -#include "../resources/image.h" +#include "equipment.h" #include "button.h" #include "scrollarea.h" -#include "../being.h" -#include "../engine.h" +#include "../net/network.h" #include "item_amount.h" +#include "../resources/itemmanager.h" #include InventoryWindow::InventoryWindow(): diff --git a/src/gui/inventory.h b/src/gui/inventory.h index a035ee50..4fcc6870 100644 --- a/src/gui/inventory.h +++ b/src/gui/inventory.h @@ -24,11 +24,7 @@ #ifndef _TMW_INVENTORY_H #define _TMW_INVENTORY_H -#include "../log.h" -#include "../net/network.h" -#include "../graphic/spriteset.h" #include "itemcontainer.h" -#include "gui.h" #include "window.h" /** @@ -109,4 +105,6 @@ class InventoryWindow : public Window, gcn::ActionListener gcn::Label *weightLabel; }; +extern InventoryWindow *inventoryWindow; + #endif diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp index 2afacb05..036fdc15 100644 --- a/src/gui/item_amount.cpp +++ b/src/gui/item_amount.cpp @@ -22,9 +22,9 @@ */ #include "item_amount.h" +#include "inventory.h" +#include "trade.h" #include "button.h" -#include "../engine.h" -#include "../main.h" ItemAmountWindow::ItemAmountWindow(int usage, Window *parent): Window("Select amount of items to drop.", true, parent) diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp index f66a6eff..3fbad89a 100644 --- a/src/gui/itemcontainer.cpp +++ b/src/gui/itemcontainer.cpp @@ -21,9 +21,12 @@ * $Id$ */ -#include "../main.h" #include "itemcontainer.h" +#include "../main.h" +#include "../log.h" +#include "../graphics.h" #include "../resources/resourcemanager.h" +#include "../resources/itemmanager.h" #include ItemContainer::ItemContainer() diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h index fd38e818..a0e3b79a 100644 --- a/src/gui/itemcontainer.h +++ b/src/gui/itemcontainer.h @@ -26,7 +26,6 @@ #include #include -#include "../graphics.h" #include "../resources/image.h" #include "../graphic/spriteset.h" diff --git a/src/gui/login.cpp b/src/gui/login.cpp index 6c610e1d..9f3b230e 100644 --- a/src/gui/login.cpp +++ b/src/gui/login.cpp @@ -22,14 +22,15 @@ */ #include "login.h" -#include "gui.h" #include "button.h" #include "checkbox.h" #include "textfield.h" #include "passwordfield.h" #include "ok_dialog.h" -#include "../graphics.h" +#include "gui.h" #include "../main.h" +#include "../serverinfo.h" +#include "../log.h" #include "../net/network.h" #include diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index 58e8df80..8ce7ffd7 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -24,7 +24,6 @@ #include "minimap.h" #include "../being.h" #include "../resources/resourcemanager.h" -#include "../graphics.h" Minimap::Minimap(): Window("Map"), diff --git a/src/gui/minimap.h b/src/gui/minimap.h index 3710332c..20063d15 100644 --- a/src/gui/minimap.h +++ b/src/gui/minimap.h @@ -24,9 +24,9 @@ #ifndef _TMW_MINIMAP_H #define _TMW_MINIMAP_H -#include "../map.h" -#include "gui.h" #include "window.h" +#include "../map.h" +#include "../resources/image.h" /** * Minimap dialog. diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp index 5849e020..800c4a28 100644 --- a/src/gui/newskill.cpp +++ b/src/gui/newskill.cpp @@ -26,10 +26,7 @@ */ #include "newskill.h" -#include "listbox.h" -#include "scrollarea.h" #include "button.h" -#include "../main.h" char *skill_name[] = { // 0-99 diff --git a/src/gui/npc.h b/src/gui/npc.h index 5bede528..afe56805 100644 --- a/src/gui/npc.h +++ b/src/gui/npc.h @@ -86,4 +86,6 @@ class NpcListDialog : public Window, public gcn::ActionListener, std::vector items; }; +extern NpcListDialog *npcListDialog; + #endif diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h index bae47ce8..e3f16293 100644 --- a/src/gui/npc_text.h +++ b/src/gui/npc_text.h @@ -75,4 +75,6 @@ class NpcTextDialog : public Window, public gcn::ActionListener gcn::ScrollArea *scrollArea; }; +extern NpcTextDialog *npcTextDialog; + #endif diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h index bb1a4e58..1287bc7f 100644 --- a/src/gui/ok_dialog.h +++ b/src/gui/ok_dialog.h @@ -24,7 +24,6 @@ #ifndef _OK_DIALOG_H #define _OK_DIALOG_H -#include "gui.h" #include "window.h" /** diff --git a/src/gui/passwordfield.cpp b/src/gui/passwordfield.cpp index aa5c3141..29ddb86b 100644 --- a/src/gui/passwordfield.cpp +++ b/src/gui/passwordfield.cpp @@ -22,7 +22,6 @@ */ #include "passwordfield.h" -#include "gui.h" PasswordField::PasswordField(const std::string& text): diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp index 9514d335..c62596fc 100644 --- a/src/gui/playerbox.cpp +++ b/src/gui/playerbox.cpp @@ -22,9 +22,8 @@ */ #include "playerbox.h" -#include "gui.h" -#include "../being.h" #include "../main.h" +#include "../being.h" #include "../resources/resourcemanager.h" int PlayerBox::instances = 0; diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 3c3b26b7..36c246a6 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -23,8 +23,10 @@ #include "popupmenu.h" #include "../graphics.h" -#include "../engine.h" #include "../game.h" +#include "../engine.h" +#include "../net/network.h" +#include "../resources/itemmanager.h" #include PopupMenu::PopupMenu(): diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index 77c8931a..c21d4758 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -75,4 +75,6 @@ class PopupMenu : public Window, public LinkHandler FloorItem* floorItem; }; +extern PopupMenu *popupMenu; + #endif diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp index d939b3b5..47225acd 100644 --- a/src/gui/progressbar.cpp +++ b/src/gui/progressbar.cpp @@ -22,7 +22,7 @@ */ #include "progressbar.h" -#include "gui.h" +#include "../graphics.h" #include "../resources/resourcemanager.h" ProgressBar::ProgressBar(float progress, int x, int y, int width, int height, diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp index f03c333f..4b3a439e 100644 --- a/src/gui/radiobutton.cpp +++ b/src/gui/radiobutton.cpp @@ -22,6 +22,7 @@ */ #include "radiobutton.h" +#include "../graphics.h" #include "../resources/resourcemanager.h" int RadioButton::instances = 0; diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h index 343854d2..2249059d 100644 --- a/src/gui/radiobutton.h +++ b/src/gui/radiobutton.h @@ -24,7 +24,7 @@ #ifndef _TMW_RADIOBUTTON_H #define _TMW_RADIOBUTTON_H -#include "gui.h" +#include #include "../resources/image.h" /* diff --git a/src/gui/requesttrade.cpp b/src/gui/requesttrade.cpp index 66ca6480..ce6ccb56 100644 --- a/src/gui/requesttrade.cpp +++ b/src/gui/requesttrade.cpp @@ -23,7 +23,6 @@ #include "requesttrade.h" #include "button.h" -#include "../game.h" #include "../net/network.h" RequestTradeDialog::RequestTradeDialog(const char *name): diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp index 319025a0..03234dca 100644 --- a/src/gui/scrollarea.cpp +++ b/src/gui/scrollarea.cpp @@ -22,9 +22,7 @@ */ #include "scrollarea.h" -#include "gui.h" #include "../resources/resourcemanager.h" -#include "../main.h" int ScrollArea::instances = 0; ImageRect ScrollArea::background; diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h index 66ec1542..20de2255 100644 --- a/src/gui/scrollarea.h +++ b/src/gui/scrollarea.h @@ -26,7 +26,6 @@ #include #include "../graphics.h" -#include "../configuration.h" /** * A scroll area. diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp index 95c4a2dc..5693e091 100644 --- a/src/gui/sell.cpp +++ b/src/gui/sell.cpp @@ -22,14 +22,14 @@ */ #include "sell.h" +#include "inventory.h" #include "button.h" #include "slider.h" #include "scrollarea.h" #include "listbox.h" -#include "../graphics.h" #include "../game.h" -#include "../engine.h" #include "../net/network.h" +#include "../resources/itemmanager.h" #include diff --git a/src/gui/sell.h b/src/gui/sell.h index 17763bf6..48617d17 100644 --- a/src/gui/sell.h +++ b/src/gui/sell.h @@ -89,4 +89,6 @@ class SellDialog : public Window, public gcn::ActionListener, int maxItems; }; +extern SellDialog *sellDialog; + #endif diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index b839c459..a1c1f500 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -26,9 +26,9 @@ #include "checkbox.h" #include "scrollarea.h" #include "listbox.h" -#include "radiobutton.h" #include "slider.h" #include "ok_dialog.h" +#include "../log.h" #include "../main.h" #include diff --git a/src/gui/setup.h b/src/gui/setup.h index 2adc9708..30eda305 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -25,7 +25,6 @@ #define _TMW_SETUP_H #include "window.h" -#include "../sound.h" /** * The list model for mode list. @@ -99,4 +98,6 @@ class Setup : public Window, public gcn::ActionListener { }; +extern Setup *setupWindow; + #endif diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp index e511a24e..b4315d3e 100644 --- a/src/gui/skill.cpp +++ b/src/gui/skill.cpp @@ -25,7 +25,7 @@ #include "listbox.h" #include "scrollarea.h" #include "button.h" -#include "../main.h" +#include "../playerinfo.h" #include "../net/network.h" char *skill_db[] = { diff --git a/src/gui/skill.h b/src/gui/skill.h index 0a87afed..7bff96cf 100644 --- a/src/gui/skill.h +++ b/src/gui/skill.h @@ -73,4 +73,6 @@ class SkillDialog : public Window, public gcn::ActionListener, void setSkill(int id, int lv, int sp); }; +extern SkillDialog *skillDialog; + #endif diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp index 1a4482a5..6bbe1bed 100644 --- a/src/gui/slider.cpp +++ b/src/gui/slider.cpp @@ -22,8 +22,8 @@ */ #include "slider.h" -#include "../resources/resourcemanager.h" #include "../graphics.h" +#include "../resources/resourcemanager.h" Image *Slider::hStart, *Slider::hMid, *Slider::hEnd, *Slider::hGrip; Image *Slider::vStart, *Slider::vMid, *Slider::vEnd, *Slider::vGrip; diff --git a/src/gui/stats.cpp b/src/gui/stats.cpp index 9b134876..2282301c 100644 --- a/src/gui/stats.cpp +++ b/src/gui/stats.cpp @@ -23,7 +23,7 @@ #include "stats.h" #include "button.h" -#include "../main.h" +#include "../playerinfo.h" #include "../net/network.h" StatsWindow::StatsWindow(): diff --git a/src/gui/stats.h b/src/gui/stats.h index 82bff443..03c4cda4 100644 --- a/src/gui/stats.h +++ b/src/gui/stats.h @@ -72,4 +72,6 @@ class StatsWindow : public Window, public gcn::ActionListener { gcn::Button *statsButton[6]; }; +extern StatsWindow *statsWindow; + #endif /* _TMW_STATS_WINDOW_H */ diff --git a/src/gui/status.cpp b/src/gui/status.cpp index b571c724..a8f13660 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -22,9 +22,12 @@ */ #include "status.h" -#include "../main.h" +#include "stats.h" +#include "inventory.h" +#include "setup.h" +#include "equipment.h" #include "button.h" -#include "../engine.h" +#include "../playerinfo.h" #define WIN_BORDER 5 #define CONTROLS_SEPARATOR 4 diff --git a/src/gui/status.h b/src/gui/status.h index 0caf588d..ebc9a041 100644 --- a/src/gui/status.h +++ b/src/gui/status.h @@ -65,4 +65,6 @@ class StatusWindow : public Window, public gcn::ActionListener { gcn::Button *statsButton, *skillsButton, *inventoryButton, *setupButton, *equipmentButton; }; +extern StatusWindow *statusWindow; + #endif diff --git a/src/gui/textfield.h b/src/gui/textfield.h index 808b73ab..6105e2f8 100644 --- a/src/gui/textfield.h +++ b/src/gui/textfield.h @@ -25,6 +25,7 @@ #define __TMW_TEXTFIELD_H__ #include + #include "../graphics.h" /** diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp index 925c9950..4516400f 100644 --- a/src/gui/trade.cpp +++ b/src/gui/trade.cpp @@ -21,17 +21,16 @@ * $Id $ */ -#include "../main.h" -#include "../graphics.h" #include "trade.h" +#include "equipment.h" +#include "inventory.h" +#include "chat.h" #include "item_amount.h" -#include "../resources/resourcemanager.h" -#include "../resources/image.h" #include "button.h" #include "scrollarea.h" #include "textfield.h" -#include "../being.h" -#include "../engine.h" +#include "../net/network.h" +#include "../resources/itemmanager.h" #include TradeWindow::TradeWindow(): diff --git a/src/gui/trade.h b/src/gui/trade.h index 5d82f875..5b824548 100644 --- a/src/gui/trade.h +++ b/src/gui/trade.h @@ -24,11 +24,7 @@ #ifndef _TMW_TRADE_H #define _TMW_TRADE_H -#include "../log.h" -#include "../net/network.h" -#include "../graphic/spriteset.h" #include "itemcontainer.h" -#include "gui.h" #include "window.h" #include "scrollarea.h" @@ -118,4 +114,6 @@ class TradeWindow : public Window, gcn::ActionListener bool ok_other, ok_me; }; +extern TradeWindow *tradeWindow; + #endif diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h index 8432b65e..b602c053 100644 --- a/src/gui/updatewindow.h +++ b/src/gui/updatewindow.h @@ -24,7 +24,6 @@ #ifndef _UPDATERWINDOW_H #define _UPDATERWINDOW_H -#include "gui.h" #include "window.h" #include "vbox.h" #include "progressbar.h" diff --git a/src/gui/window.h b/src/gui/window.h index 3c9201ce..0a089b49 100644 --- a/src/gui/window.h +++ b/src/gui/window.h @@ -24,10 +24,8 @@ #ifndef _TMW_WINDOW_H__ #define _TMW_WINDOW_H__ -#include #include #include "windowcontainer.h" -#include "../resources/image.h" #include "../graphics.h" #include "../configuration.h" diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp index 9fd9b002..899a5463 100644 --- a/src/gui/windowcontainer.cpp +++ b/src/gui/windowcontainer.cpp @@ -23,7 +23,6 @@ #include #include "windowcontainer.h" -#include "window.h" WindowContainer::WindowContainer() { -- cgit v1.2.3-60-g2f50