diff options
247 files changed, 59 insertions, 644 deletions
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp index 5fd5dbc76..f3762fa69 100644 --- a/src/actionmanager.cpp +++ b/src/actionmanager.cpp @@ -20,6 +20,7 @@ #include "actionmanager.h" +#include "actorspritemanager.h" #include "dropshortcut.h" #include "emoteshortcut.h" #include "game.h" @@ -28,7 +29,6 @@ #include "itemshortcut.h" #include "inputmanager.h" #include "localplayer.h" -#include "logger.h" #include "playerinfo.h" #include "playerrelations.h" #include "sound.h" @@ -58,9 +58,7 @@ #include "gui/whoisonline.h" #include "gui/widgets/chattab.h" -#include "gui/widgets/window.h" -#include "net/net.h" #include "net/playerhandler.h" #include "utils/gettext.h" diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp index 5ec8ba793..4debab9e8 100644 --- a/src/actorsprite.cpp +++ b/src/actorsprite.cpp @@ -27,7 +27,6 @@ #include "effectmanager.h" #include "imagesprite.h" #include "localplayer.h" -#include "logger.h" #include "simpleanimation.h" #include "sound.h" #include "statuseffect.h" @@ -36,7 +35,6 @@ #include "net/net.h" -#include "resources/image.h" #include "resources/imageset.h" #include "resources/resourcemanager.h" diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index 617bb17dd..095ce745c 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -22,9 +22,9 @@ #include "actorspritemanager.h" +#include "client.h" #include "configuration.h" #include "localplayer.h" -#include "logger.h" #include "main.h" #include "playerinfo.h" #include "playerrelations.h" @@ -39,13 +39,10 @@ #include "utils/checkutils.h" #include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "net/net.h" #include "net/playerhandler.h" -#include "resources/beinginfo.h" - #include <algorithm> #include <list> diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h index 3c3d61c0e..67ea8a32f 100644 --- a/src/actorspritemanager.h +++ b/src/actorspritemanager.h @@ -23,13 +23,9 @@ #ifndef ACTORSPRITEMANAGER_H #define ACTORSPRITEMANAGER_H -#include "actorsprite.h" #include "being.h" -#include "configlistener.h" #include "flooritem.h" -#include "utils/stringvector.h" - class LocalPlayer; class Map; diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index 69aaceaaa..19884f141 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -31,8 +31,6 @@ #include "resources/image.h" #include "resources/resourcemanager.h" -#include "utils/xml.h" - #include "debug.h" bool AnimatedSprite::mEnableCache = false; diff --git a/src/auctionmanager.cpp b/src/auctionmanager.cpp index 9e4752e9b..70513ce8c 100644 --- a/src/auctionmanager.cpp +++ b/src/auctionmanager.cpp @@ -29,7 +29,6 @@ #include "net/net.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/being.cpp b/src/being.cpp index b463f3388..14351aad9 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -31,24 +31,19 @@ #include "guild.h" #include "item.h" #include "localplayer.h" -#include "logger.h" -#include "map.h" #include "particle.h" #include "party.h" #include "playerrelations.h" #include "simpleanimation.h" #include "sound.h" -#include "sprite.h" #include "text.h" #include "gui/equipmentwindow.h" #include "gui/gui.h" #include "gui/socialwindow.h" #include "gui/speechbubble.h" -#include "gui/theme.h" #include "gui/sdlfont.h" #include "gui/skilldialog.h" -#include "gui/userpalette.h" #include "net/charhandler.h" #include "net/gamehandler.h" @@ -57,11 +52,8 @@ #include "net/npchandler.h" #include "net/playerhandler.h" -#include "resources/beinginfo.h" #include "resources/colordb.h" #include "resources/emotedb.h" -#include "resources/image.h" -#include "resources/itemdb.h" #include "resources/iteminfo.h" #include "resources/monsterdb.h" #include "resources/npcdb.h" @@ -69,10 +61,7 @@ #include "gui/widgets/chattab.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" -#include "utils/xml.h" #include <cmath> diff --git a/src/being.h b/src/being.h index 5ece2bc41..ded3f9962 100644 --- a/src/being.h +++ b/src/being.h @@ -23,12 +23,7 @@ #ifndef BEING_H #define BEING_H -#include "actorsprite.h" -#include "configlistener.h" #include "equipment.h" -#include "map.h" -#include "position.h" -#include "vector.h" #include "resources/beinginfo.h" diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp index 7b5a1595b..5324b2ebf 100644 --- a/src/chatlogger.cpp +++ b/src/chatlogger.cpp @@ -39,7 +39,6 @@ #include "logger.h" #include "configuration.h" #include "utils/mkdir.h" -#include "utils/stringutils.h" #include <physfs.h> diff --git a/src/client.cpp b/src/client.cpp index b25f96a62..13226055a 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -57,35 +57,28 @@ #include "gui/quitdialog.h" #include "gui/registerdialog.h" #include "gui/npcdialog.h" -#include "gui/selldialog.h" #include "gui/sdlinput.h" +#include "gui/selldialog.h" #include "gui/serverdialog.h" #include "gui/setup.h" #include "gui/theme.h" #include "gui/unregisterdialog.h" #include "gui/updaterwindow.h" -#include "gui/userpalette.h" #include "gui/worldselectdialog.h" -#include "gui/widgets/button.h" #include "gui/widgets/desktop.h" -#include "net/charhandler.h" #include "net/gamehandler.h" #include "net/generalhandler.h" #include "net/guildhandler.h" -#include "net/logindata.h" #include "net/loginhandler.h" #include "net/net.h" #include "net/npchandler.h" #include "net/partyhandler.h" -#include "net/worldinfo.h" -#include "resources/beinginfo.h" #include "resources/chardb.h" #include "resources/colordb.h" #include "resources/emotedb.h" -#include "resources/image.h" #include "resources/imagehelper.h" #include "resources/openglimagehelper.h" #include "resources/sdlimagehelper.h" @@ -101,7 +94,6 @@ #include "utils/gettext.h" #include "utils/mkdir.h" #include "utils/paths.h" -#include "utils/stringutils.h" #include "utils/translation/translationmanager.h" diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index 6a5e9fcef..b1df134b0 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -26,11 +26,11 @@ #include "actorspritemanager.h" #include "channelmanager.h" #include "channel.h" +#include "client.h" #include "configuration.h" #include "game.h" #include "guildmanager.h" #include "localplayer.h" -#include "logger.h" #include "main.h" #include "party.h" @@ -44,7 +44,6 @@ #include "gui/sdlfont.h" #include "gui/widgets/channeltab.h" -#include "gui/widgets/chattab.h" #include "gui/widgets/whispertab.h" #include "net/adminhandler.h" @@ -70,7 +69,6 @@ #include "utils/gettext.h" #include "utils/process.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/configuration.cpp b/src/configuration.cpp index d61e24a3b..a9bfb3bd1 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -26,7 +26,6 @@ #include "logger.h" #include "utils/paths.h" -#include "utils/stringutils.h" #include <stdlib.h> diff --git a/src/dropshortcut.cpp b/src/dropshortcut.cpp index 03450718b..da1acc496 100644 --- a/src/dropshortcut.cpp +++ b/src/dropshortcut.cpp @@ -22,6 +22,7 @@ #include "dropshortcut.h" +#include "client.h" #include "configuration.h" #include "inventory.h" #include "item.h" @@ -33,8 +34,6 @@ #include "net/inventoryhandler.h" #include "net/net.h" -#include "utils/stringutils.h" - #include "debug.h" DropShortcut *dropShortcut; diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp index 5c403c622..5663b95b8 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -27,8 +27,6 @@ #include "particle.h" #include "sound.h" -#include "utils/xml.h" - #include "debug.h" EffectManager::EffectManager() diff --git a/src/emoteshortcut.cpp b/src/emoteshortcut.cpp index d0b5d9be5..72495b361 100644 --- a/src/emoteshortcut.cpp +++ b/src/emoteshortcut.cpp @@ -24,8 +24,6 @@ #include "configuration.h" #include "localplayer.h" -#include "utils/stringutils.h" - #include "resources/emotedb.h" #include "debug.h" diff --git a/src/flooritem.cpp b/src/flooritem.cpp index 557205c17..f612713da 100644 --- a/src/flooritem.cpp +++ b/src/flooritem.cpp @@ -25,13 +25,11 @@ #include "client.h" #include "graphics.h" #include "item.h" -#include "map.h" #include "configuration.h" #include "gui/gui.h" #include "gui/sdlfont.h" -#include "resources/itemdb.h" #include "resources/iteminfo.h" #include "debug.h" diff --git a/src/game.cpp b/src/game.cpp index f0cf1e290..8a8cdce5a 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -22,9 +22,11 @@ #include "game.h" +#include "actorspritemanager.h" #include "auctionmanager.h" #include "animatedsprite.h" #include "channelmanager.h" +#include "client.h" #include "commandhandler.h" #include "effectmanager.h" #include "emoteshortcut.h" @@ -34,7 +36,6 @@ #include "joystick.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "logger.h" #include "particle.h" #include "playerinfo.h" #include "sound.h" @@ -69,7 +70,6 @@ #include "gui/whoisonline.h" #include "gui/widgets/battletab.h" -#include "gui/widgets/chattab.h" #include "gui/widgets/dropshortcutcontainer.h" #include "gui/widgets/emoteshortcutcontainer.h" #include "gui/widgets/itemshortcutcontainer.h" @@ -77,7 +77,6 @@ #include "gui/widgets/tradetab.h" #include "net/gamehandler.h" -#include "net/net.h" #include "net/packetcounters.h" #include "net/playerhandler.h" @@ -86,12 +85,9 @@ #include "resources/mapreader.h" #include "resources/resourcemanager.h" -#include "utils/dtor.h" #include "utils/gettext.h" #include "utils/mkdir.h" -//#include "utils/translation/translationmanager.h" - #include <guichan/exception.hpp> #include <guichan/focushandler.hpp> diff --git a/src/game.h b/src/game.h index e0c752f46..17e67b243 100644 --- a/src/game.h +++ b/src/game.h @@ -24,10 +24,11 @@ #define GAME_H #include <string> -#include "gui/sdlinput.h" #include "localconsts.h" +#include <SDL/SDL.h> + #define MAX_LASTKEYS 10 extern volatile int cur_time; diff --git a/src/graphics.cpp b/src/graphics.cpp index b852ccb2b..0e2b807ec 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -32,7 +32,6 @@ #include "resources/image.h" #include "resources/imagehelper.h" #include "resources/openglimagehelper.h" -#include "utils/stringutils.h" #include <guichan/sdl/sdlpixel.hpp> diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h index bf435194d..8868a3d83 100644 --- a/src/graphicsvertexes.h +++ b/src/graphicsvertexes.h @@ -24,7 +24,6 @@ #include "main.h" -#include "graphics.h" #include "localconsts.h" #ifdef USE_OPENGL diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp index ad019e9a6..89bc1e084 100644 --- a/src/gui/beingpopup.cpp +++ b/src/gui/beingpopup.cpp @@ -34,7 +34,6 @@ #include "gui/widgets/label.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <guichan/font.hpp> diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp index 2d13837c6..2cb24bb13 100644 --- a/src/gui/buydialog.cpp +++ b/src/gui/buydialog.cpp @@ -23,13 +23,13 @@ #include "gui/buydialog.h" #include "keyboardconfig.h" +#include "logger.h" #include "shopitem.h" #include "units.h" #include "gui/setup.h" #include "gui/tradewindow.h" -#include "gui/widgets/button.h" #include "gui/widgets/inttextfield.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" @@ -38,9 +38,6 @@ #include "gui/widgets/shoplistbox.h" #include "gui/widgets/slider.h" -#include "shopitem.h" -#include "units.h" - #include "net/buysellhandler.h" #include "net/net.h" #include "net/npchandler.h" @@ -48,7 +45,6 @@ #include "resources/iteminfo.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/buyselldialog.cpp b/src/gui/buyselldialog.cpp index 1afcf96a1..cdcf90be9 100644 --- a/src/gui/buyselldialog.cpp +++ b/src/gui/buyselldialog.cpp @@ -24,8 +24,6 @@ #include "gui/setup.h" -#include "gui/widgets/button.h" - #include "net/buysellhandler.h" #include "net/net.h" #include "net/npchandler.h" diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp index 00ac3ab69..5751efba4 100644 --- a/src/gui/changepassworddialog.cpp +++ b/src/gui/changepassworddialog.cpp @@ -30,7 +30,6 @@ #include "gui/widgets/button.h" #include "gui/widgets/passwordfield.h" -#include "gui/widgets/textfield.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" @@ -39,7 +38,6 @@ #include "net/net.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <string> #include <sstream> diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp index e90a12a0d..ba2e06661 100644 --- a/src/gui/charcreatedialog.cpp +++ b/src/gui/charcreatedialog.cpp @@ -22,15 +22,11 @@ #include "gui/charcreatedialog.h" -#include "client.h" -#include "game.h" #include "keydata.h" #include "keyevent.h" -#include "localplayer.h" #include "main.h" #include "units.h" -#include "gui/charselectdialog.h" #include "gui/confirmdialog.h" #include "gui/okdialog.h" @@ -42,7 +38,6 @@ #include "gui/widgets/slider.h" #include "gui/widgets/textfield.h" -#include "net/charhandler.h" #include "net/messageout.h" #include "net/net.h" @@ -52,12 +47,13 @@ #include "resources/iteminfo.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <guichan/font.hpp> #include "debug.h" +extern int serverVersion; + static const Being::Action actions[] = { Being::STAND, Being::SIT, Being::MOVE, Being::ATTACK, Being::DEAD diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h index b67a3971b..c0c1f113a 100644 --- a/src/gui/charcreatedialog.h +++ b/src/gui/charcreatedialog.h @@ -27,8 +27,6 @@ #include "gui/charselectdialog.h" -#include "gui/widgets/window.h" - #include <guichan/actionlistener.hpp> #include <guichan/keylistener.hpp> diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index 1d82c09d6..146e4f290 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -23,12 +23,9 @@ #include "gui/charselectdialog.h" #include "client.h" -#include "game.h" -#include "localplayer.h" #include "units.h" #include "keydata.h" #include "keyevent.h" -#include "logger.h" #include "gui/changeemaildialog.h" #include "gui/changepassworddialog.h" @@ -36,7 +33,6 @@ #include "gui/confirmdialog.h" #include "gui/logindialog.h" #include "gui/okdialog.h" -#include "gui/sdlinput.h" #include "gui/textdialog.h" #include "gui/unregisterdialog.h" @@ -48,7 +44,6 @@ #include "gui/widgets/playerbox.h" #include "gui/widgets/textfield.h" -#include "net/charhandler.h" #include "net/logindata.h" #include "net/loginhandler.h" #include "net/messageout.h" @@ -57,7 +52,6 @@ #include "resources/colordb.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <guichan/focushandler.hpp> #include <guichan/font.hpp> diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index cb3ed8da8..b0318a9aa 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -26,14 +26,13 @@ #include "client.h" #include "commandhandler.h" #include "configuration.h" +#include "game.h" #include "guild.h" #include "inputmanager.h" -#include "keydata.h" #include "keyevent.h" #include "localplayer.h" #include "party.h" #include "playerinfo.h" -#include "playerrelations.h" #include "spellshortcut.h" #include "sound.h" @@ -45,12 +44,10 @@ #include "gui/viewport.h" #include "gui/widgets/battletab.h" -#include "gui/widgets/chattab.h" #include "gui/widgets/dropdown.h" #include "gui/widgets/itemlinkhandler.h" #include "gui/widgets/layouthelper.h" #include "gui/widgets/scrollarea.h" -#include "gui/widgets/tabbedarea.h" #include "gui/widgets/textfield.h" #include "gui/widgets/tradetab.h" #include "gui/widgets/whispertab.h" @@ -60,9 +57,7 @@ #include "net/net.h" #include "utils/copynpaste.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "resources/resourcemanager.h" diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h index e0ab7bc2d..ddc9574f2 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/chatwindow.h @@ -27,10 +27,10 @@ #include "configlistener.h" -#include "gui/widgets/window.h" - #include "utils/stringvector.h" +#include "gui/widgets/window.h" + #include <guichan/actionlistener.hpp> #include <guichan/keylistener.hpp> #include <guichan/widget.hpp> diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index 6951d5b4f..a3b077648 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -26,7 +26,6 @@ #include "game.h" #include "localplayer.h" #include "main.h" -#include "map.h" #include "particle.h" #include "gui/setup.h" @@ -38,15 +37,12 @@ #include "gui/widgets/layout.h" #include "gui/widgets/layouthelper.h" #include "gui/widgets/scrollarea.h" -#include "gui/widgets/tab.h" -#include "gui/widgets/tabbedarea.h" #include "resources/imagehelper.h" #include "net/packetcounters.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp index 003395d3b..1c30b32ed 100644 --- a/src/gui/didyouknowwindow.cpp +++ b/src/gui/didyouknowwindow.cpp @@ -29,7 +29,6 @@ #include "gui/sdlfont.h" #include "gui/setup.h" -#include "gui/widgets/button.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/checkbox.h" #include "gui/widgets/layout.h" diff --git a/src/gui/editdialog.cpp b/src/gui/editdialog.cpp index 78ce2f8ba..96e6d21b2 100644 --- a/src/gui/editdialog.cpp +++ b/src/gui/editdialog.cpp @@ -25,7 +25,6 @@ #include "gui/gui.h" #include "gui/widgets/button.h" -#include "gui/widgets/textfield.h" #include "utils/gettext.h" diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 2a61b9a0f..97ccc69f7 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -23,8 +23,6 @@ #include "gui/equipmentwindow.h" #include "being.h" -#include "equipment.h" -#include "graphics.h" #include "inventory.h" #include "item.h" #include "localplayer.h" @@ -34,20 +32,16 @@ #include "gui/setup.h" #include "gui/viewport.h" -#include "gui/widgets/button.h" #include "gui/widgets/playerbox.h" #include "net/inventoryhandler.h" #include "net/net.h" -#include "resources/image.h" #include "resources/imageset.h" -#include "resources/iteminfo.h" #include "resources/resourcemanager.h" #include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <guichan/font.hpp> diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index fe6163877..3020168b7 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -32,13 +32,10 @@ #include "gui/widgets/window.h" #include "gui/widgets/windowcontainer.h" -#include "configlistener.h" #include "configuration.h" -#include "graphics.h" #include "keydata.h" #include "keyevent.h" #include "keyinput.h" -#include "logger.h" #include "resources/image.h" #include "resources/imageset.h" diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp index 66e357d31..93413c4e8 100644 --- a/src/gui/helpwindow.cpp +++ b/src/gui/helpwindow.cpp @@ -29,7 +29,6 @@ #include "gui/sdlfont.h" #include "gui/setup.h" -#include "gui/widgets/button.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/layout.h" #include "gui/widgets/scrollarea.h" diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 16adbbb75..69bba3d93 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -23,10 +23,7 @@ #include "gui/inventorywindow.h" #include "configuration.h" -#include "inventory.h" -#include "item.h" #include "inputmanager.h" -#include "keydata.h" #include "keyevent.h" #include "playerinfo.h" #include "units.h" @@ -36,14 +33,11 @@ #include "gui/itemamountwindow.h" #include "gui/outfitwindow.h" #include "gui/setup.h" -#include "gui/sdlinput.h" #include "gui/shopwindow.h" #include "gui/theme.h" #include "gui/tradewindow.h" #include "gui/viewport.h" -#include "gui/widgets/button.h" -#include "gui/widgets/container.h" #include "gui/widgets/dropdown.h" #include "gui/widgets/itemcontainer.h" #include "gui/widgets/label.h" @@ -53,14 +47,10 @@ #include "gui/widgets/tabstrip.h" #include "gui/widgets/textfield.h" -#include "net/inventoryhandler.h" -#include "net/net.h" - #include "resources/iteminfo.h" #include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <guichan/font.hpp> #include <guichan/mouseinput.hpp> diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp index ef1aad258..a9498f1b9 100644 --- a/src/gui/itemamountwindow.cpp +++ b/src/gui/itemamountwindow.cpp @@ -22,6 +22,7 @@ #include "gui/itemamountwindow.h" +#include "inventory.h" #include "item.h" #include "keyboardconfig.h" @@ -40,8 +41,6 @@ #include "gui/widgets/label.h" #include "gui/widgets/slider.h" -#include "resources/itemdb.h" - #include "utils/gettext.h" #include <math.h> diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index f9cbb92dd..fa65c7a42 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -37,7 +37,6 @@ #include "gui/widgets/textbox.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "resources/image.h" #include "resources/resourcemanager.h" diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp index 9de807c6c..564eba642 100644 --- a/src/gui/killstats.cpp +++ b/src/gui/killstats.cpp @@ -26,15 +26,13 @@ #include "gui/widgets/label.h" #include "gui/widgets/layout.h" #include "gui/widgets/chattab.h" -#include "gui/chatwindow.h" #include "actorspritemanager.h" -#include "depricatedevent.h" +#include "game.h" #include "localplayer.h" #include "playerinfo.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <math.h> #include <guichan/widgets/label.hpp> diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp index 0ae29a730..804a46bad 100644 --- a/src/gui/logindialog.cpp +++ b/src/gui/logindialog.cpp @@ -36,7 +36,6 @@ #include "gui/widgets/label.h" #include "gui/widgets/layout.h" #include "gui/widgets/passwordfield.h" -#include "gui/widgets/textfield.h" #include "net/logindata.h" #include "net/loginhandler.h" @@ -44,7 +43,6 @@ #include "utils/gettext.h" #include "utils/paths.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index 651d9a66c..c834bed64 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -23,15 +23,11 @@ #include "gui/minimap.h" #include "actorspritemanager.h" -#include "being.h" +#include "client.h" #include "configuration.h" -#include "graphics.h" #include "localplayer.h" -#include "logger.h" -#include "map.h" #include "party.h" -#include "gui/userpalette.h" #include "gui/setup.h" #include "gui/viewport.h" diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp index c32aaa742..e73cc5475 100644 --- a/src/gui/ministatuswindow.cpp +++ b/src/gui/ministatuswindow.cpp @@ -23,7 +23,6 @@ #include "gui/ministatuswindow.h" #include "animatedsprite.h" -#include "configuration.h" #include "graphics.h" #include "localplayer.h" #include "playerinfo.h" @@ -46,7 +45,6 @@ #include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 3c6262d03..b47e78626 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -32,7 +32,6 @@ #include "gui/viewport.h" #include "gui/widgets/browserbox.h" -#include "gui/widgets/button.h" #include "gui/widgets/chattab.h" #include "gui/widgets/inttextfield.h" #include "gui/widgets/itemlinkhandler.h" @@ -41,7 +40,6 @@ #include "gui/widgets/playerbox.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/textbox.h" -#include "gui/widgets/textfield.h" #include "resources/resourcemanager.h" @@ -49,7 +47,6 @@ #include "net/npchandler.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <guichan/font.hpp> diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp index 2c4e913f8..7ce62aa4e 100644 --- a/src/gui/outfitwindow.cpp +++ b/src/gui/outfitwindow.cpp @@ -25,13 +25,12 @@ #include "configuration.h" #include "emoteshortcut.h" #include "equipment.h" -#include "graphics.h" +#include "game.h" #include "inputmanager.h" #include "inventory.h" #include "item.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "logger.h" #include "playerinfo.h" #include "gui/chatwindow.h" @@ -45,14 +44,10 @@ #include "gui/widgets/label.h" #include "gui/widgets/layout.h" -#include "net/inventoryhandler.h" -#include "net/net.h" - #include "resources/image.h" #include "resources/resourcemanager.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <vector> diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp index 523497044..f0380153f 100644 --- a/src/gui/palette.cpp +++ b/src/gui/palette.cpp @@ -30,7 +30,6 @@ #include "utils/gettext.h" #include "utils/mathutils.h" -#include "utils/stringutils.h" #include <math.h> diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 992ba8e14..379844983 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -24,6 +24,7 @@ #include "actorspritemanager.h" #include "dropshortcut.h" +#include "game.h" #include "guild.h" #include "guildmanager.h" #include "graphics.h" @@ -72,6 +73,8 @@ #include "debug.h" +extern int serverVersion; + std::string tradePartnerName(""); PopupMenu::PopupMenu(): diff --git a/src/gui/questswindow.cpp b/src/gui/questswindow.cpp index 07abd3659..d9f039fa8 100644 --- a/src/gui/questswindow.cpp +++ b/src/gui/questswindow.cpp @@ -38,7 +38,6 @@ #include "gui/widgets/textfield.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "utils/translation/podict.h" diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp index c3368ca8a..64048dcc9 100644 --- a/src/gui/quitdialog.cpp +++ b/src/gui/quitdialog.cpp @@ -23,6 +23,7 @@ #include "gui/quitdialog.h" #include "client.h" +#include "game.h" #include "keydata.h" #include "keyevent.h" diff --git a/src/gui/registerdialog.cpp b/src/gui/registerdialog.cpp index 988d4c718..cf86f973a 100644 --- a/src/gui/registerdialog.cpp +++ b/src/gui/registerdialog.cpp @@ -35,14 +35,12 @@ #include "gui/widgets/layout.h" #include "gui/widgets/passwordfield.h" #include "gui/widgets/radiobutton.h" -#include "gui/widgets/textfield.h" #include "net/logindata.h" #include "net/loginhandler.h" #include "net/net.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp index 19a912173..45119fcec 100644 --- a/src/gui/sdlfont.cpp +++ b/src/gui/sdlfont.cpp @@ -33,8 +33,6 @@ #include "resources/imagehelper.h" #include "resources/resourcemanager.h" -#include "utils/stringutils.h" - #include <guichan/exception.hpp> #include "debug.h" diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp index eea0c86f1..41649a901 100644 --- a/src/gui/selldialog.cpp +++ b/src/gui/selldialog.cpp @@ -28,7 +28,6 @@ #include "gui/setup.h" #include "gui/tradewindow.h" -#include "gui/widgets/button.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" #include "gui/widgets/scrollarea.h" @@ -43,7 +42,6 @@ #include "resources/iteminfo.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 6e6f99841..1dad557b1 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -27,7 +27,6 @@ #include "configuration.h" #include "keydata.h" #include "keyevent.h" -#include "logger.h" #include "main.h" #include "gui/editserverdialog.h" @@ -50,8 +49,6 @@ #include "utils/gettext.h" #include "utils/langs.h" -#include "utils/stringutils.h" -#include "utils/xml.h" #include <guichan/font.hpp> diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 8fbe012e6..8c76d89d0 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -40,9 +40,7 @@ #include "gui/setup_video.h" #include "gui/setup_visual.h" -#include "gui/widgets/button.h" #include "gui/widgets/label.h" -#include "gui/widgets/tabbedarea.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h index d6cc4f619..65bce0c14 100644 --- a/src/gui/setup_audio.h +++ b/src/gui/setup_audio.h @@ -23,8 +23,9 @@ #ifndef GUI_SETUP_AUDIO_H #define GUI_SETUP_AUDIO_H +#include "map.h" + #include "gui/widgets/setupitem.h" -#include "gui/widgets/setuptabscroll.h" #include <guichan/actionlistener.hpp> diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp index 9cd164839..ee6a85eaf 100644 --- a/src/gui/setup_chat.cpp +++ b/src/gui/setup_chat.cpp @@ -36,7 +36,6 @@ #include "configuration.h" #include "localplayer.h" -#include "logger.h" #include "utils/gettext.h" diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp index 76ff9badc..f2412b3ff 100644 --- a/src/gui/setup_colors.cpp +++ b/src/gui/setup_colors.cpp @@ -39,7 +39,6 @@ #include "gui/widgets/textpreview.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <string> #include <cmath> diff --git a/src/gui/setup_input.h b/src/gui/setup_input.h index bed487b68..e0c14be7f 100644 --- a/src/gui/setup_input.h +++ b/src/gui/setup_input.h @@ -24,8 +24,6 @@ #ifndef GUI_SETUP_INPUT_H #define GUI_SETUP_INPUT_H -#include "keydata.h" - #include "gui/widgets/setuptab.h" #include <guichan/actionlistener.hpp> diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp index e011be983..e727f7f39 100644 --- a/src/gui/setup_other.cpp +++ b/src/gui/setup_other.cpp @@ -24,7 +24,6 @@ #include "gui/widgets/layouthelper.h" #include "gui/widgets/scrollarea.h" -#include "gui/widgets/setupitem.h" #include "configuration.h" #include "logger.h" diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h index ed29ed9cb..3b424479b 100644 --- a/src/gui/setup_other.h +++ b/src/gui/setup_other.h @@ -24,7 +24,6 @@ #define GUI_Setup_Other_H #include "gui/widgets/setupitem.h" -#include "gui/widgets/setuptabscroll.h" #include <guichan/actionlistener.hpp> diff --git a/src/gui/setup_perfomance.cpp b/src/gui/setup_perfomance.cpp index 1a0c892a9..d9c3e3fb1 100644 --- a/src/gui/setup_perfomance.cpp +++ b/src/gui/setup_perfomance.cpp @@ -36,7 +36,6 @@ #include "configuration.h" #include "localplayer.h" -#include "logger.h" #include "utils/gettext.h" diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp index 45030087b..c0558f56f 100644 --- a/src/gui/setup_relations.cpp +++ b/src/gui/setup_relations.cpp @@ -25,7 +25,6 @@ #include "actorspritemanager.h" #include "configuration.h" #include "localplayer.h" -#include "logger.h" #include "gui/editdialog.h" #include "gui/okdialog.h" @@ -37,7 +36,6 @@ #include "gui/widgets/layouthelper.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/guitable.h" -#include "gui/widgets/textfield.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp index e9d392134..53ccf6eeb 100644 --- a/src/gui/setup_theme.cpp +++ b/src/gui/setup_theme.cpp @@ -33,11 +33,9 @@ #include "gui/widgets/label.h" #include "gui/widgets/layouthelper.h" #include "gui/widgets/namesmodel.h" -#include "gui/widgets/textfield.h" #include "configuration.h" #include "localplayer.h" -#include "logger.h" #include "utils/gettext.h" diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 1e3f843aa..68e4c8e76 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -22,6 +22,7 @@ #include "gui/setup_video.h" +#include "client.h" #include "configuration.h" #include "game.h" #include "graphics.h" @@ -29,8 +30,6 @@ #include "graphicsmanager.h" #include "localplayer.h" -#include "logger.h" -#include "main.h" #include "gui/gui.h" #include "gui/okdialog.h" @@ -50,7 +49,6 @@ #include "resources/image.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <guichan/key.hpp> #include <guichan/listmodel.hpp> diff --git a/src/gui/setup_visual.h b/src/gui/setup_visual.h index 0451e93ac..14c11f3b2 100644 --- a/src/gui/setup_visual.h +++ b/src/gui/setup_visual.h @@ -23,7 +23,6 @@ #define GUI_SETUP_VISUAL_H #include "gui/widgets/setupitem.h" -#include "gui/widgets/setuptabscroll.h" class Setup_Visual : public SetupTabScroll { diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp index 89a457e88..2037cb789 100644 --- a/src/gui/shopwindow.cpp +++ b/src/gui/shopwindow.cpp @@ -28,7 +28,6 @@ #include "gui/setup.h" #include "gui/tradewindow.h" -#include "gui/widgets/button.h" #include "gui/widgets/chattab.h" #include "gui/widgets/checkbox.h" #include "gui/widgets/label.h" @@ -41,6 +40,7 @@ #include "actorspritemanager.h" #include "auctionmanager.h" +#include "client.h" #include "configuration.h" #include "confirmdialog.h" #include "inventory.h" @@ -61,7 +61,6 @@ #include "resources/iteminfo.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <sstream> diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp index 7c450855a..16e71e6b7 100644 --- a/src/gui/shortcutwindow.cpp +++ b/src/gui/shortcutwindow.cpp @@ -31,8 +31,6 @@ #include "gui/widgets/layout.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/shortcutcontainer.h" -#include "gui/widgets/tab.h" -#include "gui/widgets/tabbedarea.h" #include "debug.h" diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index 86a4df38b..723cdc5e1 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -24,7 +24,6 @@ #include "itemshortcut.h" #include "localplayer.h" -#include "logger.h" #include "playerinfo.h" #include "configuration.h" @@ -34,16 +33,12 @@ #include "gui/theme.h" #include "gui/viewport.h" -#include "gui/widgets/button.h" -#include "gui/widgets/container.h" #include "gui/widgets/label.h" #include "gui/widgets/layouthelper.h" #include "gui/widgets/listbox.h" #include "gui/widgets/progressbar.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/tab.h" -#include "gui/widgets/tabbedarea.h" -#include "gui/widgets/windowcontainer.h" #include "net/net.h" #include "net/playerhandler.h" @@ -54,8 +49,6 @@ #include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" -#include "utils/xml.h" #include <guichan/font.hpp> diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 22eb4024d..2c4f1316d 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -27,8 +27,6 @@ #include "inputmanager.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "logger.h" -#include "map.h" #include "maplayer.h" #include "party.h" #include "playerrelations.h" @@ -41,26 +39,19 @@ #include "gui/textdialog.h" #include "gui/theme.h" -#include "gui/widgets/avatarlistbox.h" #include "gui/widgets/browserbox.h" -#include "gui/widgets/button.h" #include "gui/widgets/chattab.h" #include "gui/widgets/container.h" #include "gui/widgets/label.h" #include "gui/widgets/layouthelper.h" -#include "gui/widgets/linkhandler.h" #include "gui/widgets/popup.h" #include "gui/widgets/scrollarea.h" -#include "gui/widgets/tab.h" -#include "gui/widgets/tabbedarea.h" #include "net/net.h" #include "net/guildhandler.h" #include "net/partyhandler.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp index fd9f5ab5a..b9c6b2530 100644 --- a/src/gui/specialswindow.cpp +++ b/src/gui/specialswindow.cpp @@ -26,7 +26,6 @@ #include "gui/setup.h" #include "gui/theme.h" -#include "gui/widgets/button.h" #include "gui/widgets/container.h" #include "gui/widgets/icon.h" #include "gui/widgets/label.h" @@ -35,7 +34,6 @@ #include "gui/widgets/progressbar.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/tab.h" -#include "gui/widgets/tabbedarea.h" #include "gui/widgets/flowcontainer.h" #include "gui/widgets/windowcontainer.h" @@ -46,7 +44,6 @@ #include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "utils/xml.h" #include <string> diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index ff20603ce..6188b5c2d 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -23,11 +23,8 @@ #include "gui/speechbubble.h" -#include "graphics.h" - #include "gui/gui.h" #include "gui/sdlfont.h" -#include "gui/theme.h" #include "gui/widgets/label.h" #include "gui/widgets/textbox.h" diff --git a/src/gui/spellpopup.cpp b/src/gui/spellpopup.cpp index 969a92dc8..af7a2a619 100644 --- a/src/gui/spellpopup.cpp +++ b/src/gui/spellpopup.cpp @@ -29,13 +29,10 @@ #include "gui/widgets/label.h" -#include "textcommand.h" - #include "graphics.h" #include "units.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <guichan/font.hpp> diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp index dae8b15fe..36917b250 100644 --- a/src/gui/statuspopup.cpp +++ b/src/gui/statuspopup.cpp @@ -37,8 +37,6 @@ #include "units.h" #include "keyboardconfig.h" -#include "utils/stringutils.h" - #include <guichan/font.hpp> #include <guichan/widgets/label.hpp> diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index d64aa3ebf..88b48a472 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -24,7 +24,6 @@ #include "chatwindow.h" #include "configuration.h" -#include "depricatedevent.h" #include "equipment.h" #include "inventory.h" #include "item.h" @@ -37,13 +36,11 @@ #include "gui/theme.h" #include "gui/viewport.h" -#include "gui/widgets/button.h" #include "gui/widgets/label.h" #include "gui/widgets/layouthelper.h" #include "gui/widgets/progressbar.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/vertcontainer.h" -#include "gui/widgets/windowcontainer.h" #include "net/net.h" #include "net/playerhandler.h" @@ -51,7 +48,6 @@ #include "utils/gettext.h" #include "utils/mathutils.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp index 67e2be0c8..04dbffd51 100644 --- a/src/gui/textcommandeditor.cpp +++ b/src/gui/textcommandeditor.cpp @@ -37,7 +37,6 @@ #include "gui/widgets/layouthelper.h" #include "gui/widgets/radiobutton.h" #include "gui/widgets/guitable.h" -#include "gui/widgets/textfield.h" #include "configuration.h" #include "item.h" @@ -47,9 +46,7 @@ #include "spellmanager.h" #include "utils/gettext.h" -#include "utils/stringutils.h" -#include "resources/itemdb.h" #include "resources/iteminfo.h" #include "debug.h" diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp index d7d3d5eeb..b7f8a6ce3 100644 --- a/src/gui/textdialog.cpp +++ b/src/gui/textdialog.cpp @@ -27,7 +27,6 @@ #include "gui/widgets/button.h" #include "gui/widgets/label.h" #include "gui/widgets/passwordfield.h" -#include "gui/widgets/textfield.h" #include "utils/gettext.h" diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp index afece5319..b7967e32d 100644 --- a/src/gui/textpopup.cpp +++ b/src/gui/textpopup.cpp @@ -29,11 +29,9 @@ #include "gui/widgets/label.h" -#include "graphics.h" #include "units.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <guichan/font.hpp> diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 44de72cdc..990f0d41a 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -26,7 +26,6 @@ #include "client.h" #include "configuration.h" -#include "logger.h" #include "resources/dye.h" #include "resources/image.h" @@ -34,8 +33,6 @@ #include "resources/resourcemanager.h" #include "utils/dtor.h" -#include "utils/stringutils.h" -#include "utils/xml.h" #include <physfs.h> diff --git a/src/gui/theme.h b/src/gui/theme.h index 75446fdbd..a3b4f6800 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -30,8 +30,6 @@ #include "gui/palette.h" -#include "utils/stringvector.h" - #include <map> #include "localconsts.h" diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp index e2aa24321..5e1850daa 100644 --- a/src/gui/unregisterdialog.cpp +++ b/src/gui/unregisterdialog.cpp @@ -32,14 +32,12 @@ #include "gui/widgets/checkbox.h" #include "gui/widgets/label.h" #include "gui/widgets/passwordfield.h" -#include "gui/widgets/textfield.h" #include "net/logindata.h" #include "net/loginhandler.h" #include "net/net.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <string> #include <sstream> diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp index 81fe7a9cd..7ca6d665c 100644 --- a/src/gui/updaterwindow.cpp +++ b/src/gui/updaterwindow.cpp @@ -26,8 +26,6 @@ #include "configuration.h" #include "keydata.h" #include "keyevent.h" -#include "logger.h" -#include "main.h" #include "gui/sdlinput.h" @@ -38,7 +36,6 @@ #include "gui/widgets/progressbar.h" #include "gui/widgets/scrollarea.h" -#include "net/download.h" #include "net/logindata.h" #include "resources/resourcemanager.h" @@ -47,8 +44,6 @@ #include "utils/mkdir.h" #include "utils/paths.h" #include "utils/process.h" -#include "utils/stringutils.h" -#include "utils/xml.h" #include <iostream> #include <fstream> diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 6103c8b86..382e0f355 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -22,16 +22,15 @@ #include "gui/viewport.h" -#include "actorsprite.h" #include "actorspritemanager.h" #include "client.h" #include "configuration.h" +#include "game.h" #include "graphics.h" #include "itemshortcut.h" #include "inputmanager.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "map.h" #include "maplayer.h" #include "playerinfo.h" #include "textmanager.h" @@ -52,8 +51,6 @@ #include "resources/resourcemanager.h" -#include "utils/stringutils.h" - #include "debug.h" extern volatile int tick_time; diff --git a/src/gui/viewport.h b/src/gui/viewport.h index fc3db142a..0d84837c8 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -23,8 +23,8 @@ #ifndef VIEWPORT_H #define VIEWPORT_H -#include "actorspritemanager.h" #include "configlistener.h" +#include "maplayer.h" #include "position.h" #include "gui/widgets/windowcontainer.h" diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index 911c26c3e..0747b4276 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -46,11 +46,8 @@ #include "net/net.h" #include "net/playerhandler.h" -#include "gui/chatwindow.h" - #include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" // Curl should be included after Guichan to avoid Windows redefinitions #include <curl/curl.h> diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index ad139159a..2a009bcc6 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -30,7 +30,6 @@ #include "gui/chatwindow.h" #include "gui/gui.h" -#include "gui/palette.h" #include "gui/sdlfont.h" #include "gui/theme.h" #include "gui/viewport.h" @@ -38,8 +37,6 @@ #include "resources/image.h" #include "resources/resourcemanager.h" -#include "utils/stringutils.h" - #include <guichan/font.hpp> #include "debug.h" diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h index 526db6ef5..b2b135a9c 100644 --- a/src/gui/widgets/avatarlistbox.h +++ b/src/gui/widgets/avatarlistbox.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_GUILDLISTBOX_H -#define GUI_GUILDLISTBOX_H +#ifndef GUI_AVATARLISTBOX_H +#define GUI_AVATARLISTBOX_H #include "avatar.h" diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp index 5ac13c78e..3f313b0e1 100644 --- a/src/gui/widgets/battletab.cpp +++ b/src/gui/widgets/battletab.cpp @@ -25,7 +25,6 @@ #include "chatlogger.h" #include "commandhandler.h" #include "localplayer.h" -#include "logger.h" #include "main.h" #include "gui/theme.h" @@ -37,7 +36,6 @@ #include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index ea5210eb8..df99905b7 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -27,8 +27,6 @@ #include "graphics.h" #include "logger.h" -#include "utils/stringutils.h" - #include "gui/gui.h" #include "gui/palette.h" #include "gui/sdlfont.h" @@ -37,7 +35,6 @@ #include "gui/widgets/linkhandler.h" #include "resources/image.h" -#include "resources/resource.h" #include "resources/resourcemanager.h" #include <guichan/graphics.hpp> diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 1dd4e1fc8..102fc9546 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -24,15 +24,14 @@ #include "actorspritemanager.h" #include "chatlogger.h" +#include "client.h" #include "commandhandler.h" #include "configuration.h" #include "localplayer.h" -#include "logger.h" #include "sound.h" #include "gui/helpwindow.h" -#include "gui/widgets/browserbox.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/itemlinkhandler.h" #include "gui/widgets/tradetab.h" @@ -44,7 +43,6 @@ #include "resources/itemdb.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <guichan/widgets/tabbedarea.hpp> diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h index 3d591cf3c..09f2b35ee 100644 --- a/src/gui/widgets/chattab.h +++ b/src/gui/widgets/chattab.h @@ -28,8 +28,6 @@ #include "gui/widgets/browserbox.h" #include "gui/widgets/tab.h" -#include "utils/stringvector.h" - #include "localconsts.h" class ScrollArea; diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index a25a9ef7e..b6bd62fa7 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -36,8 +36,6 @@ #include "resources/resourcemanager.h" #include "resources/wallpaper.h" -#include "utils/stringutils.h" - #include "debug.h" Desktop::Desktop() : diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp index a471ab8ff..af95ffa82 100644 --- a/src/gui/widgets/dropshortcutcontainer.cpp +++ b/src/gui/widgets/dropshortcutcontainer.cpp @@ -28,21 +28,15 @@ #include "gui/theme.h" #include "gui/viewport.h" -#include "configuration.h" +#include "client.h" #include "dropshortcut.h" -#include "graphics.h" -#include "inventory.h" -#include "item.h" #include "keyboardconfig.h" #include "localplayer.h" #include "playerinfo.h" #include "resources/image.h" -#include "resources/iteminfo.h" #include "resources/resourcemanager.h" -#include "utils/stringutils.h" - #include "debug.h" DropShortcutContainer::DropShortcutContainer(): diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index a1b496dc5..cfbfad31d 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -22,6 +22,7 @@ #include "gui/widgets/emoteshortcutcontainer.h" #include "animatedsprite.h" +#include "client.h" #include "configuration.h" #include "emoteshortcut.h" #include "graphics.h" @@ -31,14 +32,11 @@ #include "itemshortcut.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "logger.h" -#include "gui/palette.h" #include "gui/textpopup.h" #include "gui/theme.h" #include "gui/viewport.h" -#include "resources/emotedb.h" #include "resources/image.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp index 61f516d21..8421c22df 100644 --- a/src/gui/widgets/extendedlistbox.cpp +++ b/src/gui/widgets/extendedlistbox.cpp @@ -23,7 +23,6 @@ #include "client.h" #include "configuration.h" #include "keyevent.h" -#include "keydata.h" #include "gui/palette.h" #include "gui/sdlinput.h" @@ -31,8 +30,6 @@ #include "gui/widgets/extendedlistmodel.h" -#include "resources/image.h" - #include <guichan/focushandler.hpp> #include <guichan/font.hpp> #include <guichan/graphics.hpp> diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp index 9fed16e92..39887ef7e 100644 --- a/src/gui/widgets/guildchattab.cpp +++ b/src/gui/widgets/guildchattab.cpp @@ -34,9 +34,7 @@ #include "resources/iteminfo.h" #include "resources/itemdb.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index 910ee1910..63ea96db0 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -25,7 +25,6 @@ #include "client.h" #include "configuration.h" #include "keyevent.h" -#include "keydata.h" #include "gui/sdlinput.h" #include "gui/theme.h" diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index f16852673..bff17cfa2 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -27,7 +27,6 @@ #include "item.h" #include "itemshortcut.h" #include "dropshortcut.h" -#include "logger.h" #include "gui/chatwindow.h" #include "gui/gui.h" @@ -44,9 +43,6 @@ #include "net/inventoryhandler.h" #include "resources/image.h" -#include "resources/iteminfo.h" - -#include "utils/stringutils.h" #include <guichan/mouseinput.hpp> #include <guichan/selectionlistener.hpp> diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index 00f310c51..be2c02335 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -29,8 +29,6 @@ #include "utils/process.h" -#include "resources/itemdb.h" - #include <sstream> #include <string> diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 50fc0de0f..2e4da8cbe 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -22,6 +22,7 @@ #include "gui/widgets/itemshortcutcontainer.h" +#include "client.h" #include "configuration.h" #include "graphics.h" #include "inventory.h" @@ -32,21 +33,15 @@ #include "keyboardconfig.h" #include "localplayer.h" #include "playerinfo.h" -#include "spellmanager.h" -#include "textcommand.h" #include "gui/inventorywindow.h" #include "gui/itempopup.h" -#include "gui/palette.h" #include "gui/skilldialog.h" #include "gui/spellpopup.h" #include "gui/theme.h" #include "gui/viewport.h" #include "resources/image.h" -#include "resources/iteminfo.h" - -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h index 59e52b5ae..255a8090e 100644 --- a/src/gui/widgets/itemshortcutcontainer.h +++ b/src/gui/widgets/itemshortcutcontainer.h @@ -23,8 +23,6 @@ #ifndef ITEMSHORTCUTCONTAINER_H #define ITEMSHORTCUTCONTAINER_H -#include "spellmanager.h" - #include "gui/widgets/shortcutcontainer.h" #include <guichan/mouselistener.hpp> diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 8e5bc0c78..46067df91 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -25,7 +25,6 @@ #include "client.h" #include "configuration.h" #include "keyevent.h" -#include "keydata.h" #include "gui/palette.h" #include "gui/sdlinput.h" diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index b9f6657a9..51f057621 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -26,7 +26,6 @@ #include "being.h" #include "client.h" #include "configuration.h" -#include "graphics.h" #include "gui/theme.h" diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 34079afb2..228dcc040 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -23,7 +23,6 @@ #include "gui/widgets/popup.h" -#include "configuration.h" #include "graphics.h" #include "graphicsvertexes.h" #include "logger.h" @@ -31,7 +30,6 @@ #include "gui/theme.h" #include "gui/viewport.h" -#include "gui/widgets/windowcontainer.h" #include "gui/widgets/window.h" #include "resources/image.h" diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 0d0211bcc..10590d72d 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -29,9 +29,7 @@ #include "textrenderer.h" #include "gui/gui.h" -#include "gui/palette.h" #include "gui/sdlfont.h" -#include "gui/theme.h" #include "resources/image.h" diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index bbc809747..ca640421e 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -29,7 +29,6 @@ #include "gui/gui.h" #include "gui/sdlfont.h" -#include "gui/widgets/button.h" #include "gui/widgets/checkbox.h" #include "gui/widgets/dropdown.h" #include "gui/widgets/horizontcontainer.h" @@ -38,8 +37,6 @@ #include "gui/widgets/layouthelper.h" #include "gui/widgets/slider.h" #include "gui/widgets/sliderlist.h" -#include "gui/widgets/tabbedarea.h" -#include "gui/widgets/textfield.h" #include "gui/widgets/vertcontainer.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp index 6c8397bbb..10bdf4045 100644 --- a/src/gui/widgets/shortcutcontainer.cpp +++ b/src/gui/widgets/shortcutcontainer.cpp @@ -26,8 +26,6 @@ #include "resources/image.h" -#include "utils/stringutils.h" - #include "debug.h" float ShortcutContainer::mAlpha = 1.0; diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 630bd7e28..0a130f60e 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -26,7 +26,6 @@ #include "configuration.h" #include "graphics.h" #include "keyevent.h" -#include "keydata.h" #include "gui/theme.h" diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index 25dd3fb6d..a057eceb4 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -31,22 +31,16 @@ #include "gui/textcommandeditor.h" #include "gui/theme.h" -#include "configuration.h" -#include "graphics.h" -#include "inventory.h" +#include "client.h" #include "spellshortcut.h" #include "itemshortcut.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "spellmanager.h" -#include "logger.h" #include "resources/image.h" -#include "textcommand.h" #include "resources/resourcemanager.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 79c48beac..261cdf901 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -26,7 +26,6 @@ #include "configuration.h" #include "graphics.h" #include "keyevent.h" -#include "keydata.h" #include "logger.h" #include "gui/palette.h" @@ -37,7 +36,6 @@ #include "utils/copynpaste.h" #include "utils/dtor.h" -#include "utils/stringutils.h" #include <guichan/font.hpp> diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp index 36533864e..0ec79a5c5 100644 --- a/src/gui/widgets/textpreview.cpp +++ b/src/gui/widgets/textpreview.cpp @@ -27,7 +27,6 @@ #include "textrenderer.h" #include "gui/gui.h" -#include "gui/palette.h" #include "gui/sdlfont.h" #include <typeinfo> diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp index 5c893de1f..6416fcd8a 100644 --- a/src/gui/widgets/tradetab.cpp +++ b/src/gui/widgets/tradetab.cpp @@ -25,7 +25,6 @@ #include "chatlogger.h" #include "commandhandler.h" #include "localplayer.h" -#include "logger.h" #include "gui/theme.h" @@ -36,7 +35,6 @@ #include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp index 2b3b0436f..bb918e3b3 100644 --- a/src/gui/widgets/whispertab.cpp +++ b/src/gui/widgets/whispertab.cpp @@ -25,7 +25,6 @@ #include "chatlogger.h" #include "commandhandler.h" #include "localplayer.h" -#include "logger.h" #include "gui/theme.h" @@ -33,7 +32,6 @@ #include "net/net.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index c0c3ef94a..2350ed958 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -34,7 +34,6 @@ #include "gui/widgets/layout.h" #include "gui/widgets/resizegrip.h" -#include "gui/widgets/windowcontainer.h" #include "resources/image.h" diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 5f48ff633..361b5287e 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -35,9 +35,6 @@ #include "gui/textpopup.h" #include "gui/viewport.h" -#include "gui/widgets/window.h" -#include "gui/widgets/windowcontainer.h" - #include "net/net.h" #include "net/playerhandler.h" diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp index d5bb0ae40..d8b204140 100644 --- a/src/gui/worldselectdialog.cpp +++ b/src/gui/worldselectdialog.cpp @@ -36,10 +36,8 @@ #include "net/logindata.h" #include "net/loginhandler.h" #include "net/net.h" -#include "net/worldinfo.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp index 38cf0818d..51fa22224 100644 --- a/src/guildmanager.cpp +++ b/src/guildmanager.cpp @@ -34,7 +34,6 @@ #include "net/net.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/guildmanager.h b/src/guildmanager.h index 460fdef4e..a2b6f7c0d 100644 --- a/src/guildmanager.h +++ b/src/guildmanager.h @@ -21,7 +21,6 @@ #ifndef GUILDMANAGER_H #define GUILDMANAGER_H -#include "utils/dtor.h" #include "utils/stringvector.h" #include <map> diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp index ba94c7d3e..cc6492817 100644 --- a/src/inputmanager.cpp +++ b/src/inputmanager.cpp @@ -20,6 +20,7 @@ #include "inputmanager.h" +#include "client.h" #include "configuration.h" #include "game.h" #include "joystick.h" @@ -32,6 +33,7 @@ #include "gui/inventorywindow.h" #include "gui/npcdialog.h" #include "gui/npcpostdialog.h" +#include "gui/sdlinput.h" #include "gui/setup.h" #include "gui/setup_input.h" #include "gui/textdialog.h" diff --git a/src/inputmanager.h b/src/inputmanager.h index 4bcc85e84..016670e5b 100644 --- a/src/inputmanager.h +++ b/src/inputmanager.h @@ -24,11 +24,11 @@ #include "inputevent.h" #include "keydata.h" -#include "gui/sdlinput.h" - #include <string> #include <map> +#include <SDL/SDL.h> + #define KeyFunctionSize 3 // hack to avoid conflicts with windows headers. diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp index 62b37f34e..10fa20a50 100644 --- a/src/itemshortcut.cpp +++ b/src/itemshortcut.cpp @@ -25,6 +25,7 @@ #include "configuration.h" #include "inventory.h" #include "item.h" +#include "logger.h" #include "playerinfo.h" #include "spellmanager.h" @@ -33,8 +34,6 @@ #include "net/inventoryhandler.h" #include "net/net.h" -#include "utils/stringutils.h" - #include "debug.h" ItemShortcut *itemShortcut[SHORTCUT_TABS]; diff --git a/src/joystick.h b/src/joystick.h index 4b4c76943..6c8513c50 100644 --- a/src/joystick.h +++ b/src/joystick.h @@ -24,9 +24,8 @@ #define JOYSTICK_H #include "inputevent.h" -#include "keydata.h" -#include <SDL.h> +#include <SDL/SDL.h> #include <string> #include <vector> diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index 6ce03f4a1..742dd69d5 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -26,10 +26,7 @@ #include "inputmanager.h" #include "logger.h" -#include "gui/sdlinput.h" - #include "utils/gettext.h" -#include "utils/stringutils.h" #include <SDL_events.h> diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h index 2ee708c59..ae9bafa2f 100644 --- a/src/keyboardconfig.h +++ b/src/keyboardconfig.h @@ -27,7 +27,6 @@ #include <SDL_keyboard.h> #include "inputevent.h" -#include "keydata.h" #include <map> #include <string> diff --git a/src/keyboarddata.h b/src/keyboarddata.h index d0ff27507..5fa2f0e1d 100644 --- a/src/keyboarddata.h +++ b/src/keyboarddata.h @@ -24,12 +24,9 @@ #define KEYBOARDDATA_H #include "actionmanager.h" -#include "inputmanager.h" -#include "keydata.h" #include "localconsts.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <string> diff --git a/src/keydata.h b/src/keydata.h index ef1d70b88..dc5a136a6 100644 --- a/src/keydata.h +++ b/src/keydata.h @@ -23,7 +23,7 @@ #ifndef KEYDATA_H #define KEYDATA_H -#include "actionmanager.h" +#include "inputevent.h" #include <string> diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 66b5c11c1..0c7c8a326 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -26,13 +26,10 @@ #include "client.h" #include "configuration.h" #include "effectmanager.h" -#include "flooritem.h" #include "graphics.h" #include "guild.h" #include "item.h" #include "keyboardconfig.h" -#include "logger.h" -#include "map.h" #include "maplayer.h" #include "party.h" #include "particle.h" @@ -53,7 +50,6 @@ #include "gui/skilldialog.h" #include "gui/socialwindow.h" #include "gui/theme.h" -#include "gui/userpalette.h" #include "gui/viewport.h" #include "gui/widgets/chattab.h" @@ -68,13 +64,11 @@ #include "net/specialhandler.h" #include "net/tradehandler.h" -#include "resources/animation.h" #include "resources/imageset.h" #include "resources/iteminfo.h" #include "resources/resourcemanager.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "mumblemanager.h" diff --git a/src/localplayer.h b/src/localplayer.h index 7e60fa418..55b29a731 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -25,8 +25,6 @@ #include "actorspritelistener.h" #include "being.h" -#include "client.h" -#include "game.h" #include "listener.h" #include "localconsts.h" diff --git a/src/main.cpp b/src/main.cpp index 4ed190417..d3683be1e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,7 +31,6 @@ #include "utils/gettext.h" #include "utils/paths.h" -#include "utils/stringutils.h" #include "utils/xml.h" #ifdef UNITTESTS diff --git a/src/map.cpp b/src/map.cpp index cce5d6419..082c45857 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -23,14 +23,14 @@ #include "map.h" #include "actorspritemanager.h" +#include "client.h" #include "configuration.h" -#include "logger.h" +#include "localplayer.h" #include "maplayer.h" #include "particle.h" #include "simpleanimation.h" #include "tileset.h" -#include "localplayer.h" #include "resources/ambientlayer.h" #include "resources/image.h" @@ -44,6 +44,7 @@ #include <limits.h> #include <physfs.h> +#include <queue> #include <sys/stat.h> diff --git a/src/maplayer.cpp b/src/maplayer.cpp index 52b43ac4b..0db298258 100644 --- a/src/maplayer.cpp +++ b/src/maplayer.cpp @@ -26,7 +26,6 @@ #include "graphicsvertexes.h" -#include "logger.h" #include "localplayer.h" #include "resources/image.h" diff --git a/src/maplayer.h b/src/maplayer.h index c8dc08238..03bb86409 100644 --- a/src/maplayer.h +++ b/src/maplayer.h @@ -26,7 +26,6 @@ #include "actor.h" #include "configlistener.h" #include "position.h" -#include "properties.h" #include <string> #include <vector> diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h index 8a49a68cd..3fbcbe733 100644 --- a/src/net/buysellhandler.h +++ b/src/net/buysellhandler.h @@ -25,7 +25,6 @@ #include "net/messagein.h" -#include "being.h" #include "shopitem.h" namespace Net diff --git a/src/net/download.cpp b/src/net/download.cpp index a0d7dbe25..5d35e1ace 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -25,8 +25,6 @@ #include "logger.h" #include "main.h" -#include "utils/stringutils.h" - #include <curl/curl.h> #include <SDL.h> diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp index f70be3cc8..3a7501fb6 100644 --- a/src/net/ea/adminhandler.cpp +++ b/src/net/ea/adminhandler.cpp @@ -23,7 +23,6 @@ #include "net/ea/adminhandler.h" #include "net/chathandler.h" -#include "net/net.h" #include <string> diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 765cbc651..5a3ca3cc7 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -25,15 +25,14 @@ #include "net/ea/eaprotocol.h" #include "actorspritemanager.h" -#include "being.h" #include "client.h" #include "effectmanager.h" +#include "game.h" #include "guild.h" #include "guildmanager.h" #include "inputmanager.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "logger.h" #include "party.h" #include "playerrelations.h" #include "configuration.h" @@ -44,10 +43,8 @@ #include "gui/killstats.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "net/playerhandler.h" -#include "net/net.h" #include "resources/colordb.h" #include "resources/itemdb.h" diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index 46292bae5..d9080b969 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -23,13 +23,12 @@ #include "net/ea/buysellhandler.h" #include "actorspritemanager.h" +#include "client.h" #include "configuration.h" #include "depricatedevent.h" #include "inventory.h" -#include "item.h" #include "localplayer.h" #include "playerinfo.h" -#include "shopitem.h" #include "gui/buydialog.h" #include "gui/buyselldialog.h" @@ -39,8 +38,6 @@ #include "gui/widgets/chattab.h" #include "net/chathandler.h" -#include "net/messagein.h" -#include "net/net.h" #include "utils/gettext.h" diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index 942ba79a6..62c9090e9 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -23,13 +23,10 @@ #include "net/ea/charserverhandler.h" #include "client.h" -#include "logger.h" #include "gui/charcreatedialog.h" #include "gui/okdialog.h" -#include "net/net.h" - #include "net/ea/loginhandler.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index bec8d2011..c0978157c 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -26,7 +26,6 @@ #include "net/charhandler.h" #include "net/messagein.h" #include "net/net.h" -#include "net/serverinfo.h" class LoginData; diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index d44830644..0ab2c903c 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -23,12 +23,10 @@ #include "net/ea/chathandler.h" #include "actorspritemanager.h" -#include "being.h" #include "configuration.h" #include "guildmanager.h" #include "localplayer.h" #include "playerrelations.h" -#include "logger.h" #include "gui/chatwindow.h" #include "gui/shopwindow.h" @@ -36,7 +34,6 @@ #include "gui/widgets/chattab.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <string> diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index 69f4089ad..1cb105204 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -23,15 +23,11 @@ #include "net/ea/gamehandler.h" #include "client.h" -#include "depricatedevent.h" #include "game.h" #include "localplayer.h" -#include "logger.h" #include "gui/okdialog.h" -#include "net/messagein.h" - #include "utils/gettext.h" #include "debug.h" diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp index 3ab6a48eb..b41e69418 100644 --- a/src/net/ea/gui/guildtab.cpp +++ b/src/net/ea/gui/guildtab.cpp @@ -34,14 +34,10 @@ #include "net/ea/guildhandler.h" -#include "net/guildhandler.h" - #include "resources/iteminfo.h" #include "resources/itemdb.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp index 0e3b51928..edbd867d9 100644 --- a/src/net/ea/gui/partytab.cpp +++ b/src/net/ea/gui/partytab.cpp @@ -36,9 +36,7 @@ #include "resources/iteminfo.h" #include "resources/itemdb.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "net/chathandler.h" diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index 7c2361531..fb14540cb 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -22,10 +22,7 @@ #include "net/ea/guildhandler.h" #include "actorspritemanager.h" -#include "depricatedevent.h" -#include "guild.h" #include "localplayer.h" -#include "logger.h" #include "gui/socialwindow.h" diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index b194afd0d..6a4818129 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -22,20 +22,18 @@ #include "net/ea/inventoryhandler.h" -#include "inventory.h" #include "localplayer.h" -#include "logger.h" #include "gui/ministatuswindow.h" -#include "net/messagein.h" - #include "net/ea/eaprotocol.h" #include "utils/gettext.h" #include "debug.h" +extern int serverVersion; + const Equipment::Slot EQUIP_POINTS[Equipment::EQUIP_VECTOREND] = { Equipment::EQUIP_LEGS_SLOT, diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index b868b5dfa..15c2e0994 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -26,14 +26,11 @@ #include "equipment.h" #include "inventory.h" #include "localconsts.h" -#include "logger.h" #include "playerinfo.h" #include "gui/inventorywindow.h" -#include "net/inventoryhandler.h" #include "net/messagein.h" -#include "net/net.h" #include <vector> #include <queue> diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp index dcc17421f..f4954d3d5 100644 --- a/src/net/ea/itemhandler.cpp +++ b/src/net/ea/itemhandler.cpp @@ -24,8 +24,6 @@ #include "actorspritemanager.h" -#include "net/messagein.h" - #include "debug.h" namespace Ea diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index 2a7afb189..18cc26351 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -23,8 +23,8 @@ #include "net/ea/loginhandler.h" #include "client.h" -#include "logger.h" #include "configuration.h" +#include "logger.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp index ccf126a22..fc50c0971 100644 --- a/src/net/ea/network.cpp +++ b/src/net/ea/network.cpp @@ -26,12 +26,10 @@ #include "logger.h" #include "net/messagehandler.h" -#include "net/messagein.h" #include "net/eathena/protocol.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <assert.h> #include <sstream> diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp index 18b0ca39a..9ce72fd96 100644 --- a/src/net/ea/npchandler.cpp +++ b/src/net/ea/npchandler.cpp @@ -24,9 +24,6 @@ #include "gui/npcdialog.h" -#include "net/messagein.h" -#include "net/net.h" - #include "debug.h" namespace Ea diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 68d712db1..fa853bb4b 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -23,14 +23,9 @@ #include "actorspritemanager.h" #include "localplayer.h" -#include "logger.h" #include "gui/socialwindow.h" -#include "net/messagein.h" - -#include "net/ea/gui/partytab.h" - #include "utils/gettext.h" #include "debug.h" diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 130b31046..aa998158c 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -22,10 +22,9 @@ #include "net/ea/playerhandler.h" +#include "game.h" #include "localplayer.h" -#include "logger.h" #include "party.h" -#include "playerinfo.h" #include "units.h" #include "gui/ministatuswindow.h" @@ -34,7 +33,6 @@ #include "gui/statuswindow.h" #include "gui/viewport.h" -#include "net/messagein.h" #include "net/npchandler.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/ea/specialhandler.cpp b/src/net/ea/specialhandler.cpp index 7a760c5b4..7db3f1b31 100644 --- a/src/net/ea/specialhandler.cpp +++ b/src/net/ea/specialhandler.cpp @@ -30,7 +30,6 @@ #include "gui/widgets/chattab.h" -#include "net/messagein.h" #include "net/messageout.h" #include "utils/gettext.h" diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 80104ea67..fb49bdc62 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -33,7 +33,6 @@ #include "gui/tradewindow.h" #include "net/inventoryhandler.h" -#include "net/messagein.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp index 0ff3aa03d..56b636b3b 100644 --- a/src/net/eathena/adminhandler.cpp +++ b/src/net/eathena/adminhandler.cpp @@ -22,22 +22,16 @@ #include "net/eathena/adminhandler.h" -#include "net/ea/adminhandler.h" - #include "actorspritemanager.h" -#include "being.h" #include "depricatedevent.h" #include "game.h" -#include "logger.h" #include "playerrelations.h" #include "net/chathandler.h" -#include "net/net.h" #include "net/eathena/protocol.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <string> diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 9cd7fdeaf..1af410632 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -23,14 +23,12 @@ #include "net/eathena/beinghandler.h" #include "actorspritemanager.h" -#include "being.h" #include "client.h" #include "effectmanager.h" #include "guild.h" #include "guildmanager.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "logger.h" #include "party.h" #include "playerrelations.h" #include "configuration.h" @@ -41,10 +39,8 @@ #include "gui/killstats.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "net/playerhandler.h" -#include "net/net.h" #include "net/eathena/protocol.h" diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp index 785338373..405d5f7ec 100644 --- a/src/net/eathena/buysellhandler.cpp +++ b/src/net/eathena/buysellhandler.cpp @@ -26,10 +26,8 @@ #include "configuration.h" #include "depricatedevent.h" #include "inventory.h" -#include "item.h" #include "localplayer.h" #include "playerinfo.h" -#include "shopitem.h" #include "gui/buydialog.h" #include "gui/buyselldialog.h" @@ -39,8 +37,6 @@ #include "gui/widgets/chattab.h" #include "net/chathandler.h" -#include "net/messagein.h" -#include "net/net.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h index b3440454e..499ec691e 100644 --- a/src/net/eathena/buysellhandler.h +++ b/src/net/eathena/buysellhandler.h @@ -27,10 +27,6 @@ #include "net/ea/buysellhandler.h" -#include "being.h" - -#include "net/net.h" - #include "net/eathena/messagehandler.h" namespace EAthena diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 085767a46..512300704 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -24,13 +24,10 @@ #include "client.h" #include "configuration.h" -#include "logger.h" #include "gui/charcreatedialog.h" #include "net/logindata.h" -#include "net/messagein.h" -#include "net/net.h" #include "net/eathena/gamehandler.h" #include "net/eathena/loginhandler.h" diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h index 28b43cba5..f276b6346 100644 --- a/src/net/eathena/charserverhandler.h +++ b/src/net/eathena/charserverhandler.h @@ -27,8 +27,6 @@ #include "net/ea/charserverhandler.h" -#include "net/serverinfo.h" - #include "net/eathena/messagehandler.h" #include "net/ea/token.h" diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp index 05e98daad..756faf6f3 100644 --- a/src/net/eathena/chathandler.cpp +++ b/src/net/eathena/chathandler.cpp @@ -23,22 +23,17 @@ #include "net/eathena/chathandler.h" #include "actorspritemanager.h" -#include "being.h" #include "configuration.h" #include "depricatedevent.h" #include "game.h" #include "localplayer.h" #include "playerrelations.h" -#include "logger.h" #include "gui/chatwindow.h" #include "gui/shopwindow.h" #include "gui/widgets/chattab.h" -#include "net/messagein.h" -#include "net/messageout.h" - #include "net/eathena/protocol.h" #include <string> diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp index 387768227..09e6e4121 100644 --- a/src/net/eathena/gamehandler.cpp +++ b/src/net/eathena/gamehandler.cpp @@ -23,13 +23,8 @@ #include "net/eathena/gamehandler.h" #include "client.h" -#include "depricatedevent.h" #include "game.h" #include "localplayer.h" -#include "logger.h" - -#include "net/messagein.h" -#include "net/messageout.h" #include "net/eathena/loginhandler.h" #include "net/eathena/network.h" diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h index a1f6c46e7..97df941ee 100644 --- a/src/net/eathena/gamehandler.h +++ b/src/net/eathena/gamehandler.h @@ -25,7 +25,6 @@ #include "net/gamehandler.h" #include "net/net.h" -#include "net/serverinfo.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 76bb2cb36..82c52e943 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -33,13 +33,8 @@ #include "gui/socialwindow.h" #include "gui/statuswindow.h" -#include "net/messagein.h" -#include "net/messageout.h" -#include "net/serverinfo.h" - #include "net/ea/guildhandler.h" -#include "net/ea/gui/guildtab.h" #include "net/ea/gui/partytab.h" #include "net/eathena/adminhandler.h" @@ -63,8 +58,6 @@ #include "net/eathena/gui/guildtab.h" #include "net/eathena/gui/partytab.h" -#include "resources/itemdb.h" - #include "utils/gettext.h" #include <list> diff --git a/src/net/eathena/gui/guildtab.cpp b/src/net/eathena/gui/guildtab.cpp index 33b29db65..387cb9446 100644 --- a/src/net/eathena/gui/guildtab.cpp +++ b/src/net/eathena/gui/guildtab.cpp @@ -35,9 +35,7 @@ #include "resources/iteminfo.h" #include "resources/itemdb.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/net/eathena/gui/partytab.cpp b/src/net/eathena/gui/partytab.cpp index 8435f1c57..57a0bf8c1 100644 --- a/src/net/eathena/gui/partytab.cpp +++ b/src/net/eathena/gui/partytab.cpp @@ -35,9 +35,7 @@ #include "resources/iteminfo.h" #include "resources/itemdb.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "net/chathandler.h" diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp index 6b8db8983..719d82163 100644 --- a/src/net/eathena/guildhandler.cpp +++ b/src/net/eathena/guildhandler.cpp @@ -23,7 +23,6 @@ #include "actorspritemanager.h" #include "localplayer.h" -#include "logger.h" #include "playerinfo.h" #include "net/eathena/messagein.h" diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h index 186d1f630..ab9ef3c77 100644 --- a/src/net/eathena/guildhandler.h +++ b/src/net/eathena/guildhandler.h @@ -26,8 +26,6 @@ #include "net/ea/guildhandler.h" -#include "net/ea/gui/guildtab.h" - #include "net/eathena/messagehandler.h" namespace EAthena diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index b7841f940..9f4b18ab2 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -22,10 +22,6 @@ #include "net/eathena/inventoryhandler.h" -#include "logger.h" - -#include "net/messagein.h" - #include "net/eathena/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/eathena/itemhandler.cpp b/src/net/eathena/itemhandler.cpp index 814e3c76e..8eedb8562 100644 --- a/src/net/eathena/itemhandler.cpp +++ b/src/net/eathena/itemhandler.cpp @@ -22,8 +22,6 @@ #include "net/eathena/itemhandler.h" -#include "net/messagein.h" - #include "net/eathena/protocol.h" #include "debug.h" diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp index 68555d7c5..1aeef1c09 100644 --- a/src/net/eathena/loginhandler.cpp +++ b/src/net/eathena/loginhandler.cpp @@ -23,10 +23,8 @@ #include "net/eathena/loginhandler.h" #include "client.h" -#include "logger.h" #include "configuration.h" - -#include "net/messagein.h" +#include "logger.h" #include "net/eathena/network.h" #include "net/eathena/protocol.h" diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h index 602518782..ec7713eca 100644 --- a/src/net/eathena/loginhandler.h +++ b/src/net/eathena/loginhandler.h @@ -29,8 +29,6 @@ #include "net/eathena/messagehandler.h" -#include "net/ea/token.h" - #include <string> class LoginData; diff --git a/src/net/eathena/messagehandler.h b/src/net/eathena/messagehandler.h index f494c5181..a8dfa1b5b 100644 --- a/src/net/eathena/messagehandler.h +++ b/src/net/eathena/messagehandler.h @@ -24,7 +24,6 @@ #define NET_EATHENA_MESSAGEHANDLER_H #include "net/messagehandler.h" -#include "net/messagein.h" #include "net/eathena/messageout.h" diff --git a/src/net/eathena/messageout.cpp b/src/net/eathena/messageout.cpp index a486a02f5..26261aaa5 100644 --- a/src/net/eathena/messageout.cpp +++ b/src/net/eathena/messageout.cpp @@ -28,8 +28,6 @@ #include "logger.h" -#include "utils/stringutils.h" - #include <SDL.h> #include <SDL_endian.h> diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp index 67018e7b5..236d80310 100644 --- a/src/net/eathena/network.cpp +++ b/src/net/eathena/network.cpp @@ -25,13 +25,9 @@ #include "configuration.h" #include "logger.h" -#include "net/messagehandler.h" -#include "net/messagein.h" - #include "net/eathena/protocol.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <assert.h> #include <sstream> diff --git a/src/net/eathena/network.h b/src/net/eathena/network.h index 0ce8591ff..3c8ab2a65 100644 --- a/src/net/eathena/network.h +++ b/src/net/eathena/network.h @@ -25,11 +25,8 @@ #include "net/ea/network.h" -#include "net/serverinfo.h" - #include "net/eathena/messagehandler.h" #include "net/eathena/messagein.h" -#include "net/eathena/messageout.h" #include <SDL_net.h> #include <SDL_thread.h> diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index 3166a49cb..aa141e089 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -27,10 +27,6 @@ #include "gui/npcdialog.h" #include "gui/viewport.h" -#include "net/messagein.h" -#include "net/net.h" -#include "net/npchandler.h" - #include "net/eathena/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp index 2f525c9d5..04de35890 100644 --- a/src/net/eathena/partyhandler.cpp +++ b/src/net/eathena/partyhandler.cpp @@ -23,9 +23,6 @@ #include "actorspritemanager.h" #include "localplayer.h" -#include "logger.h" - -#include "net/messagein.h" #include "net/eathena/protocol.h" diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h index b39f17a33..1054f6d2d 100644 --- a/src/net/eathena/partyhandler.h +++ b/src/net/eathena/partyhandler.h @@ -29,8 +29,6 @@ #include "net/ea/partyhandler.h" -#include "party.h" - namespace EAthena { diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index 1054cd877..d9bb8c3b5 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -24,9 +24,6 @@ #include "configuration.h" #include "client.h" -#include "logger.h" - -#include "net/messagein.h" #include "net/eathena/protocol.h" #include "net/eathena/npchandler.h" diff --git a/src/net/eathena/specialhandler.cpp b/src/net/eathena/specialhandler.cpp index f2f969ff7..77bb5a1d2 100644 --- a/src/net/eathena/specialhandler.cpp +++ b/src/net/eathena/specialhandler.cpp @@ -24,8 +24,6 @@ #include "logger.h" -#include "net/messagein.h" - #include "net/eathena/protocol.h" #include "debug.h" diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp index 66bb20b29..a9416f8cd 100644 --- a/src/net/eathena/tradehandler.cpp +++ b/src/net/eathena/tradehandler.cpp @@ -23,11 +23,8 @@ #include "net/eathena/tradehandler.h" #include "item.h" -#include "logger.h" #include "playerinfo.h" -#include "net/messagein.h" - #include "net/eathena/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h index 9864ba654..57b49b13b 100644 --- a/src/net/generalhandler.h +++ b/src/net/generalhandler.h @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "client.h" -#include "main.h" - #ifndef GENERALHANDLER_H #define GENERALHANDLER_H diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index 642d6f1c1..5d6062710 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -23,7 +23,6 @@ #ifndef INVENTORYHANDLER_H #define INVENTORYHANDLER_H -#include "inventory.h" #include "item.h" #include <iosfwd> diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 377cca6d3..ca1d86881 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -27,8 +27,6 @@ #include "logger.h" #include "net.h" -#include "utils/stringutils.h" - #include "debug.h" #define MAKEWORD(low, high) \ diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index 3b7ed813f..ae45d44d6 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -22,22 +22,16 @@ #include "net/tmwa/adminhandler.h" -#include "net/ea/adminhandler.h" - #include "actorspritemanager.h" -#include "being.h" #include "depricatedevent.h" #include "game.h" -#include "logger.h" #include "playerrelations.h" #include "net/chathandler.h" -#include "net/net.h" #include "net/tmwa/protocol.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <string> diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index dc815bf1c..9a2827ee5 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -23,14 +23,12 @@ #include "net/tmwa/beinghandler.h" #include "actorspritemanager.h" -#include "being.h" #include "client.h" #include "effectmanager.h" #include "guild.h" #include "guildmanager.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "logger.h" #include "party.h" #include "playerrelations.h" #include "configuration.h" @@ -41,10 +39,8 @@ #include "gui/killstats.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "net/playerhandler.h" -#include "net/net.h" #include "net/tmwa/protocol.h" diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp index aa0a07d9d..5a3877734 100644 --- a/src/net/tmwa/buysellhandler.cpp +++ b/src/net/tmwa/buysellhandler.cpp @@ -26,10 +26,8 @@ #include "configuration.h" #include "depricatedevent.h" #include "inventory.h" -#include "item.h" #include "localplayer.h" #include "playerinfo.h" -#include "shopitem.h" #include "gui/buydialog.h" #include "gui/buyselldialog.h" @@ -39,8 +37,6 @@ #include "gui/widgets/chattab.h" #include "net/chathandler.h" -#include "net/messagein.h" -#include "net/net.h" #include "net/ea/eaprotocol.h" @@ -52,6 +48,7 @@ #include "debug.h" extern Net::BuySellHandler *buySellHandler; +extern int serverVersion; namespace TmwAthena { diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h index e4d07511f..69188099f 100644 --- a/src/net/tmwa/buysellhandler.h +++ b/src/net/tmwa/buysellhandler.h @@ -27,10 +27,6 @@ #include "net/ea/buysellhandler.h" -#include "being.h" - -#include "net/net.h" - #include "net/tmwa/messagehandler.h" namespace TmwAthena diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 0a660a79d..777abc54e 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -24,13 +24,10 @@ #include "client.h" #include "configuration.h" -#include "logger.h" #include "gui/charcreatedialog.h" #include "net/logindata.h" -#include "net/messagein.h" -#include "net/net.h" #include "net/tmwa/gamehandler.h" #include "net/tmwa/loginhandler.h" diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index 915c6dba5..7a6629237 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -27,8 +27,6 @@ #include "net/ea/charserverhandler.h" -#include "net/serverinfo.h" - #include "net/tmwa/messagehandler.h" #include "net/ea/token.h" diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 81c7ea5b6..6b695c1ee 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -23,22 +23,17 @@ #include "net/tmwa/chathandler.h" #include "actorspritemanager.h" -#include "being.h" #include "configuration.h" #include "depricatedevent.h" #include "game.h" #include "localplayer.h" #include "playerrelations.h" -#include "logger.h" #include "gui/chatwindow.h" #include "gui/shopwindow.h" #include "gui/widgets/chattab.h" -#include "net/messagein.h" -#include "net/messageout.h" - #include "net/tmwa/protocol.h" #include <string> diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index a6096d4d9..15a4477ff 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -23,13 +23,8 @@ #include "net/tmwa/gamehandler.h" #include "client.h" -#include "depricatedevent.h" #include "game.h" #include "localplayer.h" -#include "logger.h" - -#include "net/messagein.h" -#include "net/messageout.h" #include "net/tmwa/loginhandler.h" #include "net/tmwa/network.h" diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h index 455ec3646..8f399d230 100644 --- a/src/net/tmwa/gamehandler.h +++ b/src/net/tmwa/gamehandler.h @@ -25,7 +25,6 @@ #include "net/gamehandler.h" #include "net/net.h" -#include "net/serverinfo.h" #include "net/tmwa/messagehandler.h" diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index c5ca7b529..2a38fcefe 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -33,13 +33,8 @@ #include "gui/socialwindow.h" #include "gui/statuswindow.h" -#include "net/messagein.h" -#include "net/messageout.h" -#include "net/serverinfo.h" - #include "net/ea/guildhandler.h" -#include "net/ea/gui/guildtab.h" #include "net/ea/gui/partytab.h" #include "net/tmwa/adminhandler.h" @@ -64,8 +59,6 @@ #include "net/tmwa/gui/guildtab.h" #include "net/tmwa/gui/partytab.h" -#include "resources/itemdb.h" - #include "utils/gettext.h" #include <list> diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp index 496ba64f5..752a33746 100644 --- a/src/net/tmwa/gui/guildtab.cpp +++ b/src/net/tmwa/gui/guildtab.cpp @@ -35,9 +35,7 @@ #include "resources/iteminfo.h" #include "resources/itemdb.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index 02bcfd54f..40ed53fcf 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -35,9 +35,7 @@ #include "resources/iteminfo.h" #include "resources/itemdb.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "net/chathandler.h" diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index 8bd8e9754..e57ae8e98 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -23,7 +23,6 @@ #include "actorspritemanager.h" #include "localplayer.h" -#include "logger.h" #include "playerinfo.h" #include "net/tmwa/messagein.h" diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index e1d2d7c29..cb149655c 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -26,8 +26,6 @@ #include "net/ea/guildhandler.h" -#include "net/ea/gui/guildtab.h" - #include "net/tmwa/messagehandler.h" namespace TmwAthena diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 9977df34d..5838bae1c 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -22,10 +22,6 @@ #include "net/tmwa/inventoryhandler.h" -#include "logger.h" - -#include "net/messagein.h" - #include "net/tmwa/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp index 58c564d77..4e6a9bfa1 100644 --- a/src/net/tmwa/itemhandler.cpp +++ b/src/net/tmwa/itemhandler.cpp @@ -22,8 +22,6 @@ #include "net/tmwa/itemhandler.h" -#include "net/messagein.h" - #include "net/tmwa/protocol.h" #include "debug.h" diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index 67c6aa932..d95cbfe54 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -23,10 +23,8 @@ #include "net/tmwa/loginhandler.h" #include "client.h" -#include "logger.h" #include "configuration.h" - -#include "net/messagein.h" +#include "logger.h" #include "net/tmwa/network.h" #include "net/tmwa/protocol.h" diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h index b27b0af77..ecd9d2428 100644 --- a/src/net/tmwa/loginhandler.h +++ b/src/net/tmwa/loginhandler.h @@ -29,8 +29,6 @@ #include "net/tmwa/messagehandler.h" -#include "net/ea/token.h" - #include <string> class LoginData; diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h index 7607e5c80..930fe4858 100644 --- a/src/net/tmwa/messagehandler.h +++ b/src/net/tmwa/messagehandler.h @@ -24,7 +24,6 @@ #define NET_TA_MESSAGEHANDLER_H #include "net/messagehandler.h" -#include "net/messagein.h" #include "net/tmwa/messageout.h" diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp index 1ceb806be..1c802d3e8 100644 --- a/src/net/tmwa/messageout.cpp +++ b/src/net/tmwa/messageout.cpp @@ -28,8 +28,6 @@ #include "logger.h" -#include "utils/stringutils.h" - #include <SDL.h> #include <SDL_endian.h> diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index 0492f6609..aab05c7b9 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -25,13 +25,9 @@ #include "configuration.h" #include "logger.h" -#include "net/messagehandler.h" -#include "net/messagein.h" - #include "net/tmwa/protocol.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <assert.h> #include <sstream> diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h index b110b7fb9..57fa339e1 100644 --- a/src/net/tmwa/network.h +++ b/src/net/tmwa/network.h @@ -25,11 +25,8 @@ #include "net/ea/network.h" -#include "net/serverinfo.h" - #include "net/tmwa/messagehandler.h" #include "net/tmwa/messagein.h" -#include "net/tmwa/messageout.h" #include <SDL_net.h> #include <SDL_thread.h> diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index 6cd02c6e2..d68a78c8c 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -27,10 +27,6 @@ #include "gui/npcdialog.h" #include "gui/viewport.h" -#include "net/messagein.h" -#include "net/net.h" -#include "net/npchandler.h" - #include "net/tmwa/protocol.h" #include "net/ea/eaprotocol.h" @@ -40,6 +36,7 @@ #include "debug.h" extern Net::NpcHandler *npcHandler; +extern int serverVersion; namespace TmwAthena { diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp index 74826e5cd..8a59f2a48 100644 --- a/src/net/tmwa/partyhandler.cpp +++ b/src/net/tmwa/partyhandler.cpp @@ -23,9 +23,6 @@ #include "actorspritemanager.h" #include "localplayer.h" -#include "logger.h" - -#include "net/messagein.h" #include "net/tmwa/protocol.h" diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h index eb3f68a70..c4d20b353 100644 --- a/src/net/tmwa/partyhandler.h +++ b/src/net/tmwa/partyhandler.h @@ -29,8 +29,6 @@ #include "net/ea/partyhandler.h" -#include "party.h" - namespace TmwAthena { diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index ce0ce4019..4549234f4 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -24,9 +24,6 @@ #include "configuration.h" #include "client.h" -#include "logger.h" - -#include "net/messagein.h" #include "net/tmwa/protocol.h" #include "net/tmwa/npchandler.h" diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp index 68ab75806..759037bb5 100644 --- a/src/net/tmwa/questhandler.cpp +++ b/src/net/tmwa/questhandler.cpp @@ -24,9 +24,6 @@ #include "gui/questswindow.h" -#include "net/messagein.h" -#include "net/net.h" - #include "net/tmwa/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp index 8033d7a1d..58424cadc 100644 --- a/src/net/tmwa/specialhandler.cpp +++ b/src/net/tmwa/specialhandler.cpp @@ -24,8 +24,6 @@ #include "logger.h" -#include "net/messagein.h" - #include "net/tmwa/protocol.h" #include "debug.h" diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index f572e6cff..14614e62d 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -23,11 +23,8 @@ #include "net/tmwa/tradehandler.h" #include "item.h" -#include "logger.h" #include "playerinfo.h" -#include "net/messagein.h" - #include "net/tmwa/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/particle.cpp b/src/particle.cpp index 337fc7dc9..408446caf 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -25,7 +25,6 @@ #include "animationparticle.h" #include "configuration.h" #include "resources/dye.h" -#include "imageparticle.h" #include "logger.h" #include "map.h" #include "particleemitter.h" @@ -38,7 +37,6 @@ #include "utils/dtor.h" #include "utils/mathutils.h" -#include "utils/xml.h" #include <guichan/color.hpp> diff --git a/src/particle.h b/src/particle.h index 27bedade8..ecb3072f8 100644 --- a/src/particle.h +++ b/src/particle.h @@ -25,7 +25,6 @@ #include "actor.h" #include "localconsts.h" -#include "vector.h" #include <list> #include <string> diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index fc4f865f6..4a6e39e18 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -23,9 +23,7 @@ #include "particleemitter.h" #include "animationparticle.h" -#include "imageparticle.h" #include "logger.h" -#include "particle.h" #include "rotationalparticle.h" #include "resources/dye.h" diff --git a/src/party.h b/src/party.h index f567d2d64..0f7c6eee4 100644 --- a/src/party.h +++ b/src/party.h @@ -22,8 +22,6 @@ #ifndef PARTY_H #define PARTY_H -#include "avatar.h" - #include "gui/widgets/avatarlistbox.h" #include "utils/dtor.h" diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp index b4ff3ad03..d49609d73 100644 --- a/src/playerinfo.cpp +++ b/src/playerinfo.cpp @@ -23,7 +23,6 @@ #include "client.h" #include "depricatedevent.h" -#include "equipment.h" #include "inventory.h" #include "listener.h" #include "logger.h" @@ -32,10 +31,8 @@ #include "gui/npcdialog.h" #include "gui/npcpostdialog.h" -#include "resources/itemdb.h" #include "resources/iteminfo.h" -#include "net/net.h" #include "net/playerhandler.h" #include "debug.h" diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp index 29d9331ad..39bd0bd23 100644 --- a/src/playerrelations.cpp +++ b/src/playerrelations.cpp @@ -23,7 +23,6 @@ #include "playerrelations.h" #include "actorspritemanager.h" -#include "being.h" #include "configuration.h" #include "graphics.h" #include "localplayer.h" diff --git a/src/properties.h b/src/properties.h index 406477c73..501a20a57 100644 --- a/src/properties.h +++ b/src/properties.h @@ -23,7 +23,6 @@ #ifndef PROPERTIES_H #define PROPERTIES_H -#include "logger.h" #include <map> #include <sstream> #include <string> diff --git a/src/resources/action.h b/src/resources/action.h index f9c5da75b..4492902b5 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -23,8 +23,6 @@ #ifndef ACTION_H #define ACTION_H -#include "utils/xml.h" - #include <map> class Animation; diff --git a/src/resources/animation.h b/src/resources/animation.h index ffa717f8c..3b9b5f2ea 100644 --- a/src/resources/animation.h +++ b/src/resources/animation.h @@ -23,8 +23,6 @@ #ifndef ANIMATION_H #define ANIMATION_H -#include "utils/xml.h" - #include <vector> #include <string> diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index 227bc686e..5dde6b84e 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -25,8 +25,6 @@ #include "actorsprite.h" -#include "resources/spritedef.h" - #include <list> #include <map> diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp index a8e8b434f..4f3da8fa9 100644 --- a/src/resources/emotedb.cpp +++ b/src/resources/emotedb.cpp @@ -25,7 +25,6 @@ #include "client.h" #include "logger.h" -#include "utils/xml.h" #include "configuration.h" #include "debug.h" diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 7cfb11822..9c5909b8d 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -32,9 +32,6 @@ #include "client.h" #include "logger.h" -#include "main.h" - -#include "utils/stringutils.h" #include "resources/imagehelper.h" #include "resources/openglimagehelper.h" diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp index 4762d42e0..49442ec53 100644 --- a/src/resources/imagehelper.cpp +++ b/src/resources/imagehelper.cpp @@ -29,8 +29,6 @@ #include "logger.h" #include "main.h" -#include "utils/stringutils.h" - #include "resources/image.h" #include <SDL_image.h> diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 38aa6d958..1ae7c2c59 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -31,8 +31,6 @@ #include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" -#include "utils/xml.h" #include "debug.h" diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 1816b3bf5..f1d44f24d 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -26,7 +26,6 @@ #include "being.h" #include "resources/colordb.h" -#include "resources/spritedef.h" #include <map> #include <set> diff --git a/src/resources/mapdb.cpp b/src/resources/mapdb.cpp index b186ad658..465faeba3 100644 --- a/src/resources/mapdb.cpp +++ b/src/resources/mapdb.cpp @@ -25,8 +25,6 @@ #include "client.h" #include "logger.h" -#include "utils/xml.h" - #include "debug.h" namespace diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 8f38b0dab..7e9fdd753 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -36,7 +36,6 @@ #include "utils/base64.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <iostream> #include <zlib.h> diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index 427db8f19..b82007ccf 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -30,7 +30,6 @@ #include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/xml.h" #include "configuration.h" diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp index 26f5e53cb..40c7182f6 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/npcdb.cpp @@ -27,7 +27,6 @@ #include "resources/beinginfo.h" #include "utils/dtor.h" -#include "utils/xml.h" #include "configuration.h" #include "debug.h" diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index f06a7986d..aa377f4b9 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -26,7 +26,6 @@ #include "client.h" #include "configuration.h" #include "logger.h" -#include "main.h" #include "resources/dye.h" #include "resources/image.h" diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp index 5463abfeb..b8fcc795e 100644 --- a/src/resources/sdlimagehelper.cpp +++ b/src/resources/sdlimagehelper.cpp @@ -29,8 +29,6 @@ #include "logger.h" #include "main.h" -#include "utils/stringutils.h" - #include "resources/image.h" #include <SDL_image.h> diff --git a/src/resources/subimage.cpp b/src/resources/subimage.cpp index 2f4104580..2dc7d4a7a 100644 --- a/src/resources/subimage.cpp +++ b/src/resources/subimage.cpp @@ -28,9 +28,6 @@ #endif #include "client.h" -#include "main.h" - -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/shopitem.cpp b/src/shopitem.cpp index 083c2836f..a9068bacb 100644 --- a/src/shopitem.cpp +++ b/src/shopitem.cpp @@ -25,8 +25,6 @@ #include "client.h" #include "units.h" -#include "utils/stringutils.h" - #include "resources/iteminfo.h" #include "debug.h" diff --git a/src/sound.cpp b/src/sound.cpp index 133494ec3..7869d3108 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -24,7 +24,6 @@ #include "configuration.h" #include "localplayer.h" -#include "logger.h" #include "resources/music.h" #include "resources/resourcemanager.h" diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp index 548fc94c1..ca84f28f7 100644 --- a/src/spellmanager.cpp +++ b/src/spellmanager.cpp @@ -22,9 +22,7 @@ #include "spellmanager.h" -#include "being.h" #include "configuration.h" -#include "logger.h" #include "localplayer.h" #include "playerinfo.h" @@ -34,7 +32,6 @@ #include "net/playerhandler.h" #include "utils/dtor.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/spellshortcut.cpp b/src/spellshortcut.cpp index 025723062..7d488299b 100644 --- a/src/spellshortcut.cpp +++ b/src/spellshortcut.cpp @@ -32,8 +32,6 @@ #include "net/inventoryhandler.h" #include "net/net.h" -#include "utils/stringutils.h" - #include "debug.h" SpellShortcut *spellShortcut; diff --git a/src/spellshortcut.h b/src/spellshortcut.h index f3e5611e4..7e17c9f57 100644 --- a/src/spellshortcut.h +++ b/src/spellshortcut.h @@ -24,8 +24,6 @@ #define SPELLSHORTCUT_H #include "spellmanager.h" -#include "logger.h" -#include "utils/stringutils.h" class TextCommand; diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp index e24e873f1..810c65aca 100644 --- a/src/statuseffect.cpp +++ b/src/statuseffect.cpp @@ -27,8 +27,6 @@ #include "gui/widgets/chattab.h" -#include "utils/xml.h" - #include "configuration.h" #include <map> diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index e988bd011..8538c3e65 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -24,15 +24,12 @@ #include "configuration.h" #include "graphics.h" #include "graphicsmanager.h" -#include "localconsts.h" -#include "logger.h" #include "sound.h" #include "gui/theme.h" #include "utils/gettext.h" #include "utils/mkdir.h" -#include "utils/stringutils.h" #include "resources/image.h" #include "resources/wallpaper.h" diff --git a/src/test/testlauncher.h b/src/test/testlauncher.h index 5ca42eae7..f42e22644 100644 --- a/src/test/testlauncher.h +++ b/src/test/testlauncher.h @@ -21,8 +21,7 @@ #ifndef TEST_TESTLAUNCHER_H #define TEST_TESTLAUNCHER_H -#include "logger.h" - +#include <fstream> #include <string> #include <sys/time.h> diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp index 07e7a8f01..e5fac5100 100644 --- a/src/test/testmain.cpp +++ b/src/test/testmain.cpp @@ -23,11 +23,8 @@ #include "utils/gettext.h" #include "client.h" -#include "localconsts.h" -#include "utils/gettext.h" #include "utils/mkdir.h" -#include "utils/stringutils.h" #include "utils/paths.h" #include "utils/process.h" diff --git a/src/text.cpp b/src/text.cpp index 96d493cc5..7af59f47e 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -28,9 +28,7 @@ #include "textrenderer.h" #include "gui/gui.h" -#include "gui/palette.h" #include "gui/sdlfont.h" -#include "gui/theme.h" #include "resources/resourcemanager.h" #include "resources/image.h" diff --git a/src/textcommand.cpp b/src/textcommand.cpp index 2ca1e3996..75dcab044 100644 --- a/src/textcommand.cpp +++ b/src/textcommand.cpp @@ -27,6 +27,7 @@ #include "gui/theme.h" #include "resources/image.h" +#include "resources/itemdb.h" #include "resources/iteminfo.h" #include "resources/resourcemanager.h" diff --git a/src/textcommand.h b/src/textcommand.h index 3d95b06bd..959320b48 100644 --- a/src/textcommand.h +++ b/src/textcommand.h @@ -23,7 +23,7 @@ #ifndef TEXTCOMMAND_H #define TEXTCOMMAND_H -#include "resources/itemdb.h" +#include <string> #define MAGIC_START_ID 340 diff --git a/src/textrenderer.h b/src/textrenderer.h index 9309c5415..5dd831ddd 100644 --- a/src/textrenderer.h +++ b/src/textrenderer.h @@ -23,8 +23,6 @@ #ifndef TEXT_RENDERER_H #define TEXT_RENDERER_H -#include "graphics.h" - #include "gui/theme.h" /** |