diff options
| -rw-r--r-- | src/actormanager.cpp | 11 | ||||
| -rw-r--r-- | src/being/flooritem.cpp | 2 | ||||
| -rw-r--r-- | src/gui/popups/itempopup.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/buydialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/charselectdialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/textcommandeditor.cpp | 6 | ||||
| -rw-r--r-- | src/gui/windows/whoisonline.cpp | 4 | ||||
| -rw-r--r-- | src/progs/manaplus/actions/actions.cpp | 8 | ||||
| -rw-r--r-- | src/resources/db/itemdb.cpp | 2 | ||||
| -rw-r--r-- | src/resources/item/shopitem.cpp | 2 | ||||
| -rw-r--r-- | src/soundmanager.cpp | 7 | ||||
| -rw-r--r-- | src/spellmanager.cpp | 2 | ||||
| -rw-r--r-- | src/textcommand.h | 2 | ||||
| -rw-r--r-- | src/utils/chatutils.cpp | 3 |
14 files changed, 42 insertions, 13 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp index fd24147e9..c4079f776 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -27,7 +27,6 @@ #include "settings.h" #include "being/localplayer.h" -#include "being/playerinfo.h" #include "being/playerrelations.h" #include "gui/sdlinput.h" @@ -35,7 +34,6 @@ #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/windows/chatwindow.h" #include "gui/windows/equipmentwindow.h" #include "gui/windows/socialwindow.h" #include "gui/windows/questswindow.h" @@ -51,7 +49,6 @@ #include "net/beinghandler.h" #include "net/charserverhandler.h" -#include "net/net.h" #include "net/packetlimiter.h" #include "net/playerhandler.h" #include "net/serverfeatures.h" @@ -63,6 +60,14 @@ #include "resources/db/itemdb.h" +#ifdef TMWA_SUPPORT +#include "being/playerinfo.h" + +#include "gui/windows/chatwindow.h" + +#include "net/net.h" +#endif // TMWA_SUPPORT + #include <algorithm> #include "debug.h" diff --git a/src/being/flooritem.cpp b/src/being/flooritem.cpp index a69b8af0e..041531e86 100644 --- a/src/being/flooritem.cpp +++ b/src/being/flooritem.cpp @@ -37,7 +37,9 @@ #include "resources/map/map.h" +#ifdef TMWA_SUPPORT #include "net/net.h" +#endif // TMWA_SUPPORT #include "net/serverfeatures.h" #include "debug.h" diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index eedead83d..28de3b641 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -35,7 +35,9 @@ #include "gui/widgets/textbox.h" #include "net/beinghandler.h" +#ifdef TMWA_SUPPORT #include "net/net.h" +#endif // TMWA_SUPPORT #include "utils/foreach.h" #include "utils/gettext.h" diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index fe980dd33..db1dc6e50 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -30,7 +30,9 @@ #include "enums/gui/layouttype.h" #include "gui/windows/setupwindow.h" +#ifdef TMWA_SUPPORT #include "gui/windows/tradewindow.h" +#endif // TMWA_SUPPORT #include "gui/models/shopitems.h" #include "gui/models/sortlistmodelbuy.h" diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 39ceaef64..5a0a02acb 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -45,7 +45,9 @@ #include "net/character.h" #include "net/charserverhandler.h" #include "net/logindata.h" +#ifdef TMWA_SUPPORT #include "net/net.h" +#endif // TMWA_SUPPORT #include "net/serverfeatures.h" #include "utils/foreach.h" diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index 5c8ee1357..88d88af8a 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -28,7 +28,6 @@ #include "input/keyboardconfig.h" #include "gui/models/iconsmodel.h" -#include "gui/models/magicschoolmodel.h" #include "gui/models/targettypemodel.h" #include "gui/widgets/button.h" @@ -37,7 +36,12 @@ #include "gui/widgets/inttextfield.h" #include "gui/widgets/label.h" #include "gui/widgets/layoutcell.h" + +#ifdef TMWA_SUPPORT +#include "gui/models/magicschoolmodel.h" + #include "gui/widgets/radiobutton.h" +#endif // TMWA_SUPPORT #include "utils/delete2.h" diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index 35d930c4c..e123d3941 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -59,9 +59,9 @@ #include "utils/gettext.h" #include "utils/sdlhelper.h" +#ifdef TMWA_SUPPORT #include "net/net.h" - -#ifndef TMWA_SUPPORT +#else // TMWA_SUPPORT #include <curl/curl.h> #endif // TMWA_SUPPORT diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp index 0827418c7..aa30257b7 100644 --- a/src/progs/manaplus/actions/actions.cpp +++ b/src/progs/manaplus/actions/actions.cpp @@ -91,7 +91,6 @@ #include "net/mercenaryhandler.h" #include "net/net.h" #include "net/npchandler.h" -#include "net/playerhandler.h" #include "net/serverfeatures.h" #include "net/uploadcharinfo.h" #include "net/tradehandler.h" @@ -106,10 +105,15 @@ #include "utils/delete2.h" #include "utils/foreach.h" #include "utils/gettext.h" -#include "utils/mathutils.h" #include "utils/parameters.h" #include "utils/timer.h" +#ifdef TMWA_SUPPORT +#include "net/playerhandler.h" + +#include "utils/mathutils.h" +#endif // TMWA_SUPPORT + PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifdef ANDROID diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index 08055e404..a98f0dad4 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -40,7 +40,9 @@ #include "resources/sprite/spritereference.h" +#ifdef TMWA_SUPPORT #include "net/net.h" +#endif // TMWA_SUPPORT #include "utils/checkutils.h" #include "utils/delete2.h" diff --git a/src/resources/item/shopitem.cpp b/src/resources/item/shopitem.cpp index 99e0c43dd..76b269cca 100644 --- a/src/resources/item/shopitem.cpp +++ b/src/resources/item/shopitem.cpp @@ -26,7 +26,9 @@ #include "utils/stringutils.h" +#ifdef TMWA_SUPPORT #include "net/net.h" +#endif // TMWA_SUPPORT #include "resources/db/unitsdb.h" diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp index a3b5149e0..d08b58c1f 100644 --- a/src/soundmanager.cpp +++ b/src/soundmanager.cpp @@ -30,10 +30,6 @@ #include "fs/virtfs/fs.h" -#ifndef TMWA_SUPPORT -#include "utils/cast.h" -#endif // TMWA_SUPPORT - #include "resources/sdlmusic.h" #include "resources/soundeffect.h" @@ -42,6 +38,9 @@ #include "resources/resourcemanager/resourcemanager.h" +#ifdef DYECMD +#include "utils/cast.h" +#endif #include "utils/checkutils.h" PRAGMA48(GCC diagnostic push) diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp index 257ae3e35..f24adb777 100644 --- a/src/spellmanager.cpp +++ b/src/spellmanager.cpp @@ -26,7 +26,9 @@ #include "textcommand.h" #include "being/localplayer.h" +#ifdef TMWA_SUPPORT #include "being/playerinfo.h" +#endif // TMWA_SUPPORT #include "const/spells.h" diff --git a/src/textcommand.h b/src/textcommand.h index 84a81bafd..91c0f9ba5 100644 --- a/src/textcommand.h +++ b/src/textcommand.h @@ -24,8 +24,10 @@ #define TEXTCOMMAND_H #include "enums/commandtarget.h" +#ifdef TMWA_SUPPORT #include "enums/magicschool.h" #include "enums/textcommandtype.h" +#endif #include <string> diff --git a/src/utils/chatutils.cpp b/src/utils/chatutils.cpp index 966e383bd..cb264dff1 100644 --- a/src/utils/chatutils.cpp +++ b/src/utils/chatutils.cpp @@ -31,10 +31,11 @@ #include "net/chathandler.h" #include "net/guildhandler.h" -#include "net/net.h" #include "net/partyhandler.h" #ifdef TMWA_SUPPORT +#include "net/net.h" + #include "net/tmwa/guildmanager.h" #endif // TMWA_SUPPORT |