summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/actions/chat.cpp7
-rw-r--r--src/client.cpp7
-rw-r--r--src/game.cpp7
-rw-r--r--src/gui/popups/popupmenu.cpp7
-rw-r--r--src/gui/widgets/tabs/chat/emulateguildtab.cpp3
-rw-r--r--src/gui/windows/socialwindow.cpp8
-rw-r--r--src/net/tmwa/beinghandler.cpp2
-rw-r--r--src/net/tmwa/chathandler.cpp2
-rw-r--r--src/net/tmwa/guildmanager.cpp (renamed from src/guildmanager.cpp)2
-rw-r--r--src/net/tmwa/guildmanager.h (renamed from src/guildmanager.h)0
-rw-r--r--src/notifymanager.cpp7
-rw-r--r--src/utils/chatutils.cpp7
14 files changed, 37 insertions, 30 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 993fade24..a91fe48cb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1317,8 +1317,6 @@ SET(SRCS_EVOL
)
SET(SRCS_TMWA
- guildmanager.cpp
- guildmanager.h
gui/widgets/tabs/chat/emulateguildtab.cpp
gui/widgets/tabs/chat/emulateguildtab.h
gui/windows/shopselldialog.cpp
@@ -1339,6 +1337,8 @@ SET(SRCS_TMWA
net/tmwa/generalhandler.h
net/tmwa/guildhandler.cpp
net/tmwa/guildhandler.h
+ net/tmwa/guildmanager.cpp
+ net/tmwa/guildmanager.h
net/tmwa/inventoryhandler.cpp
net/tmwa/inventoryhandler.h
net/tmwa/itemhandler.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 28e070e59..6f2729a3e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1255,8 +1255,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
if ENABLE_TMWA
manaplus_CXXFLAGS += -DTMWA_SUPPORT
manaplus_SOURCES += \
- guildmanager.cpp \
- guildmanager.h \
gui/widgets/tabs/chat/emulateguildtab.cpp \
gui/widgets/tabs/chat/emulateguildtab.h \
gui/windows/shopselldialog.cpp \
@@ -1277,6 +1275,8 @@ manaplus_SOURCES += \
net/tmwa/generalhandler.h \
net/tmwa/guildhandler.cpp \
net/tmwa/guildhandler.h \
+ net/tmwa/guildmanager.cpp \
+ net/tmwa/guildmanager.h \
net/tmwa/inventoryhandler.cpp \
net/tmwa/inventoryhandler.h \
net/tmwa/itemhandler.cpp \
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 140ef330e..cf85ad60c 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -21,9 +21,6 @@
#include "actions/chat.h"
#include "configuration.h"
-#ifdef TMWA_SUPPORT
-#include "guildmanager.h"
-#endif
#include "actions/actiondef.h"
@@ -39,6 +36,10 @@
#include "net/partyhandler.h"
#include "net/serverfeatures.h"
+#ifdef TMWA_SUPPORT
+#include "net/tmwa/guildmanager.h"
+#endif
+
#include "resources/iteminfo.h"
#include "resources/db/itemdb.h"
diff --git a/src/client.cpp b/src/client.cpp
index 98fa33e18..615fcd169 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -31,9 +31,6 @@
#include "emoteshortcut.h"
#include "eventsmanager.h"
#include "game.h"
-#ifdef TMWA_SUPPORT
-#include "guildmanager.h"
-#endif
#include "graphicsmanager.h"
#include "itemshortcut.h"
#include "party.h"
@@ -92,6 +89,10 @@
#include "net/packetlimiter.h"
#include "net/partyhandler.h"
+#ifdef TMWA_SUPPORT
+#include "net/tmwa/guildmanager.h"
+#endif
+
#include "particle/particle.h"
#include "resources/imagehelper.h"
diff --git a/src/game.cpp b/src/game.cpp
index e3a7932ad..eb65b352f 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -31,9 +31,6 @@
#include "emoteshortcut.h"
#include "eventsmanager.h"
#include "gamemodifiers.h"
-#ifdef TMWA_SUPPORT
-#include "guildmanager.h"
-#endif
#include "itemshortcut.h"
#include "soundmanager.h"
#include "settings.h"
@@ -122,6 +119,10 @@
#include "listeners/errorlistener.h"
+#ifdef TMWA_SUPPORT
+#include "net/tmwa/guildmanager.h"
+#endif
+
#ifdef USE_MUMBLE
#include "mumblemanager.h"
#endif
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 5470d7b2e..78f4fd475 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -25,9 +25,6 @@
#include "actormanager.h"
#include "configuration.h"
#include "gamemodifiers.h"
-#ifdef TMWA_SUPPORT
-#include "guildmanager.h"
-#endif
#include "item.h"
#include "party.h"
#include "spellmanager.h"
@@ -72,6 +69,10 @@
#include "net/pethandler.h"
#include "net/serverfeatures.h"
+#ifdef TMWA_SUPPORT
+#include "net/tmwa/guildmanager.h"
+#endif
+
#include "resources/chatobject.h"
#include "resources/iteminfo.h"
#include "resources/mapitemtype.h"
diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.cpp b/src/gui/widgets/tabs/chat/emulateguildtab.cpp
index 07cb13d32..ccdf1bd43 100644
--- a/src/gui/widgets/tabs/chat/emulateguildtab.cpp
+++ b/src/gui/widgets/tabs/chat/emulateguildtab.cpp
@@ -23,7 +23,6 @@
#include "gui/widgets/tabs/chat/emulateguildtab.h"
#include "configuration.h"
-#include "guildmanager.h"
#include "soundconsts.h"
#include "soundmanager.h"
@@ -31,6 +30,8 @@
#include "utils/gettext.h"
+#include "net/tmwa/guildmanager.h"
+
#include "debug.h"
EmulateGuildTab::EmulateGuildTab(const Widget2 *const widget) :
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index ffe9688c6..f8197466b 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -21,10 +21,6 @@
#include "gui/windows/socialwindow.h"
-#ifdef TMWA_SUPPORT
-#include "guildmanager.h"
-#endif
-
#include "enums/gui/dialogtype.h"
#include "gui/windows/okdialog.h"
@@ -47,6 +43,10 @@
#include "net/serverfeatures.h"
+#ifdef TMWA_SUPPORT
+#include "net/tmwa/guildmanager.h"
+#endif
+
#include "debug.h"
SocialWindow *socialWindow = nullptr;
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 8277e4805..20ab2cffa 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -25,7 +25,6 @@
#include "actormanager.h"
#include "effectmanager.h"
#include "guild.h"
-#include "guildmanager.h"
#include "party.h"
#include "being/localplayer.h"
@@ -39,6 +38,7 @@
#include "net/serverfeatures.h"
+#include "net/tmwa/guildmanager.h"
#include "net/tmwa/messageout.h"
#include "net/tmwa/protocol.h"
#include "net/tmwa/sprite.h"
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 4a4810c58..e870ba563 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -24,7 +24,6 @@
#include "actormanager.h"
#include "configuration.h"
-#include "guildmanager.h"
#include "being/localplayer.h"
#include "being/playerrelations.h"
@@ -38,6 +37,7 @@
#include "net/serverfeatures.h"
+#include "net/tmwa/guildmanager.h"
#include "net/tmwa/messageout.h"
#include "net/tmwa/protocol.h"
diff --git a/src/guildmanager.cpp b/src/net/tmwa/guildmanager.cpp
index f3fee9f44..0e7b7a43a 100644
--- a/src/guildmanager.cpp
+++ b/src/net/tmwa/guildmanager.cpp
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "guildmanager.h"
+#include "net/tmwa/guildmanager.h"
#include "actormanager.h"
#include "client.h"
diff --git a/src/guildmanager.h b/src/net/tmwa/guildmanager.h
index 2fa6b2df8..2fa6b2df8 100644
--- a/src/guildmanager.h
+++ b/src/net/tmwa/guildmanager.h
diff --git a/src/notifymanager.cpp b/src/notifymanager.cpp
index 7ea4259e9..97f9ea18a 100644
--- a/src/notifymanager.cpp
+++ b/src/notifymanager.cpp
@@ -20,9 +20,6 @@
#include "notifymanager.h"
-#ifdef TMWA_SUPPORT
-#include "guildmanager.h"
-#endif
#include "soundmanager.h"
#include "being/localplayer.h"
@@ -30,6 +27,10 @@
#include "net/guildhandler.h"
#include "net/partyhandler.h"
+#ifdef TMWA_SUPPORT
+#include "net/tmwa/guildmanager.h"
+#endif
+
#include "resources/notifications.h"
#include "resources/notifytypes.h"
diff --git a/src/utils/chatutils.cpp b/src/utils/chatutils.cpp
index 248856569..c5b7e25ad 100644
--- a/src/utils/chatutils.cpp
+++ b/src/utils/chatutils.cpp
@@ -21,9 +21,6 @@
#include "utils/chatutils.h"
#include "actormanager.h"
-#ifdef TMWA_SUPPORT
-#include "guildmanager.h"
-#endif
#include "party.h"
#include "being/localplayer.h"
@@ -37,6 +34,10 @@
#include "net/partyhandler.h"
#include "net/serverfeatures.h"
+#ifdef TMWA_SUPPORT
+#include "net/tmwa/guildmanager.h"
+#endif
+
#include "utils/stringutils.h"
#include "debug.h"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 06:57:42 +0000