From eee4c9a1e2a9fc58ccb8ad05acfe0b0e41ec3fab Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 23 Mar 2009 11:14:00 -0600 Subject: Move all TMWServ-specific code to net/tmwserv Also fix several instances where the same net handler was being used for both servers, and a few other related oddities. --- src/Makefile.am | 116 ++++---- src/beingmanager.cpp | 2 +- src/commandhandler.cpp | 4 +- src/game.cpp | 29 +- src/gui/buy.cpp | 2 +- src/gui/char_select.cpp | 6 +- src/gui/chat.cpp | 4 +- src/gui/guildwindow.cpp | 2 +- src/gui/npcpostdialog.cpp | 2 +- src/gui/partywindow.cpp | 2 +- src/gui/sell.cpp | 2 +- src/gui/serverdialog.h | 2 +- src/gui/trade.cpp | 2 +- src/localplayer.cpp | 6 +- src/main.cpp | 18 +- src/net/accountserver/account.cpp | 107 ------- src/net/accountserver/account.h | 54 ---- src/net/accountserver/accountserver.cpp | 81 ------ src/net/accountserver/accountserver.h | 47 ---- src/net/accountserver/internal.cpp | 32 --- src/net/accountserver/internal.h | 35 --- src/net/beinghandler.cpp | 359 ------------------------ src/net/beinghandler.h | 45 --- src/net/buysellhandler.cpp | 92 ------ src/net/buysellhandler.h | 35 --- src/net/charserverhandler.cpp | 227 --------------- src/net/charserverhandler.h | 72 ----- src/net/chathandler.cpp | 285 ------------------- src/net/chathandler.h | 84 ------ src/net/chatserver/chatserver.cpp | 146 ---------- src/net/chatserver/chatserver.h | 60 ---- src/net/chatserver/guild.cpp | 95 ------- src/net/chatserver/guild.h | 69 ----- src/net/chatserver/internal.cpp | 32 --- src/net/chatserver/internal.h | 35 --- src/net/chatserver/party.cpp | 70 ----- src/net/chatserver/party.h | 57 ---- src/net/connection.cpp | 103 ------- src/net/connection.h | 80 ------ src/net/effecthandler.cpp | 58 ---- src/net/effecthandler.h | 38 --- src/net/gameserver/gameserver.cpp | 49 ---- src/net/gameserver/gameserver.h | 39 --- src/net/gameserver/internal.cpp | 32 --- src/net/gameserver/internal.h | 35 --- src/net/gameserver/player.cpp | 202 ------------- src/net/gameserver/player.h | 71 ----- src/net/guildhandler.cpp | 240 ---------------- src/net/guildhandler.h | 40 --- src/net/internal.cpp | 27 -- src/net/internal.h | 30 -- src/net/inventoryhandler.cpp | 79 ------ src/net/inventoryhandler.h | 35 --- src/net/itemhandler.cpp | 64 ----- src/net/itemhandler.h | 35 --- src/net/loginhandler.cpp | 225 --------------- src/net/loginhandler.h | 47 ---- src/net/logouthandler.cpp | 215 -------------- src/net/logouthandler.h | 62 ---- src/net/messagehandler.cpp | 2 +- src/net/network.cpp | 169 ----------- src/net/network.h | 79 ------ src/net/npchandler.cpp | 86 ------ src/net/npchandler.h | 35 --- src/net/partyhandler.cpp | 103 ------- src/net/partyhandler.h | 41 --- src/net/playerhandler.cpp | 327 --------------------- src/net/playerhandler.h | 38 --- src/net/protocol.h | 295 ------------------- src/net/tmwserv/accountserver/account.cpp | 107 +++++++ src/net/tmwserv/accountserver/account.h | 54 ++++ src/net/tmwserv/accountserver/accountserver.cpp | 81 ++++++ src/net/tmwserv/accountserver/accountserver.h | 47 ++++ src/net/tmwserv/accountserver/internal.cpp | 32 +++ src/net/tmwserv/accountserver/internal.h | 35 +++ src/net/tmwserv/beinghandler.cpp | 359 ++++++++++++++++++++++++ src/net/tmwserv/beinghandler.h | 45 +++ src/net/tmwserv/buysellhandler.cpp | 92 ++++++ src/net/tmwserv/buysellhandler.h | 35 +++ src/net/tmwserv/charserverhandler.cpp | 227 +++++++++++++++ src/net/tmwserv/charserverhandler.h | 72 +++++ src/net/tmwserv/chathandler.cpp | 285 +++++++++++++++++++ src/net/tmwserv/chathandler.h | 84 ++++++ src/net/tmwserv/chatserver/chatserver.cpp | 146 ++++++++++ src/net/tmwserv/chatserver/chatserver.h | 60 ++++ src/net/tmwserv/chatserver/guild.cpp | 95 +++++++ src/net/tmwserv/chatserver/guild.h | 69 +++++ src/net/tmwserv/chatserver/internal.cpp | 32 +++ src/net/tmwserv/chatserver/internal.h | 35 +++ src/net/tmwserv/chatserver/party.cpp | 70 +++++ src/net/tmwserv/chatserver/party.h | 57 ++++ src/net/tmwserv/connection.cpp | 103 +++++++ src/net/tmwserv/connection.h | 80 ++++++ src/net/tmwserv/effecthandler.cpp | 58 ++++ src/net/tmwserv/effecthandler.h | 38 +++ src/net/tmwserv/gameserver/gameserver.cpp | 49 ++++ src/net/tmwserv/gameserver/gameserver.h | 39 +++ src/net/tmwserv/gameserver/internal.cpp | 32 +++ src/net/tmwserv/gameserver/internal.h | 35 +++ src/net/tmwserv/gameserver/player.cpp | 202 +++++++++++++ src/net/tmwserv/gameserver/player.h | 71 +++++ src/net/tmwserv/guildhandler.cpp | 240 ++++++++++++++++ src/net/tmwserv/guildhandler.h | 40 +++ src/net/tmwserv/internal.cpp | 27 ++ src/net/tmwserv/internal.h | 30 ++ src/net/tmwserv/inventoryhandler.cpp | 79 ++++++ src/net/tmwserv/inventoryhandler.h | 35 +++ src/net/tmwserv/itemhandler.cpp | 64 +++++ src/net/tmwserv/itemhandler.h | 35 +++ src/net/tmwserv/loginhandler.cpp | 225 +++++++++++++++ src/net/tmwserv/loginhandler.h | 47 ++++ src/net/tmwserv/logouthandler.cpp | 215 ++++++++++++++ src/net/tmwserv/logouthandler.h | 62 ++++ src/net/tmwserv/network.cpp | 169 +++++++++++ src/net/tmwserv/network.h | 79 ++++++ src/net/tmwserv/npchandler.cpp | 86 ++++++ src/net/tmwserv/npchandler.h | 35 +++ src/net/tmwserv/partyhandler.cpp | 103 +++++++ src/net/tmwserv/partyhandler.h | 41 +++ src/net/tmwserv/playerhandler.cpp | 327 +++++++++++++++++++++ src/net/tmwserv/playerhandler.h | 38 +++ src/net/tmwserv/protocol.h | 295 +++++++++++++++++++ src/net/tmwserv/tradehandler.cpp | 137 +++++++++ src/net/tmwserv/tradehandler.h | 53 ++++ src/net/tradehandler.cpp | 137 --------- src/net/tradehandler.h | 53 ---- src/npc.cpp | 2 +- 127 files changed, 5394 insertions(+), 5385 deletions(-) delete mode 100644 src/net/accountserver/account.cpp delete mode 100644 src/net/accountserver/account.h delete mode 100644 src/net/accountserver/accountserver.cpp delete mode 100644 src/net/accountserver/accountserver.h delete mode 100644 src/net/accountserver/internal.cpp delete mode 100644 src/net/accountserver/internal.h delete mode 100644 src/net/beinghandler.cpp delete mode 100644 src/net/beinghandler.h delete mode 100644 src/net/buysellhandler.cpp delete mode 100644 src/net/buysellhandler.h delete mode 100644 src/net/charserverhandler.cpp delete mode 100644 src/net/charserverhandler.h delete mode 100644 src/net/chathandler.cpp delete mode 100644 src/net/chathandler.h delete mode 100644 src/net/chatserver/chatserver.cpp delete mode 100644 src/net/chatserver/chatserver.h delete mode 100644 src/net/chatserver/guild.cpp delete mode 100644 src/net/chatserver/guild.h delete mode 100644 src/net/chatserver/internal.cpp delete mode 100644 src/net/chatserver/internal.h delete mode 100644 src/net/chatserver/party.cpp delete mode 100644 src/net/chatserver/party.h delete mode 100644 src/net/connection.cpp delete mode 100644 src/net/connection.h delete mode 100644 src/net/effecthandler.cpp delete mode 100644 src/net/effecthandler.h delete mode 100644 src/net/gameserver/gameserver.cpp delete mode 100644 src/net/gameserver/gameserver.h delete mode 100644 src/net/gameserver/internal.cpp delete mode 100644 src/net/gameserver/internal.h delete mode 100644 src/net/gameserver/player.cpp delete mode 100644 src/net/gameserver/player.h delete mode 100644 src/net/guildhandler.cpp delete mode 100644 src/net/guildhandler.h delete mode 100644 src/net/internal.cpp delete mode 100644 src/net/internal.h delete mode 100644 src/net/inventoryhandler.cpp delete mode 100644 src/net/inventoryhandler.h delete mode 100644 src/net/itemhandler.cpp delete mode 100644 src/net/itemhandler.h delete mode 100644 src/net/loginhandler.cpp delete mode 100644 src/net/loginhandler.h delete mode 100644 src/net/logouthandler.cpp delete mode 100644 src/net/logouthandler.h delete mode 100644 src/net/network.cpp delete mode 100644 src/net/network.h delete mode 100644 src/net/npchandler.cpp delete mode 100644 src/net/npchandler.h delete mode 100644 src/net/partyhandler.cpp delete mode 100644 src/net/partyhandler.h delete mode 100644 src/net/playerhandler.cpp delete mode 100644 src/net/playerhandler.h delete mode 100644 src/net/protocol.h create mode 100644 src/net/tmwserv/accountserver/account.cpp create mode 100644 src/net/tmwserv/accountserver/account.h create mode 100644 src/net/tmwserv/accountserver/accountserver.cpp create mode 100644 src/net/tmwserv/accountserver/accountserver.h create mode 100644 src/net/tmwserv/accountserver/internal.cpp create mode 100644 src/net/tmwserv/accountserver/internal.h create mode 100644 src/net/tmwserv/beinghandler.cpp create mode 100644 src/net/tmwserv/beinghandler.h create mode 100644 src/net/tmwserv/buysellhandler.cpp create mode 100644 src/net/tmwserv/buysellhandler.h create mode 100644 src/net/tmwserv/charserverhandler.cpp create mode 100644 src/net/tmwserv/charserverhandler.h create mode 100644 src/net/tmwserv/chathandler.cpp create mode 100644 src/net/tmwserv/chathandler.h create mode 100644 src/net/tmwserv/chatserver/chatserver.cpp create mode 100644 src/net/tmwserv/chatserver/chatserver.h create mode 100644 src/net/tmwserv/chatserver/guild.cpp create mode 100644 src/net/tmwserv/chatserver/guild.h create mode 100644 src/net/tmwserv/chatserver/internal.cpp create mode 100644 src/net/tmwserv/chatserver/internal.h create mode 100644 src/net/tmwserv/chatserver/party.cpp create mode 100644 src/net/tmwserv/chatserver/party.h create mode 100644 src/net/tmwserv/connection.cpp create mode 100644 src/net/tmwserv/connection.h create mode 100644 src/net/tmwserv/effecthandler.cpp create mode 100644 src/net/tmwserv/effecthandler.h create mode 100644 src/net/tmwserv/gameserver/gameserver.cpp create mode 100644 src/net/tmwserv/gameserver/gameserver.h create mode 100644 src/net/tmwserv/gameserver/internal.cpp create mode 100644 src/net/tmwserv/gameserver/internal.h create mode 100644 src/net/tmwserv/gameserver/player.cpp create mode 100644 src/net/tmwserv/gameserver/player.h create mode 100644 src/net/tmwserv/guildhandler.cpp create mode 100644 src/net/tmwserv/guildhandler.h create mode 100644 src/net/tmwserv/internal.cpp create mode 100644 src/net/tmwserv/internal.h create mode 100644 src/net/tmwserv/inventoryhandler.cpp create mode 100644 src/net/tmwserv/inventoryhandler.h create mode 100644 src/net/tmwserv/itemhandler.cpp create mode 100644 src/net/tmwserv/itemhandler.h create mode 100644 src/net/tmwserv/loginhandler.cpp create mode 100644 src/net/tmwserv/loginhandler.h create mode 100644 src/net/tmwserv/logouthandler.cpp create mode 100644 src/net/tmwserv/logouthandler.h create mode 100644 src/net/tmwserv/network.cpp create mode 100644 src/net/tmwserv/network.h create mode 100644 src/net/tmwserv/npchandler.cpp create mode 100644 src/net/tmwserv/npchandler.h create mode 100644 src/net/tmwserv/partyhandler.cpp create mode 100644 src/net/tmwserv/partyhandler.h create mode 100644 src/net/tmwserv/playerhandler.cpp create mode 100644 src/net/tmwserv/playerhandler.h create mode 100644 src/net/tmwserv/protocol.h create mode 100644 src/net/tmwserv/tradehandler.cpp create mode 100644 src/net/tmwserv/tradehandler.h delete mode 100644 src/net/tradehandler.cpp delete mode 100644 src/net/tradehandler.h (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 17059a72..dc03e66a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -163,8 +163,6 @@ tmw_SOURCES = gui/widgets/avatar.cpp \ gui/window.h \ gui/windowcontainer.cpp \ gui/windowcontainer.h \ - net/itemhandler.h \ - net/itemhandler.cpp \ net/messagehandler.cpp \ net/messagehandler.h \ net/messagein.cpp \ @@ -239,8 +237,8 @@ tmw_SOURCES = gui/widgets/avatar.cpp \ channel.h \ channelmanager.cpp \ channelmanager.h \ - commandhandler.cpp \ - commandhandler.h \ + commandhandler.cpp \ + commandhandler.h \ configlistener.h \ configuration.cpp \ configuration.h \ @@ -356,59 +354,61 @@ tmw_SOURCES += \ gui/statuswindow.h \ gui/unregisterdialog.cpp \ gui/unregisterdialog.h \ - net/accountserver/account.cpp \ - net/accountserver/account.h \ - net/accountserver/accountserver.cpp \ - net/accountserver/accountserver.h \ - net/accountserver/internal.cpp \ - net/accountserver/internal.h \ - net/chatserver/chatserver.cpp \ - net/chatserver/chatserver.h \ - net/chatserver/guild.cpp \ - net/chatserver/guild.h \ - net/chatserver/internal.cpp \ - net/chatserver/internal.h \ - net/chatserver/party.cpp \ - net/chatserver/party.h \ - net/gameserver/gameserver.cpp \ - net/gameserver/gameserver.h \ - net/gameserver/internal.cpp \ - net/gameserver/internal.h \ - net/gameserver/player.cpp \ - net/gameserver/player.h \ - net/beinghandler.cpp \ - net/beinghandler.h \ - net/buysellhandler.cpp \ - net/buysellhandler.h \ - net/charserverhandler.cpp \ - net/charserverhandler.h \ - net/chathandler.cpp \ - net/chathandler.h \ - net/connection.cpp \ - net/connection.h \ - net/effecthandler.cpp \ - net/effecthandler.h \ - net/guildhandler.cpp \ - net/guildhandler.h \ - net/internal.cpp \ - net/internal.h \ - net/inventoryhandler.cpp \ - net/inventoryhandler.h \ - net/loginhandler.cpp \ - net/loginhandler.h \ - net/logouthandler.cpp \ - net/logouthandler.h \ - net/network.cpp \ - net/network.h \ - net/npchandler.cpp \ - net/npchandler.h \ - net/partyhandler.cpp \ - net/partyhandler.h \ - net/playerhandler.cpp \ - net/playerhandler.h \ - net/protocol.h \ - net/tradehandler.cpp \ - net/tradehandler.h \ + net/tmwserv/accountserver/account.cpp \ + net/tmwserv/accountserver/account.h \ + net/tmwserv/accountserver/accountserver.cpp \ + net/tmwserv/accountserver/accountserver.h \ + net/tmwserv/accountserver/internal.cpp \ + net/tmwserv/accountserver/internal.h \ + net/tmwserv/chatserver/chatserver.cpp \ + net/tmwserv/chatserver/chatserver.h \ + net/tmwserv/chatserver/guild.cpp \ + net/tmwserv/chatserver/guild.h \ + net/tmwserv/chatserver/internal.cpp \ + net/tmwserv/chatserver/internal.h \ + net/tmwserv/chatserver/party.cpp \ + net/tmwserv/chatserver/party.h \ + net/tmwserv/gameserver/gameserver.cpp \ + net/tmwserv/gameserver/gameserver.h \ + net/tmwserv/gameserver/internal.cpp \ + net/tmwserv/gameserver/internal.h \ + net/tmwserv/gameserver/player.cpp \ + net/tmwserv/gameserver/player.h \ + net/tmwserv/beinghandler.cpp \ + net/tmwserv/beinghandler.h \ + net/tmwserv/buysellhandler.cpp \ + net/tmwserv/buysellhandler.h \ + net/tmwserv/charserverhandler.cpp \ + net/tmwserv/charserverhandler.h \ + net/tmwserv/chathandler.cpp \ + net/tmwserv/chathandler.h \ + net/tmwserv/connection.cpp \ + net/tmwserv/connection.h \ + net/tmwserv/effecthandler.cpp \ + net/tmwserv/effecthandler.h \ + net/tmwserv/guildhandler.cpp \ + net/tmwserv/guildhandler.h \ + net/tmwserv/internal.cpp \ + net/tmwserv/internal.h \ + net/tmwserv/inventoryhandler.cpp \ + net/tmwserv/inventoryhandler.h \ + net/tmwserv/itemhandler.h \ + net/tmwserv/itemhandler.cpp \ + net/tmwserv/loginhandler.cpp \ + net/tmwserv/loginhandler.h \ + net/tmwserv/logouthandler.cpp \ + net/tmwserv/logouthandler.h \ + net/tmwserv/network.cpp \ + net/tmwserv/network.h \ + net/tmwserv/npchandler.cpp \ + net/tmwserv/npchandler.h \ + net/tmwserv/partyhandler.cpp \ + net/tmwserv/partyhandler.h \ + net/tmwserv/playerhandler.cpp \ + net/tmwserv/playerhandler.h \ + net/tmwserv/protocol.h \ + net/tmwserv/tradehandler.cpp \ + net/tmwserv/tradehandler.h \ resources/buddylist.cpp \ resources/buddylist.h \ guild.cpp \ @@ -436,6 +436,8 @@ tmw_SOURCES += \ net/ea/equipmenthandler.h \ net/ea/inventoryhandler.cpp \ net/ea/inventoryhandler.h \ + net/ea/itemhandler.cpp \ + net/ea/itemhandler.h \ net/ea/loginhandler.cpp \ net/ea/loginhandler.h \ net/ea/maploginhandler.cpp \ diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp index e9d598c7..d2cac6ad 100644 --- a/src/beingmanager.cpp +++ b/src/beingmanager.cpp @@ -30,7 +30,7 @@ #include "net/messageout.h" #include "net/ea/protocol.h" #else -#include "net/protocol.h" +#include "net/tmwserv/protocol.h" #endif #include "utils/dtor.h" diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index ae544295..fa5fbb67 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -29,8 +29,8 @@ #include "gui/chat.h" #ifdef TMWSERV_SUPPORT -#include "net/chatserver/chatserver.h" -#include "net/gameserver/player.h" +#include "net/tmwserv/chatserver/chatserver.h" +#include "net/tmwserv/gameserver/player.h" #else #include "party.h" #include "net/messageout.h" diff --git a/src/game.cpp b/src/game.cpp index aefefd29..79eaf9c5 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -85,25 +85,30 @@ #include "gui/quitdialog.h" #endif -#include "net/chathandler.h" -#include "net/itemhandler.h" -#include "net/npchandler.h" -#include "net/playerhandler.h" -#include "net/tradehandler.h" #ifdef TMWSERV_SUPPORT -#include "net/network.h" -#include "net/beinghandler.h" -#include "net/buysellhandler.h" -#include "net/effecthandler.h" -#include "net/guildhandler.h" -#include "net/inventoryhandler.h" -#include "net/partyhandler.h" +#include "net/tmwserv/chathandler.h" +#include "net/tmwserv/itemhandler.h" +#include "net/tmwserv/npchandler.h" +#include "net/tmwserv/playerhandler.h" +#include "net/tmwserv/tradehandler.h" +#include "net/tmwserv/network.h" +#include "net/tmwserv/beinghandler.h" +#include "net/tmwserv/buysellhandler.h" +#include "net/tmwserv/effecthandler.h" +#include "net/tmwserv/guildhandler.h" +#include "net/tmwserv/inventoryhandler.h" +#include "net/tmwserv/partyhandler.h" #else #include "net/ea/network.h" +#include "net/ea/chathandler.h" #include "net/ea/beinghandler.h" #include "net/ea/buysellhandler.h" #include "net/ea/equipmenthandler.h" #include "net/ea/inventoryhandler.h" +#include "net/ea/itemhandler.h" +#include "net/ea/npchandler.h" +#include "net/ea/playerhandler.h" +#include "net/ea/tradehandler.h" #include "net/ea/protocol.h" #include "net/ea/skillhandler.h" #include "net/messageout.h" diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp index 15a558a3..53a586c3 100644 --- a/src/gui/buy.cpp +++ b/src/gui/buy.cpp @@ -34,7 +34,7 @@ #include "../units.h" #ifdef TMWSERV_SUPPORT -#include "../net/gameserver/player.h" +#include "../net/tmwserv/gameserver/player.h" #else #include "../net/messageout.h" #include "../net/ea/protocol.h" diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index 84270d10..e4f560ce 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -42,7 +42,10 @@ #include "../logindata.h" -#include "../net/accountserver/account.h" +#include "../net/tmwserv/accountserver/account.h" +#include "../net/tmwserv/charserverhandler.h" +#else +#include "../net/ea/charserverhandler.h" #endif #include "widgets/layout.h" @@ -52,7 +55,6 @@ #include "../main.h" #include "../units.h" -#include "../net/charserverhandler.h" #include "../net/messageout.h" #include "../resources/colordb.h" diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index f2651a02..a072704b 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -43,8 +43,8 @@ #include "../localplayer.h" #ifdef TMWSERV_SUPPORT -#include "../net/chatserver/chatserver.h" -#include "../net/gameserver/player.h" +#include "../net/tmwserv/chatserver/chatserver.h" +#include "../net/tmwserv/gameserver/player.h" #else #include "../party.h" #include "../net/messageout.h" diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp index 0596c75e..37d739e4 100644 --- a/src/gui/guildwindow.cpp +++ b/src/gui/guildwindow.cpp @@ -37,7 +37,7 @@ #include "../log.h" #include "../localplayer.h" -#include "../net/chatserver/guild.h" +#include "../net/tmwserv/chatserver/guild.h" #include "../utils/dtor.h" #include "../utils/gettext.h" diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp index 3a72b21b..f8c0f4b2 100644 --- a/src/gui/npcpostdialog.cpp +++ b/src/gui/npcpostdialog.cpp @@ -26,7 +26,7 @@ #include "scrollarea.h" #include "chat.h" -#include "../net/gameserver/player.h" +#include "../net/tmwserv/gameserver/player.h" #include "../utils/gettext.h" #include diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp index c4a1c780..d60974a8 100644 --- a/src/gui/partywindow.cpp +++ b/src/gui/partywindow.cpp @@ -25,7 +25,7 @@ #include "widgets/avatar.h" #include "../utils/gettext.h" -#include "../net/chatserver/party.h" +#include "../net/tmwserv/chatserver/party.h" PartyWindow::PartyWindow() : Window(_("Party")) { diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp index 957ff861..cab88560 100644 --- a/src/gui/sell.cpp +++ b/src/gui/sell.cpp @@ -35,7 +35,7 @@ #include "../net/messageout.h" #ifdef TMWSERV_SUPPORT -#include "../net/gameserver/player.h" +#include "../net/tmwserv/gameserver/player.h" #else #include "../net/ea/protocol.h" #endif diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h index 268b1baf..16965571 100644 --- a/src/gui/serverdialog.h +++ b/src/gui/serverdialog.h @@ -34,7 +34,7 @@ #include "../guichanfwd.h" -#include "../net/network.h" +#include "../net/tmwserv/network.h" class LoginData; diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp index 98214a79..9910f4ce 100644 --- a/src/gui/trade.cpp +++ b/src/gui/trade.cpp @@ -41,7 +41,7 @@ #include "../units.h" #ifdef TMWSERV_SUPPORT -#include "../net/gameserver/player.h" +#include "../net/tmwserv/gameserver/player.h" #else #include "../net/messageout.h" #include "../net/ea/protocol.h" diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 21ee3a22..c0da92ac 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -43,9 +43,9 @@ #include "effectmanager.h" #include "guild.h" -#include "net/gameserver/player.h" -#include "net/chatserver/guild.h" -#include "net/chatserver/party.h" +#include "net/tmwserv/gameserver/player.h" +#include "net/tmwserv/chatserver/guild.h" +#include "net/tmwserv/chatserver/party.h" #endif #ifdef EATHENA_SUPPORT diff --git a/src/main.cpp b/src/main.cpp index b9919a2c..f108b9cf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -73,10 +73,11 @@ #include "gui/updatewindow.h" #ifdef TMWSERV_SUPPORT -#include "net/charserverhandler.h" -#include "net/connection.h" -#include "net/loginhandler.h" -#include "net/network.h" +#include "net/tmwserv/charserverhandler.h" +#include "net/tmwserv/connection.h" +#include "net/tmwserv/loginhandler.h" +#include "net/tmwserv/logouthandler.h" +#include "net/tmwserv/network.h" #else #include "net/ea/charserverhandler.h" #include "net/ea/loginhandler.h" @@ -84,15 +85,14 @@ #include "net/ea/maploginhandler.h" #include "net/messageout.h" #endif -#include "net/logouthandler.h" #ifdef TMWSERV_SUPPORT -#include "net/accountserver/accountserver.h" -#include "net/accountserver/account.h" +#include "net/tmwserv/accountserver/accountserver.h" +#include "net/tmwserv/accountserver/account.h" -#include "net/chatserver/chatserver.h" +#include "net/tmwserv/chatserver/chatserver.h" -#include "net/gameserver/gameserver.h" +#include "net/tmwserv/gameserver/gameserver.h" #endif #include "resources/colordb.h" diff --git a/src/net/accountserver/account.cpp b/src/net/accountserver/account.cpp deleted file mode 100644 index f734c4eb..00000000 --- a/src/net/accountserver/account.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "account.h" - -#include - -#include "internal.h" - -#include "../connection.h" -#include "../messageout.h" -#include "../protocol.h" - -#include "../../utils/sha256.h" - -void Net::AccountServer::Account::createCharacter( - const std::string &name, char hairStyle, char hairColor, char gender, - short strength, short agility, short vitality, - short intelligence, short dexterity, short willpower) -{ - MessageOut msg(PAMSG_CHAR_CREATE); - - msg.writeString(name); - msg.writeInt8(hairStyle); - msg.writeInt8(hairColor); - msg.writeInt8(gender); - msg.writeInt16(strength); - msg.writeInt16(agility); - msg.writeInt16(vitality); - msg.writeInt16(intelligence); - msg.writeInt16(dexterity); - msg.writeInt16(willpower); - - Net::AccountServer::connection->send(msg); -} - -void Net::AccountServer::Account::deleteCharacter(char slot) -{ - MessageOut msg(PAMSG_CHAR_DELETE); - - msg.writeInt8(slot); - - Net::AccountServer::connection->send(msg); -} - -void Net::AccountServer::Account::selectCharacter(char slot) -{ - MessageOut msg(PAMSG_CHAR_SELECT); - - msg.writeInt8(slot); - - Net::AccountServer::connection->send(msg); -} - -void Net::AccountServer::Account::unregister(const std::string &username, - const std::string &password) -{ - MessageOut msg(PAMSG_UNREGISTER); - - msg.writeString(username); - msg.writeString(sha256(username + password)); - - Net::AccountServer::connection->send(msg); -} - -void Net::AccountServer::Account::changeEmail(const std::string &email) -{ - MessageOut msg(PAMSG_EMAIL_CHANGE); - - // Email is sent clearly so the server can validate the data. - // Encryption is assumed server-side. - msg.writeString(email); - - Net::AccountServer::connection->send(msg); -} - -void Net::AccountServer::Account::changePassword( - const std::string &username, - const std::string &oldPassword, - const std::string &newPassword) -{ - MessageOut msg(PAMSG_PASSWORD_CHANGE); - - // Change password using SHA2 encryption - msg.writeString(sha256(username + oldPassword)); - msg.writeString(sha256(username + newPassword)); - - Net::AccountServer::connection->send(msg); -} diff --git a/src/net/accountserver/account.h b/src/net/accountserver/account.h deleted file mode 100644 index 581bcb42..00000000 --- a/src/net/accountserver/account.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_ACCOUNTSERVER_CHARACTER_H -#define _TMW_NET_ACCOUNTSERVER_CHARACTER_H - -#include - -namespace Net -{ - namespace AccountServer - { - namespace Account - { - void createCharacter(const std::string &name, - char hairStyle, char hairColor, char gender, - short strength, short agility, short vitality, - short intelligence, short dexterity, short willpower); - - void deleteCharacter(char slot); - - void selectCharacter(char slot); - - void unregister(const std::string &username, - const std::string &password); - - void changeEmail(const std::string &email); - - void changePassword(const std::string &username, - const std::string &oldPassword, - const std::string &newPassword); - } - } -} - -#endif diff --git a/src/net/accountserver/accountserver.cpp b/src/net/accountserver/accountserver.cpp deleted file mode 100644 index b1ce590c..00000000 --- a/src/net/accountserver/accountserver.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "accountserver.h" - -#include - -#include "internal.h" - -#include "../connection.h" -#include "../messageout.h" -#include "../protocol.h" - -#include "../../utils/sha256.h" - -void Net::AccountServer::login(Net::Connection *connection, int version, - const std::string &username, const std::string &password) -{ - Net::AccountServer::connection = connection; - - MessageOut msg(PAMSG_LOGIN); - - msg.writeInt32(version); - msg.writeString(username); - msg.writeString(sha256(username + password)); - - Net::AccountServer::connection->send(msg); -} - -void Net::AccountServer::registerAccount(Net::Connection *connection, - int version, const std::string &username, const std::string &password, - const std::string &email) -{ - Net::AccountServer::connection = connection; - - MessageOut msg(PAMSG_REGISTER); - - msg.writeInt32(version); // client version - msg.writeString(username); - // When registering, the password and email hash is assumed by server. - // Hence, data can be validated safely server-side. - // This is the only time we send a clear password. - msg.writeString(password); - msg.writeString(email); - - Net::AccountServer::connection->send(msg); -} - -void Net::AccountServer::logout() -{ - MessageOut msg(PAMSG_LOGOUT); - Net::AccountServer::connection->send(msg); -} - -void Net::AccountServer::reconnectAccount(Net::Connection *connection, - const std::string &passToken) -{ - Net::AccountServer::connection = connection; - - MessageOut msg(PAMSG_RECONNECT); - msg.writeString(passToken, 32); - Net::AccountServer::connection->send(msg); -} diff --git a/src/net/accountserver/accountserver.h b/src/net/accountserver/accountserver.h deleted file mode 100644 index 8e0573fc..00000000 --- a/src/net/accountserver/accountserver.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_ACCOUNTSERVER_ACCOUNTSERVER_H -#define _TMW_NET_ACCOUNTSERVER_ACCOUNTSERVER_H - -#include - -namespace Net -{ - class Connection; - - namespace AccountServer - { - void login(Net::Connection *connection, int version, - const std::string &username, const std::string &password); - - void registerAccount(Net::Connection *connection, int version, - const std::string &username, const std::string &password, - const std::string &email); - - void logout(); - - void reconnectAccount(Net::Connection *connection, - const std::string &passToken); - } -} - -#endif diff --git a/src/net/accountserver/internal.cpp b/src/net/accountserver/internal.cpp deleted file mode 100644 index a3be76a1..00000000 --- a/src/net/accountserver/internal.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "internal.h" - -namespace Net -{ - class Connection; - - namespace AccountServer - { - Connection *connection = 0; - } -} diff --git a/src/net/accountserver/internal.h b/src/net/accountserver/internal.h deleted file mode 100644 index b3d64582..00000000 --- a/src/net/accountserver/internal.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_ACCOUNTSERVER_INTERNAL_H -#define _TMW_NET_ACCOUNTSERVER_INTERNAL_H - -namespace Net -{ - class Connection; - - namespace AccountServer - { - extern Connection *connection; - } -} - -#endif diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp deleted file mode 100644 index 8f1fb8fd..00000000 --- a/src/net/beinghandler.cpp +++ /dev/null @@ -1,359 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "beinghandler.h" - -#include - -#include "messagein.h" -#include "protocol.h" - -#include "../being.h" -#include "../beingmanager.h" -#include "../game.h" -#include "../localplayer.h" -#include "../log.h" -#include "../main.h" -#include "../npc.h" -#include "../particle.h" -#include "../sound.h" - -#include "../gui/ok_dialog.h" - -#include "../utils/gettext.h" - -#include "gameserver/player.h" - -const int EMOTION_TIME = 150; /**< Duration of emotion icon */ - -BeingHandler::BeingHandler() -{ - static const Uint16 _messages[] = { - GPMSG_BEING_ATTACK, - GPMSG_BEING_ENTER, - GPMSG_BEING_LEAVE, - GPMSG_BEINGS_MOVE, - GPMSG_BEINGS_DAMAGE, - GPMSG_BEING_ACTION_CHANGE, - GPMSG_BEING_LOOKS_CHANGE, - GPMSG_BEING_DIR_CHANGE, - 0 - }; - handledMessages = _messages; -} - -void BeingHandler::handleMessage(MessageIn &msg) -{ - switch (msg.getId()) - { - case GPMSG_BEING_ENTER: - handleBeingEnterMessage(msg); - break; - case GPMSG_BEING_LEAVE: - handleBeingLeaveMessage(msg); - break; - case GPMSG_BEINGS_MOVE: - handleBeingsMoveMessage(msg); - break; - case GPMSG_BEING_ATTACK: - handleBeingAttackMessage(msg); - break; - case GPMSG_BEINGS_DAMAGE: - handleBeingsDamageMessage(msg); - break; - case GPMSG_BEING_ACTION_CHANGE: - handleBeingActionChangeMessage(msg); - break; - case GPMSG_BEING_LOOKS_CHANGE: - handleBeingLooksChangeMessage(msg); - break; - case GPMSG_BEING_DIR_CHANGE: - handleBeingDirChangeMessage(msg); - break; - } -} - -static void handleLooks(Player *being, MessageIn &msg) -{ - // Order of sent slots. Has to be in sync with the server code. - static int const nb_slots = 4; - static int const slots[nb_slots] = - { Being::WEAPON_SPRITE, Being::HAT_SPRITE, Being::TOPCLOTHES_SPRITE, - Being::BOTTOMCLOTHES_SPRITE }; - - int mask = msg.readInt8(); - - if (mask & (1 << 7)) - { - // The equipment has to be cleared first. - for (int i = 0; i < nb_slots; ++i) - { - being->setSprite(slots[i], 0); - } - } - - // Fill slots enumerated by the bitmask. - for (int i = 0; i < nb_slots; ++i) - { - if (!(mask & (1 << i))) continue; - int id = msg.readInt16(); - being->setSprite(slots[i], id); - } -} - -void BeingHandler::handleBeingEnterMessage(MessageIn &msg) -{ - int type = msg.readInt8(); - int id = msg.readInt16(); - Being::Action action = (Being::Action)msg.readInt8(); - int px = msg.readInt16(); - int py = msg.readInt16(); - Being *being; - - switch (type) - { - case OBJECT_PLAYER: - { - std::string name = msg.readString(); - if (player_node->getName() == name) - { - being = player_node; - being->setId(id); - } - else - { - being = beingManager->createBeing(id, type, 0); - being->setName(name); - } - Player *p = static_cast< Player * >(being); - int hs = msg.readInt8(), hc = msg.readInt8(); - p->setHairStyle(hs, hc); - p->setGender(msg.readInt8() == GENDER_MALE ? - GENDER_MALE : GENDER_FEMALE); - handleLooks(p, msg); - } break; - - case OBJECT_MONSTER: - case OBJECT_NPC: - { - int subtype = msg.readInt16(); - being = beingManager->createBeing(id, type, subtype); - std::string name = msg.readString(); - if (name.length() > 0) being->setName(name); - } break; - - default: - return; - } - - being->setPosition(px, py); - being->setDestination(px, py); - being->setAction(action); -} - -void BeingHandler::handleBeingLeaveMessage(MessageIn &msg) -{ - Being *being = beingManager->findBeing(msg.readInt16()); - if (!being) return; - - beingManager->destroyBeing(being); -} - -void BeingHandler::handleBeingsMoveMessage(MessageIn &msg) -{ - while (msg.getUnreadLength()) - { - int id = msg.readInt16(); - int flags = msg.readInt8(); - Being *being = beingManager->findBeing(id); - int sx = 0; - int sy = 0; - int dx = 0; - int dy = 0; - int speed = 0; - - printf("handleBeingsMoveMessage for %p (%s | %s)\n", - (void*) being, - (flags & MOVING_POSITION) ? "pos" : "", - (flags & MOVING_DESTINATION) ? "dest" : ""); - - if (flags & MOVING_POSITION) - { - Uint16 sx2, sy2; - msg.readCoordinates(sx2, sy2); - sx = sx2 * 32 + 16; - sy = sy2 * 32 + 16; - speed = msg.readInt8(); - } - if (flags & MOVING_DESTINATION) - { - dx = msg.readInt16(); - dy = msg.readInt16(); - if (!(flags & MOVING_POSITION)) - { - sx = dx; - sy = dy; - } - } - if (!being || !(flags & (MOVING_POSITION | MOVING_DESTINATION))) - { - continue; - } - if (speed) - { - /* The speed on the server is the cost of moving from one tile to - * the next. Beings get 1000 cost units per second. The speed is - * transferred as devided by 10, so that slower speeds fit in a - * byte. Here we convert the speed to pixels per second. - */ - const float tilesPerSecond = 100.0f / speed; - being->setWalkSpeed((int) (tilesPerSecond * 32)); - } - - // Ignore messages from the server for the local player - if (being == player_node) - continue; - - // If being is a player, and he only moves a little, its ok to be a little out of sync - if (being->getType() == Being::PLAYER && abs(being->getPixelX() - dx) + - abs(being->getPixelY() - dy) < 2 * 32 && - (dx != being->getDestination().x && dy != being->getDestination().y)) - { - being->setDestination(being->getPixelX(),being->getPixelY()); - continue; - } - if (abs(being->getPixelX() - sx) + - abs(being->getPixelY() - sy) > 10 * 32) - { - // Too large a desynchronization. - being->setPosition(sx, sy); - being->setDestination(dx, dy); - } - else if (!(flags & MOVING_POSITION)) - { - being->setDestination(dx, dy); - } - else if (!(flags & MOVING_DESTINATION)) - { - being->adjustCourse(sx, sy); - } - else - { - being->adjustCourse(sx, sy, dx, dy); - } - } -} - -void BeingHandler::handleBeingAttackMessage(MessageIn &msg) -{ - Being *being = beingManager->findBeing(msg.readInt16()); - int direction = msg.readInt8(); - int attackType = msg.readInt8(); - - if (!being) return; - - switch (direction) - { - case DIRECTION_UP: being->setDirection(Being::UP); break; - case DIRECTION_DOWN: being->setDirection(Being::DOWN); break; - case DIRECTION_LEFT: being->setDirection(Being::LEFT); break; - case DIRECTION_RIGHT: being->setDirection(Being::RIGHT); break; - } - - being->setAction(Being::ATTACK, attackType); -} - -void BeingHandler::handleBeingsDamageMessage(MessageIn &msg) -{ - while (msg.getUnreadLength()) - { - Being *being = beingManager->findBeing(msg.readInt16()); - int damage = msg.readInt16(); - if (being) - { - being->takeDamage(damage); - } - } -} - -void BeingHandler::handleBeingActionChangeMessage(MessageIn &msg) -{ - Being* being = beingManager->findBeing(msg.readInt16()); - Being::Action action = (Being::Action) msg.readInt8(); - if (!being) return; - - being->setAction(action); - - if (action == Being::DEAD && being==player_node) - { - static char const *const deadMsg[] = - { - _("You are dead."), - _("We regret to inform you that your character was killed in battle."), - _("You are not that alive anymore."), - _("The cold hands of the grim reaper are grabbing for your soul."), - _("Game Over!"), - _("No, kids. Your character did not really die. It... err... went to a better place."), - _("Your plan of breaking your enemies weapon by bashing it with your throat failed."), - _("I guess this did not run too well."), - _("Do you want your possessions identified?"), // Nethack reference - _("Sadly, no trace of you was ever found..."), // Secret of Mana reference - _("Annihilated."), // Final Fantasy VI reference - _("Looks like you got your head handed to you."), //Earthbound reference - _("You screwed up again, dump your body down the tubes and get you another one.") // Leisure Suit Larry 1 Reference - - }; - std::string message(deadMsg[rand()%13]); - message.append(_(" Press OK to respawn")); - OkDialog *dlg = new OkDialog(_("You died"), message); - dlg->addActionListener(&(Net::GameServer::Player::respawnListener)); - } -} - -void BeingHandler::handleBeingLooksChangeMessage(MessageIn &msg) -{ - Being *being = beingManager->findBeing(msg.readInt16()); - if (!being || being->getType() != Being::PLAYER) return; - Player * player = static_cast< Player * >(being); - handleLooks(player, msg); - if (msg.getUnreadLength()) - { - int style = msg.readInt16(); - int color = msg.readInt16(); - player->setHairStyle(style, color); - player->setGender((Gender)msg.readInt16()); - } -} - -void BeingHandler::handleBeingDirChangeMessage(MessageIn &msg) -{ - Being *being = beingManager->findBeing(msg.readInt16()); - if (!being) return; - int data = msg.readInt8(); - switch (data) - { - case DIRECTION_UP: being->setDirection(Being::UP); break; - case DIRECTION_DOWN: being->setDirection(Being::DOWN); break; - case DIRECTION_LEFT: being->setDirection(Being::LEFT); break; - case DIRECTION_RIGHT: being->setDirection(Being::RIGHT); break; - } -} - diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h deleted file mode 100644 index b02728b4..00000000 --- a/src/net/beinghandler.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_BEINGHANDLER_H -#define _TMW_NET_BEINGHANDLER_H - -#include "messagehandler.h" - -class BeingHandler : public MessageHandler -{ - public: - BeingHandler(); - - void handleMessage(MessageIn &msg); - - private: - void handleBeingAttackMessage(MessageIn &msg); - void handleBeingEnterMessage(MessageIn &msg); - void handleBeingLeaveMessage(MessageIn &msg); - void handleBeingsMoveMessage(MessageIn &msg); - void handleBeingsDamageMessage(MessageIn &msg); - void handleBeingActionChangeMessage(MessageIn &msg); - void handleBeingLooksChangeMessage(MessageIn &msg); - void handleBeingDirChangeMessage(MessageIn &msg); -}; - -#endif diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp deleted file mode 100644 index a551f213..00000000 --- a/src/net/buysellhandler.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "buysellhandler.h" - -#include - -#include "messagein.h" -#include "protocol.h" - -#include "../beingmanager.h" -#include "../item.h" -#include "../localplayer.h" -#include "../npc.h" - -#include "../gui/buy.h" -#include "../gui/chat.h" -#include "../gui/sell.h" - -extern BuyDialog *buyDialog; -extern SellDialog *sellDialog; -extern Window *buySellDialog; - -BuySellHandler::BuySellHandler() -{ - static const Uint16 _messages[] = { - GPMSG_NPC_BUY, - GPMSG_NPC_SELL, - 0 - }; - handledMessages = _messages; -} - -void BuySellHandler::handleMessage(MessageIn &msg) -{ - Being *being = beingManager->findBeing(msg.readInt16()); - if (!being || being->getType() != Being::NPC) - { - return; - } - - current_npc = static_cast< NPC * >(being); - - switch (msg.getId()) - { - case GPMSG_NPC_BUY: - buyDialog->reset(); - buyDialog->setMoney(player_node->getMoney()); - buyDialog->setVisible(true); - - while (msg.getUnreadLength()) - { - int itemId = msg.readInt16(); - int amount = msg.readInt16(); - int value = msg.readInt16(); - buyDialog->addItem(itemId, amount, value); - } - break; - - case GPMSG_NPC_SELL: - sellDialog->setMoney(player_node->getMoney()); - sellDialog->reset(); - sellDialog->setVisible(true); - - while (msg.getUnreadLength()) - { - int itemId = msg.readInt16(); - int amount = msg.readInt16(); - int value = msg.readInt16(); - sellDialog->addItem(itemId, amount, value); - } - break; - } -} diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h deleted file mode 100644 index 719b76d9..00000000 --- a/src/net/buysellhandler.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef NET_BUYSELLHANDLER_H -#define NET_BUYSELLHANDLER_H - -#include "messagehandler.h" - -class BuySellHandler : public MessageHandler -{ - public: - BuySellHandler(); - - void handleMessage(MessageIn &msg); -}; - -#endif diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp deleted file mode 100644 index 5905dba0..00000000 --- a/src/net/charserverhandler.cpp +++ /dev/null @@ -1,227 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "charserverhandler.h" - -#include "connection.h" -#include "messagein.h" -#include "protocol.h" - -#include "../game.h" -#include "../localplayer.h" -#include "../log.h" -#include "../logindata.h" -#include "../main.h" - -#include "../gui/ok_dialog.h" -#include "../gui/char_select.h" - -extern Net::Connection *gameServerConnection; -extern Net::Connection *chatServerConnection; - -CharServerHandler::CharServerHandler(): - mCharCreateDialog(0) -{ - static const Uint16 _messages[] = { - APMSG_CHAR_CREATE_RESPONSE, - APMSG_CHAR_DELETE_RESPONSE, - APMSG_CHAR_INFO, - APMSG_CHAR_SELECT_RESPONSE, - 0 - }; - handledMessages = _messages; -} - -void CharServerHandler::handleMessage(MessageIn &msg) -{ - int slot; - LocalPlayer *tempPlayer; - - switch (msg.getId()) - { - case APMSG_CHAR_CREATE_RESPONSE: - handleCharCreateResponse(msg); - break; - - case APMSG_CHAR_DELETE_RESPONSE: - { - int errMsg = msg.readInt8(); - // Character deletion successful - if (errMsg == ERRMSG_OK) - { - delete mCharInfo->getEntry(); - mCharInfo->setEntry(0); - mCharInfo->unlock(); - new OkDialog("Info", "Player deleted"); - } - // Character deletion failed - else - { - std::string message = ""; - switch (errMsg) - { - case ERRMSG_NO_LOGIN: - message = "Not logged in"; - break; - case ERRMSG_INVALID_ARGUMENT: - message = "Selection out of range"; - break; - default: - message = "Unknown error"; - } - mCharInfo->unlock(); - new OkDialog("Error", message); - } - } - break; - - case APMSG_CHAR_INFO: - tempPlayer = readPlayerData(msg, slot); - mCharInfo->unlock(); - mCharInfo->select(slot); - mCharInfo->setEntry(tempPlayer); - - // Close the character create dialog - if (mCharCreateDialog) - { - mCharCreateDialog->scheduleDelete(); - mCharCreateDialog = 0; - } - break; - - case APMSG_CHAR_SELECT_RESPONSE: - handleCharSelectResponse(msg); - break; - } -} - -void CharServerHandler::handleCharCreateResponse(MessageIn &msg) -{ - int errMsg = msg.readInt8(); - - // Character creation failed - if (errMsg != ERRMSG_OK) - { - std::string message = ""; - switch (errMsg) - { - case ERRMSG_NO_LOGIN: - message = "Not logged in"; - break; - case CREATE_TOO_MUCH_CHARACTERS: - message = "No empty slot"; - break; - case ERRMSG_INVALID_ARGUMENT: - message = "Invalid name"; - break; - case CREATE_EXISTS_NAME: - message = "Character's name already exists"; - break; - case CREATE_INVALID_HAIRSTYLE: - message = "Invalid hairstyle"; - break; - case CREATE_INVALID_HAIRCOLOR: - message = "Invalid hair color"; - break; - case CREATE_INVALID_GENDER: - message = "Invalid gender"; - break; - case CREATE_RAW_STATS_TOO_HIGH: - message = "Character's stats are too high"; - break; - case CREATE_RAW_STATS_TOO_LOW: - message = "Character's stats are too low"; - break; - case CREATE_RAW_STATS_EQUAL_TO_ZERO: - message = "One stat is zero"; - break; - default: - message = "Unknown error"; - break; - } - new OkDialog("Error", message); - } - - if (mCharCreateDialog) - mCharCreateDialog->unlock(); -} - -void CharServerHandler::handleCharSelectResponse(MessageIn &msg) -{ - int errMsg = msg.readInt8(); - - if (errMsg == ERRMSG_OK) - { - token = msg.readString(32); - std::string gameServer = msg.readString(); - unsigned short gameServerPort = msg.readInt16(); - std::string chatServer = msg.readString(); - unsigned short chatServerPort = msg.readInt16(); - - logger->log("Game server: %s:%d", gameServer.c_str(), gameServerPort); - logger->log("Chat server: %s:%d", chatServer.c_str(), chatServerPort); - - gameServerConnection->connect(gameServer, gameServerPort); - chatServerConnection->connect(chatServer, chatServerPort); - - // Keep the selected character and delete the others - player_node = mCharInfo->getEntry(); - int slot = mCharInfo->getPos(); - mCharInfo->unlock(); - mCharInfo->select(0); - - do { - LocalPlayer *tmp = mCharInfo->getEntry(); - if (tmp != player_node) - { - delete tmp; - mCharInfo->setEntry(0); - } - mCharInfo->next(); - } while (mCharInfo->getPos()); - mCharInfo->select(slot); - - mCharInfo->clear(); //player_node will be deleted by ~Game - - state = STATE_CONNECT_GAME; - } -} - -LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot) -{ - LocalPlayer *tempPlayer = new LocalPlayer; - slot = msg.readInt8(); // character slot - tempPlayer->setName(msg.readString()); - tempPlayer->setGender(msg.readInt8() == GENDER_MALE ? GENDER_MALE : GENDER_FEMALE); - int hs = msg.readInt8(), hc = msg.readInt8(); - tempPlayer->setHairStyle(hs, hc); - tempPlayer->setLevel(msg.readInt16()); - tempPlayer->setCharacterPoints(msg.readInt16()); - tempPlayer->setCorrectionPoints(msg.readInt16()); - tempPlayer->setMoney(msg.readInt32()); - - for (int i = 0; i < 7; i++) - { - tempPlayer->setAttributeBase(i, msg.readInt8()); - } - - return tempPlayer; -} diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h deleted file mode 100644 index 08ba5102..00000000 --- a/src/net/charserverhandler.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_CHARSERVERHANDLER_H -#define _TMW_NET_CHARSERVERHANDLER_H - -#include "messagehandler.h" - -#include "../lockedarray.h" - -class CharCreateDialog; -class LocalPlayer; -class LoginData; - -/** - * Deals with incoming messages related to character selection. - */ -class CharServerHandler : public MessageHandler -{ - public: - CharServerHandler(); - - void - handleMessage(MessageIn &msg); - - void - setCharInfo(LockedArray *charInfo) - { - mCharInfo = charInfo; - } - - /** - * Sets the character create dialog. The handler will clean up this - * dialog when a new character is succesfully created, and will unlock - * the dialog when a new character failed to be created. - */ - void setCharCreateDialog(CharCreateDialog *window) - { mCharCreateDialog = window; } - - protected: - void - handleCharCreateResponse(MessageIn &msg); - - void - handleCharSelectResponse(MessageIn &msg); - - LockedArray *mCharInfo; - CharCreateDialog *mCharCreateDialog; - - LocalPlayer* - readPlayerData(MessageIn &msg, int &slot); -}; - -#endif diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp deleted file mode 100644 index 90af899a..00000000 --- a/src/net/chathandler.cpp +++ /dev/null @@ -1,285 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "chathandler.h" - -#include -#include -#include - -#include "messagein.h" -#include "protocol.h" - -#include "../being.h" -#include "../beingmanager.h" -#include "../game.h" -#include "../channel.h" -#include "../channelmanager.h" - -#include "../gui/chat.h" -#include "../gui/guildwindow.h" - -extern Being *player_node; - -ChatHandler::ChatHandler() -{ - static const Uint16 _messages[] = { - GPMSG_SAY, - CPMSG_ENTER_CHANNEL_RESPONSE, - CPMSG_LIST_CHANNELS_RESPONSE, - CPMSG_PUBMSG, - CPMSG_ANNOUNCEMENT, - CPMSG_PRIVMSG, - CPMSG_QUIT_CHANNEL_RESPONSE, - CPMSG_LIST_CHANNELUSERS_RESPONSE, - CPMSG_CHANNEL_EVENT, - 0 - }; - handledMessages = _messages; -} - -void ChatHandler::handleMessage(MessageIn &msg) -{ - switch (msg.getId()) - { - case GPMSG_SAY: - handleGameChatMessage(msg); - break; - - case CPMSG_ENTER_CHANNEL_RESPONSE: - handleEnterChannelResponse(msg); - break; - - case CPMSG_LIST_CHANNELS_RESPONSE: - handleListChannelsResponse(msg); - break; - - case CPMSG_PRIVMSG: - handlePrivateMessage(msg); - break; - - case CPMSG_ANNOUNCEMENT: - handleAnnouncement(msg); - break; - - case CPMSG_PUBMSG: - handleChatMessage(msg); - break; - - case CPMSG_QUIT_CHANNEL_RESPONSE: - handleQuitChannelResponse(msg); - break; - - case CPMSG_LIST_CHANNELUSERS_RESPONSE: - handleListChannelUsersResponse(msg); - break; - - case CPMSG_CHANNEL_EVENT: - handleChannelEvent(msg); - } -} - -void ChatHandler::handleGameChatMessage(MessageIn &msg) -{ - short id = msg.readInt16(); - std::string chatMsg = msg.readString(); - - if (id == 0) - { - chatWindow->chatLog(chatMsg, BY_SERVER); - return; - } - - Being *being = beingManager->findBeing(id); - - if (being) - { - chatWindow->chatLog(being->getName() + " : " + chatMsg, - being == player_node ? BY_PLAYER : BY_OTHER, "General"); - being->setSpeech(chatMsg, SPEECH_TIME); - } - else - { - chatWindow->chatLog("Unknown : " + chatMsg, BY_OTHER, "General"); - } -} - -void ChatHandler::handleEnterChannelResponse(MessageIn &msg) -{ - if(msg.readInt8() == ERRMSG_OK) - { - short channelId = msg.readInt16(); - std::string channelName = msg.readString(); - std::string announcement = msg.readString(); - Channel *channel = new Channel(channelId, channelName, announcement); - channelManager->addChannel(channel); - chatWindow->createNewChannelTab(channelName); - chatWindow->chatLog("Topic: " + announcement, BY_CHANNEL, channelName); - - std::string user; - std::string userModes; - chatWindow->chatLog("Players in this channel:", BY_CHANNEL, channelName); - while(msg.getUnreadLength()) - { - user = msg.readString(); - if (user == "") - return; - userModes = msg.readString(); - if (userModes.find('o') != std::string::npos) - { - user = "@" + user; - } - chatWindow->chatLog(user, BY_CHANNEL, channelName); - } - - } - else - { - chatWindow->chatLog("Error joining channel", BY_SERVER); - } -} - -void ChatHandler::handleListChannelsResponse(MessageIn &msg) -{ - chatWindow->chatLog("Listing Channels", BY_SERVER); - while(msg.getUnreadLength()) - { - std::string channelName = msg.readString(); - if (channelName == "") - return; - std::ostringstream numUsers; - numUsers << msg.readInt16(); - channelName += " - "; - channelName += numUsers.str(); - chatWindow->chatLog(channelName, BY_SERVER); - } - chatWindow->chatLog("End of channel list", BY_SERVER); -} - -void ChatHandler::handlePrivateMessage(MessageIn &msg) -{ - std::string userNick = msg.readString(); - std::string chatMsg = msg.readString(); - - if (!chatWindow->tabExists(userNick)) - { - chatWindow->createNewChannelTab(userNick); - - } - chatWindow->chatLog(userNick + ": " + chatMsg, BY_OTHER, userNick); -} - -void ChatHandler::handleAnnouncement(MessageIn &msg) -{ - std::string chatMsg = msg.readString(); - chatWindow->chatLog(chatMsg, BY_GM); -} - -void ChatHandler::handleChatMessage(MessageIn &msg) -{ - short channelId = msg.readInt16(); - std::string userNick = msg.readString(); - std::string chatMsg = msg.readString(); - - chatWindow->sendToChannel(channelId, userNick, chatMsg); -} - -void ChatHandler::handleQuitChannelResponse(MessageIn &msg) -{ - if(msg.readInt8() == ERRMSG_OK) - { - short channelId = msg.readInt16(); - // remove the chat tab - chatWindow->removeChannel(channelId); - } -} - -void ChatHandler::handleListChannelUsersResponse(MessageIn &msg) -{ - std::string channel = msg.readString(); - std::string userNick; - std::string userModes; - chatWindow->chatLog("Players in this channel:", BY_CHANNEL, channel); - while(msg.getUnreadLength()) - { - userNick = msg.readString(); - if (userNick == "") - { - break; - } - userModes = msg.readString(); - if (userModes.find('o') != std::string::npos) - { - userNick = "@" + userNick; - } - chatWindow->chatLog(userNick, BY_CHANNEL, channel); - } -} - -void ChatHandler::handleChannelEvent(MessageIn &msg) -{ - short channelId = msg.readInt16(); - char eventId = msg.readInt8(); - std::string line = msg.readString(); - Channel *channel = channelManager->findById(channelId); - - if(channel) - { - switch(eventId) - { - case CHAT_EVENT_NEW_PLAYER: - line += " entered the channel."; - break; - - case CHAT_EVENT_LEAVING_PLAYER: - line += " left the channel."; - break; - - case CHAT_EVENT_TOPIC_CHANGE: - line = "Topic: " + line; - break; - - case CHAT_EVENT_MODE_CHANGE: - { - int first = line.find(":"); - int second = line.find(":", first+1); - std::string user1 = line.substr(0, first); - std::string user2 = line.substr(first+1, second); - std::string mode = line.substr(second+1, line.length()); - line = user1 + " has set mode " + mode + " on user " + user2; - } break; - - case CHAT_EVENT_KICKED_PLAYER: - { - int first = line.find(":"); - std::string user1 = line.substr(0, first); - std::string user2 = line.substr(first+1, line.length()); - line = user1 + " has kicked " + user2; - } break; - - default: - line = "Unknown channel event."; - } - - chatWindow->chatLog(line, BY_CHANNEL, channel->getName()); - } -} - diff --git a/src/net/chathandler.h b/src/net/chathandler.h deleted file mode 100644 index a9e9bd99..00000000 --- a/src/net/chathandler.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef NET_CHATHANDLER_H -#define NET_CHATHANDLER_H - -#include "messagehandler.h" - -class ChatHandler : public MessageHandler -{ - public: - ChatHandler(); - - /** - * Handle the given message appropriately. - */ - void handleMessage(MessageIn &msg); - - private: - /** - * Handle chat messages sent from the game server. - */ - void handleGameChatMessage(MessageIn &msg); - - /** - * Handle channel entry responses. - */ - void handleEnterChannelResponse(MessageIn &msg); - - /** - * Handle list channels responses. - */ - void handleListChannelsResponse(MessageIn &msg); - - /** - * Handle private messages. - */ - void handlePrivateMessage(MessageIn &msg); - - /** - * Handle announcements. - */ - void handleAnnouncement(MessageIn &msg); - - /** - * Handle chat messages. - */ - void handleChatMessage(MessageIn &msg); - - /** - * Handle quit channel responses. - */ - void handleQuitChannelResponse(MessageIn &msg); - - /** - * Handle list channel users responses. - */ - void handleListChannelUsersResponse(MessageIn &msg); - - /** - * Handle channel events. - */ - void handleChannelEvent(MessageIn &msg); -}; - -#endif diff --git a/src/net/chatserver/chatserver.cpp b/src/net/chatserver/chatserver.cpp deleted file mode 100644 index 94e36b94..00000000 --- a/src/net/chatserver/chatserver.cpp +++ /dev/null @@ -1,146 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "chatserver.h" - -#include "internal.h" - -#include "../connection.h" -#include "../messageout.h" -#include "../protocol.h" - -using Net::ChatServer::connection; - -void Net::ChatServer::connect(Net::Connection *connection, - const std::string &token) -{ - Net::ChatServer::connection = connection; - - MessageOut msg(PCMSG_CONNECT); - - msg.writeString(token, 32); - - connection->send(msg); -} - -void Net::ChatServer::logout() -{ - MessageOut msg(PCMSG_DISCONNECT); - - connection->send(msg); -} - -void Net::ChatServer::chat(short channel, const std::string &text) -{ - MessageOut msg(PCMSG_CHAT); - - msg.writeString(text); - msg.writeInt16(channel); - - connection->send(msg); -} - -void Net::ChatServer::announce(const std::string &text) -{ - MessageOut msg(PCMSG_ANNOUNCE); - - msg.writeString(text); - - connection->send(msg); -} - -void Net::ChatServer::privMsg(const std::string &recipient, - const std::string &text) -{ - MessageOut msg(PCMSG_PRIVMSG); - - msg.writeString(recipient); - msg.writeString(text); - - connection->send(msg); -} - -void Net::ChatServer::enterChannel(const std::string &channel, const std::string &password) -{ - MessageOut msg(PCMSG_ENTER_CHANNEL); - - msg.writeString(channel); - msg.writeString(password); - - connection->send(msg); -} - -void Net::ChatServer::quitChannel(short channel) -{ - MessageOut msg(PCMSG_QUIT_CHANNEL); - - msg.writeInt16(channel); - - connection->send(msg); -} - -void Net::ChatServer::getChannelList() -{ - MessageOut msg(PCMSG_LIST_CHANNELS); - - connection->send(msg); -} - -void Net::ChatServer::getUserList(const std::string &channel) -{ - MessageOut msg(PCMSG_LIST_CHANNELUSERS); - - msg.writeString(channel); - - connection->send(msg); -} - -void Net::ChatServer::setChannelTopic(short channel, const std::string &topic) -{ - MessageOut msg(PCMSG_TOPIC_CHANGE); - - msg.writeInt16(channel); - msg.writeString(topic); - - connection->send(msg); -} - -void Net::ChatServer::setUserMode(short channel, const std::string &user, - unsigned char mode) -{ - MessageOut msg(PCMSG_USER_MODE); - - msg.writeInt16(channel); - msg.writeString(user); - msg.writeInt8(mode); - - connection->send(msg); -} - -void Net::ChatServer::kickUser(short channel, const std::string &user) -{ - MessageOut msg(PCMSG_KICK_USER); - - msg.writeInt16(channel); - msg.writeString(user); - - connection->send(msg); -} diff --git a/src/net/chatserver/chatserver.h b/src/net/chatserver/chatserver.h deleted file mode 100644 index 1129239a..00000000 --- a/src/net/chatserver/chatserver.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_CHATSERVER_CHATSERVER_H -#define _TMW_NET_CHATSERVER_CHATSERVER_H - -#include - -namespace Net -{ - class Connection; - - namespace ChatServer - { - void connect(Net::Connection *connection, const std::string &token); - - void logout(); - - void chat(short channel, const std::string &text); - - void announce(const std::string &text); - - void privMsg(const std::string &recipient, const std::string &text); - - void enterChannel(const std::string &channel, const std::string &password); - - void quitChannel(short channel); - - void getChannelList(); - - void getUserList(const std::string &channel); - - void setChannelTopic(short channel, const std::string &topic); - - void setUserMode(short channel, const std::string &user, unsigned char mode); - - void kickUser(short channel, const std::string &user); - - } -} - -#endif diff --git a/src/net/chatserver/guild.cpp b/src/net/chatserver/guild.cpp deleted file mode 100644 index 042ff013..00000000 --- a/src/net/chatserver/guild.cpp +++ /dev/null @@ -1,95 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#include "guild.h" - -#include "internal.h" - -#include "../connection.h" -#include "../messageout.h" -#include "../protocol.h" - -#include "../../log.h" - -void Net::ChatServer::Guild::createGuild(const std::string &name) -{ - logger->log("Sending PCMSG_GUILD_CREATE"); - MessageOut msg(PCMSG_GUILD_CREATE); - - msg.writeString(name); - - Net::ChatServer::connection->send(msg); -} - -void Net::ChatServer::Guild::invitePlayer(const std::string &name, short guildId) -{ - logger->log("Sending PCMSG_GUILD_INVITE"); - MessageOut msg(PCMSG_GUILD_INVITE); - - msg.writeInt16(guildId); - msg.writeString(name); - - Net::ChatServer::connection->send(msg); -} - -void Net::ChatServer::Guild::acceptInvite(const std::string &name) -{ - logger->log("Sending PCMSG_GUILD_ACCEPT"); - MessageOut msg(PCMSG_GUILD_ACCEPT); - - msg.writeString(name); - - Net::ChatServer::connection->send(msg); -} - -void Net::ChatServer::Guild::getGuildMembers(short guildId) -{ - logger->log("Sending PCMSG_GUILD_GET_MEMBERS"); - MessageOut msg(PCMSG_GUILD_GET_MEMBERS); - - msg.writeInt16(guildId); - - Net::ChatServer::connection->send(msg); -} - -void Net::ChatServer::Guild::promoteMember(const std::string &name, - short guildId, short level) -{ - logger->log("Sending PCMSG_GUILD_PROMOTE_MEMBER"); - MessageOut msg(PCMSG_GUILD_PROMOTE_MEMBER); - - msg.writeInt16(guildId); - msg.writeString(name); - msg.writeInt8(level); - - Net::ChatServer::connection->send(msg); -} - -void Net::ChatServer::Guild::quitGuild(short guildId) -{ - logger->log("Sending PCMSG_GUILD_QUIT"); - MessageOut msg(PCMSG_GUILD_QUIT); - - msg.writeInt16(guildId); - - Net::ChatServer::connection->send(msg); -} diff --git a/src/net/chatserver/guild.h b/src/net/chatserver/guild.h deleted file mode 100644 index 6c35be9f..00000000 --- a/src/net/chatserver/guild.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef _TMW_NET_CHATSERVER_GUILD_H -#define _TMW_NET_CHATSERVER_GUILD_H - -#include - -namespace Net -{ - namespace ChatServer - { - namespace Guild - { - /** - * Create guild. - */ - void createGuild(const std::string &name); - - /** - * Invite a player to your guild. - */ - void invitePlayer(const std::string &name, short guildId); - - /** - * Accept an invite another player has sent to join their guild. - */ - void acceptInvite(const std::string &name); - - /** - * Get a list of members in a guild. - */ - void getGuildMembers(short guildId); - - /** - * Promote guild member - */ - void promoteMember(const std::string &name, short guildId, - short level); - - /** - * Quit guild. - */ - void quitGuild(short guildId); - } - } -} - -#endif - diff --git a/src/net/chatserver/internal.cpp b/src/net/chatserver/internal.cpp deleted file mode 100644 index 0822d93d..00000000 --- a/src/net/chatserver/internal.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "internal.h" - -namespace Net -{ - class Connection; - - namespace ChatServer - { - Connection *connection = 0; - } -} diff --git a/src/net/chatserver/internal.h b/src/net/chatserver/internal.h deleted file mode 100644 index b0f137c5..00000000 --- a/src/net/chatserver/internal.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_CHATSERVER_INTERNAL_H -#define _TMW_NET_CHATSERVER_INTERNAL_H - -namespace Net -{ - class Connection; - - namespace ChatServer - { - extern Connection *connection; - } -} - -#endif diff --git a/src/net/chatserver/party.cpp b/src/net/chatserver/party.cpp deleted file mode 100644 index 56eb57d2..00000000 --- a/src/net/chatserver/party.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/* - * The Mana World - * Copyright 2008 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#include "party.h" - -#include "internal.h" - -#include "../connection.h" -#include "../messageout.h" -#include "../protocol.h" - -#include "../../log.h" - -void Net::ChatServer::Party::invitePlayer(const std::string &name) -{ - logger->log("Sending PCMSG_PARTY_INVITE"); - MessageOut msg(PCMSG_PARTY_INVITE); - - msg.writeString(name); - - Net::ChatServer::connection->send(msg); -} - -void Net::ChatServer::Party::acceptInvite(const std::string &name) -{ - logger->log("Sending PCMSG_PARTY_ACCEPT_INVITE"); - MessageOut msg(PCMSG_PARTY_ACCEPT_INVITE); - - msg.writeString(name); - - Net::ChatServer::connection->send(msg); -} - -void Net::ChatServer::Party::getPartyMembers() -{ - logger->log("Sending PCMSG_PARTY_GET_MEMBERS"); -// MessageOut msg(PCMSG_GUILD_GET_MEMBERS); - -// msg.writeInt16(guildId); - -// Net::ChatServer::connection->send(msg); -} - -void Net::ChatServer::Party::quitParty() -{ - logger->log("Sending PCMSG_PARTY_QUIT"); - MessageOut msg(PCMSG_PARTY_QUIT); - - Net::ChatServer::connection->send(msg); -} - diff --git a/src/net/chatserver/party.h b/src/net/chatserver/party.h deleted file mode 100644 index c1febd66..00000000 --- a/src/net/chatserver/party.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * The Mana World - * Copyright 2008 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef _TMW_NET_CHATSERVER_PARTY_H -#define _TMW_NET_CHATSERVER_PARTY_H - -#include - -namespace Net -{ - namespace ChatServer - { - namespace Party - { - /** - * Invite a player to the party. - */ - void invitePlayer(const std::string &name); - - /** - * Accept an invite another player has sent to join their party - */ - void acceptInvite(const std::string &name); - - /** - * Get a list of party members - */ - void getPartyMembers(); - - /** - * Leave party - */ - void quitParty(); - } - } -} - -#endif diff --git a/src/net/connection.cpp b/src/net/connection.cpp deleted file mode 100644 index 7d3c2328..00000000 --- a/src/net/connection.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "connection.h" - -#include - -#include "internal.h" -#include "messageout.h" - -#include "../log.h" - -Net::Connection::Connection(ENetHost *client): - mConnection(0), mClient(client) -{ - Net::connections++; -} - -Net::Connection::~Connection() -{ - Net::connections--; -} - -bool Net::Connection::connect(const std::string &address, short port) -{ - logger->log("Net::Connection::connect(%s, %i)", address.c_str(), port); - - if (address.empty()) - { - logger->log("Net::Connection::connect() got empty address!"); - mState = NET_ERROR; - return false; - } - - ENetAddress enetAddress; - - enet_address_set_host(&enetAddress, address.c_str()); - enetAddress.port = port; - - // Initiate the connection, allocating channel 0. - mConnection = enet_host_connect(mClient, &enetAddress, 1); - - if (!mConnection) - { - logger->log("Unable to initiate connection to the server."); - mState = NET_ERROR; - return false; - } - - return true; -} - -void Net::Connection::disconnect() -{ - if (!mConnection) - return; - - enet_peer_disconnect(mConnection, 0); - enet_host_flush(mClient); - enet_peer_reset(mConnection); - - mConnection = 0; -} - -bool Net::Connection::isConnected() -{ - return bool (mConnection) ? - (mConnection->state == ENET_PEER_STATE_CONNECTED) : false; -} - -void Net::Connection::send(const MessageOut &msg) -{ - if (!isConnected()) - { - logger->log("Warning: cannot send message to not connected server!"); - return; - } - - //logger->log("Sending message of size %d...", msg.getDataSize()); - - ENetPacket *packet = enet_packet_create(msg.getData(), - msg.getDataSize(), - ENET_PACKET_FLAG_RELIABLE); - enet_peer_send(mConnection, 0, packet); -} diff --git a/src/net/connection.h b/src/net/connection.h deleted file mode 100644 index 4ab3d24d..00000000 --- a/src/net/connection.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_CONNECTION_H -#define _TMW_NET_CONNECTION_H - -#include - -#include - -class MessageOut; - -namespace Net -{ - /** - * \ingroup Network - */ - class Connection - { - public: - enum State { - OK, - NET_ERROR - }; - - ~Connection(); - - /** - * Connects to the given server with the specified address and port. - * This method is non-blocking, use isConnected to check whether the - * server is connected. - */ - bool connect(const std::string &address, short port); - - /** - * Disconnects from the given server. - */ - void disconnect(); - - State getState() { return mState; } - - /** - * Returns whether the server is connected. - */ - bool isConnected(); - - /** - * Sends a message. - */ - void send(const MessageOut &msg); - - private: - friend Connection *Net::getConnection(); - Connection(ENetHost *client); - - ENetPeer *mConnection; - ENetHost *mClient; - State mState; - }; -} - -#endif diff --git a/src/net/effecthandler.cpp b/src/net/effecthandler.cpp deleted file mode 100644 index 8411b9e7..00000000 --- a/src/net/effecthandler.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "effecthandler.h" - -#include "messagein.h" -#include "protocol.h" - -#include "../effectmanager.h" - - -EffectHandler::EffectHandler() -{ - static const Uint16 _messages[] = { - GPMSG_CREATE_EFFECT, - 0 - }; - handledMessages = _messages; -} - -void EffectHandler::handleMessage(MessageIn &msg) -{ - switch (msg.getId()) - { - case GPMSG_CREATE_EFFECT: - handleCreateEffects(msg); - break; - default: - break; - } -} - -void EffectHandler::handleCreateEffects(MessageIn &msg) -{ - int id = msg.readInt16(); - Uint16 x = msg.readInt16(); - Uint16 y = msg.readInt16(); - effectManager->trigger(id, x, y); -} - diff --git a/src/net/effecthandler.h b/src/net/effecthandler.h deleted file mode 100644 index 283c7c10..00000000 --- a/src/net/effecthandler.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_EFFECTSHANDLER_H -#define _TMW_NET_EFFECTSHANDLER_H - -#include "messagehandler.h" - -class EffectHandler : public MessageHandler -{ - public: - EffectHandler(); - - void handleMessage(MessageIn &msg); - - private: - void handleCreateEffects(MessageIn &msg); -}; - -#endif diff --git a/src/net/gameserver/gameserver.cpp b/src/net/gameserver/gameserver.cpp deleted file mode 100644 index 1bdaef26..00000000 --- a/src/net/gameserver/gameserver.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "gameserver.h" - -#include "internal.h" - -#include "../connection.h" -#include "../messageout.h" -#include "../protocol.h" - -void Net::GameServer::connect(Net::Connection *connection, - const std::string &token) -{ - Net::GameServer::connection = connection; - - MessageOut msg(PGMSG_CONNECT); - - msg.writeString(token, 32); - - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::logout(bool reconnectAccount) -{ - MessageOut msg(PGMSG_DISCONNECT); - - msg.writeInt8((unsigned char) reconnectAccount); - - Net::GameServer::connection->send(msg); -} diff --git a/src/net/gameserver/gameserver.h b/src/net/gameserver/gameserver.h deleted file mode 100644 index 5ea2c718..00000000 --- a/src/net/gameserver/gameserver.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_GAMESERVER_GAMESERVER_H -#define _TMW_NET_GAMESERVER_GAMESERVER_H - -#include - -namespace Net -{ - class Connection; - - namespace GameServer - { - void connect(Net::Connection *connection, const std::string &token); - - void logout(bool reconnectAccount); - } -} - -#endif diff --git a/src/net/gameserver/internal.cpp b/src/net/gameserver/internal.cpp deleted file mode 100644 index 6b6ba081..00000000 --- a/src/net/gameserver/internal.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "internal.h" - -namespace Net -{ - class Connection; - - namespace GameServer - { - Connection *connection = 0; - } -} diff --git a/src/net/gameserver/internal.h b/src/net/gameserver/internal.h deleted file mode 100644 index df9787fe..00000000 --- a/src/net/gameserver/internal.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_GAMESERVER_INTERNAL_H -#define _TMW_NET_GAMESERVER_INTERNAL_H - -namespace Net -{ - class Connection; - - namespace GameServer - { - extern Connection *connection; - } -} - -#endif diff --git a/src/net/gameserver/player.cpp b/src/net/gameserver/player.cpp deleted file mode 100644 index 95c13ec2..00000000 --- a/src/net/gameserver/player.cpp +++ /dev/null @@ -1,202 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "player.h" - -#include "internal.h" - -#include "../connection.h" -#include "../messageout.h" -#include "../protocol.h" - -void RespawnRequestListener::action(const gcn::ActionEvent &event) -{ - Net::GameServer::Player::respawn(); -} - -void Net::GameServer::Player::say(const std::string &text) -{ - MessageOut msg(PGMSG_SAY); - msg.writeString(text); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::walk(int x, int y) -{ - MessageOut msg(PGMSG_WALK); - msg.writeInt16(x); - msg.writeInt16(y); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::pickUp(int x, int y) -{ - MessageOut msg(PGMSG_PICKUP); - msg.writeInt16(x); - msg.writeInt16(y); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::moveItem(int oldSlot, int newSlot, int amount) -{ - MessageOut msg(PGMSG_MOVE_ITEM); - msg.writeInt8(oldSlot); - msg.writeInt8(newSlot); - msg.writeInt8(amount); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::drop(int slot, int amount) -{ - MessageOut msg(PGMSG_DROP); - msg.writeInt8(slot); - msg.writeInt8(amount); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::equip(int slot) -{ - MessageOut msg(PGMSG_EQUIP); - msg.writeInt8(slot); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::unequip(int slot) -{ - MessageOut msg(PGMSG_UNEQUIP); - msg.writeInt8(slot); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::useItem(int slot) -{ - MessageOut msg(PGMSG_USE_ITEM); - msg.writeInt8(slot); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::attack(int direction) -{ - MessageOut msg(PGMSG_ATTACK); - msg.writeInt8(direction); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::useSpecial(int special) -{ - MessageOut msg(PGMSG_USE_SPECIAL); - msg.writeInt8(special); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::changeAction(Being::Action action) -{ - MessageOut msg(PGMSG_ACTION_CHANGE); - msg.writeInt8(action); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::talkToNPC(int id, bool restart) -{ - MessageOut msg(restart ? PGMSG_NPC_TALK : PGMSG_NPC_TALK_NEXT); - msg.writeInt16(id); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::selectFromNPC(int id, int choice) -{ - MessageOut msg(PGMSG_NPC_SELECT); - msg.writeInt16(id); - msg.writeInt8(choice); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::requestTrade(int id) -{ - MessageOut msg(PGMSG_TRADE_REQUEST); - msg.writeInt16(id); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::acceptTrade(bool accept) -{ - MessageOut msg(accept ? PGMSG_TRADE_ACCEPT : PGMSG_TRADE_CANCEL); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::tradeItem(int slot, int amount) -{ - MessageOut msg(PGMSG_TRADE_ADD_ITEM); - msg.writeInt8(slot); - msg.writeInt8(amount); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::tradeMoney(int amount) -{ - MessageOut msg(PGMSG_TRADE_SET_MONEY); - msg.writeInt32(amount); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::tradeWithNPC(int item, int amount) -{ - MessageOut msg(PGMSG_NPC_BUYSELL); - msg.writeInt16(item); - msg.writeInt16(amount); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::sendLetter(const std::string &player, - const std::string &text) -{ - MessageOut msg(PGMSG_NPC_POST_SEND); - msg.writeString(player); - msg.writeString(text); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::raiseAttribute(int attribute) -{ - MessageOut msg(PGMSG_RAISE_ATTRIBUTE); - msg.writeInt8(attribute); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::lowerAttribute(int attribute) -{ - MessageOut msg(PGMSG_LOWER_ATTRIBUTE); - msg.writeInt8(attribute); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::respawn() -{ - MessageOut msg(PGMSG_RESPAWN); - Net::GameServer::connection->send(msg); -} - -void Net::GameServer::Player::changeDir(unsigned char dir) -{ - MessageOut msg(PGMSG_DIRECTION_CHANGE); - msg.writeInt8(dir); - Net::GameServer::connection->send(msg); -} diff --git a/src/net/gameserver/player.h b/src/net/gameserver/player.h deleted file mode 100644 index 9e68ced9..00000000 --- a/src/net/gameserver/player.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_GAMESERVER_PLAYER_H -#define _TMW_NET_GAMESERVER_PLAYER_H - -#include "../../being.h" - -#include - -#include - - -struct RespawnRequestListener : public gcn::ActionListener -{ - void action(const gcn::ActionEvent &event); -}; - -namespace Net -{ - namespace GameServer - { - namespace Player - { - void say(const std::string &text); - void walk(int x, int y); - void pickUp(int x, int y); - void moveItem(int oldSlot, int newSlot, int amount); - void drop(int slot, int amount); - void equip(int slot); - void unequip(int slot); - void useItem(int slot); - void attack(int direction); - void useSpecial(int special); - void changeAction(Being::Action action); - void talkToNPC(int id, bool restart); - void selectFromNPC(int id, int choice); - void requestTrade(int id); - void acceptTrade(bool accept); - void tradeItem(int slot, int amount); - void tradeMoney(int amount); - void tradeWithNPC(int item, int amount); - void sendLetter(const std::string &player, const std::string &text); - void raiseAttribute(int attribute); - void lowerAttribute(int attribute); - void respawn(); - static RespawnRequestListener respawnListener; - void changeDir(unsigned char dir); - } - } -} - -#endif diff --git a/src/net/guildhandler.cpp b/src/net/guildhandler.cpp deleted file mode 100644 index cf886ab3..00000000 --- a/src/net/guildhandler.cpp +++ /dev/null @@ -1,240 +0,0 @@ -/* - * The Mana World - * Copyright 2008 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include "guildhandler.h" - -#include "protocol.h" -#include "messagein.h" - -#include "chatserver/chatserver.h" -#include "chatserver/guild.h" - -#include "../gui/guildwindow.h" -#include "../gui/chat.h" -#include "../guild.h" -#include "../log.h" -#include "../localplayer.h" -#include "../channel.h" -#include "../channelmanager.h" - -GuildHandler::GuildHandler() -{ - static const Uint16 _messages[] = { - CPMSG_GUILD_CREATE_RESPONSE, - CPMSG_GUILD_INVITE_RESPONSE, - CPMSG_GUILD_ACCEPT_RESPONSE, - CPMSG_GUILD_GET_MEMBERS_RESPONSE, - CPMSG_GUILD_UPDATE_LIST, - CPMSG_GUILD_INVITED, - CPMSG_GUILD_REJOIN, - CPMSG_GUILD_QUIT_RESPONSE, - 0 - }; - handledMessages = _messages; - -} - -void GuildHandler::handleMessage(MessageIn &msg) -{ - switch (msg.getId()) - { - case CPMSG_GUILD_CREATE_RESPONSE: - { - logger->log("Received CPMSG_GUILD_CREATE_RESPONSE"); - if(msg.readInt8() == ERRMSG_OK) - { - // TODO - Acknowledge guild was created - chatWindow->chatLog("Guild created."); - joinedGuild(msg); - } - else - { - chatWindow->chatLog("Error creating guild."); - } - } break; - - case CPMSG_GUILD_INVITE_RESPONSE: - { - logger->log("Received CPMSG_GUILD_INVITE_RESPONSE"); - if(msg.readInt8() == ERRMSG_OK) - { - // TODO - Acknowledge invite was sent - chatWindow->chatLog("Invite sent."); - } - } break; - - case CPMSG_GUILD_ACCEPT_RESPONSE: - { - logger->log("Received CPMSG_GUILD_ACCEPT_RESPONSE"); - if(msg.readInt8() == ERRMSG_OK) - { - // TODO - Acknowledge accepted into guild - joinedGuild(msg); - } - } break; - - case CPMSG_GUILD_GET_MEMBERS_RESPONSE: - { - logger->log("Received CPMSG_GUILD_GET_MEMBERS_RESPONSE"); - if(msg.readInt8() == ERRMSG_OK) - { - std::string guildMember; - bool online; - std::string guildName; - Guild *guild; - - short guildId = msg.readInt16(); - guild = player_node->getGuild(guildId); - - if (!guild) - return; - - guildName = guild->getName(); - - while(msg.getUnreadLength()) - { - guildMember = msg.readString(); - online = msg.readInt8(); - if(guildMember != "") - { - guild->addMember(guildMember); - guildWindow->setOnline(guildName, guildMember, online); - } - } - - guildWindow->updateTab(); - } - } break; - - case CPMSG_GUILD_UPDATE_LIST: - { - logger->log("Received CPMSG_GUILD_UPDATE_LIST"); - short guildId = msg.readInt16(); - std::string guildMember = msg.readString(); - char eventId = msg.readInt8(); - - Guild *guild = player_node->getGuild(guildId); - if (guild) - { - switch(eventId) - { - case GUILD_EVENT_NEW_PLAYER: - guild->addMember(guildMember); - guildWindow->setOnline(guild->getName(), guildMember, true); - break; - - case GUILD_EVENT_LEAVING_PLAYER: - guild->removeMember(guildMember); - break; - - case GUILD_EVENT_ONLINE_PLAYER: - guildWindow->setOnline(guild->getName(), guildMember, true); - break; - - case GUILD_EVENT_OFFLINE_PLAYER: - guildWindow->setOnline(guild->getName(), guildMember, false); - break; - - default: - logger->log("Invalid guild event"); - } - } - guildWindow->updateTab(); - - - } break; - - case CPMSG_GUILD_INVITED: - { - logger->log("Received CPMSG_GUILD_INVITED"); - std::string inviterName = msg.readString(); - std::string guildName = msg.readString(); - - // Open a dialog asking if the player accepts joining the guild. - guildWindow->openAcceptDialog(inviterName, guildName); - } break; - - case CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE: - { - logger->log("Received CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE"); - - if (msg.readInt8() == ERRMSG_OK) - { - // promotion succeeded - chatWindow->chatLog("Member was promoted successfully"); - } - else - { - // promotion failed - chatWindow->chatLog("Failed to promote member"); - } - } - - case CPMSG_GUILD_REJOIN: - { - logger->log("Received CPMSG_GUILD_REJOIN"); - - joinedGuild(msg); - } break; - - case CPMSG_GUILD_QUIT_RESPONSE: - { - logger->log("Received CPMSG_GUILD_QUIT_RESPONSE"); - - if (msg.readInt8() == ERRMSG_OK) - { - // Must remove tab first, as it wont find the guild - // name after its removed from the player - int guildId = msg.readInt16(); - Guild *guild = player_node->getGuild(guildId); - if (guild) - { - chatWindow->removeChannel(guild->getName()); - guildWindow->removeTab(guildId); - player_node->removeGuild(guildId); - } - } - } break; - } -} - -void GuildHandler::joinedGuild(MessageIn &msg) -{ - std::string guildName = msg.readString(); - short guildId = msg.readInt16(); - short permissions = msg.readInt16(); - short channelId = msg.readInt16(); - std::string announcement = msg.readString(); - - // Add guild to player and create new guild tab - Guild *guild = player_node->addGuild(guildId, permissions); - guild->setName(guildName); - guildWindow->newGuildTab(guildName); - guildWindow->requestMemberList(guildId); - - // Automatically create the guild channel - // COMMENT: Should this go here?? - Channel *channel = new Channel(channelId, guildName, announcement); - channelManager->addChannel(channel); - chatWindow->createNewChannelTab(guildName); - chatWindow->chatLog("Topic: " + announcement, BY_CHANNEL, guildName); -} diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h deleted file mode 100644 index 4eb2da0b..00000000 --- a/src/net/guildhandler.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * The Mana World - * Copyright 2008 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_GUILDHANDLER_H -#define _TMW_NET_GUILDHANDLER_H - -#include "messagehandler.h" - -#include - -class GuildHandler : public MessageHandler -{ -public: - GuildHandler(); - - void handleMessage(MessageIn &msg); - -protected: - void joinedGuild(MessageIn &msg); -}; - -#endif diff --git a/src/net/internal.cpp b/src/net/internal.cpp deleted file mode 100644 index 4cb88a4e..00000000 --- a/src/net/internal.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "internal.h" - -namespace Net -{ - int connections = 0; -} diff --git a/src/net/internal.h b/src/net/internal.h deleted file mode 100644 index 1e411605..00000000 --- a/src/net/internal.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_INTERNAL_H -#define _TMW_NET_INTERNAL_H - -namespace Net -{ - extern int connections; -} - -#endif diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp deleted file mode 100644 index 41032f13..00000000 --- a/src/net/inventoryhandler.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "inventoryhandler.h" - -#include - -#include "messagein.h" -#include "protocol.h" - -#include "../equipment.h" -#include "../inventory.h" -#include "../item.h" -#include "../itemshortcut.h" -#include "../localplayer.h" - -#include "../gui/chat.h" -#include "../resources/iteminfo.h" - -InventoryHandler::InventoryHandler() -{ - static const Uint16 _messages[] = { - GPMSG_INVENTORY_FULL, - GPMSG_INVENTORY, - 0 - }; - handledMessages = _messages; -} - -void InventoryHandler::handleMessage(MessageIn &msg) -{ - switch (msg.getId()) - { - case GPMSG_INVENTORY_FULL: - player_node->clearInventory(); - // no break! - - case GPMSG_INVENTORY: - while (msg.getUnreadLength()) - { - int slot = msg.readInt8(); - if (slot == 255) - { - player_node->setMoney(msg.readInt32()); - continue; - } - - int id = msg.readInt16(); - if (slot < EQUIPMENT_SIZE) - { - player_node->mEquipment->setEquipment(slot, id); - } - else if (slot >= 32 && slot < 32 + INVENTORY_SIZE) - { - int amount = id ? msg.readInt8() : 0; - player_node->setInvItem(slot - 32, id, amount); - } - }; - break; - } -} diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h deleted file mode 100644 index 9b457abe..00000000 --- a/src/net/inventoryhandler.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef NET_INVENTORYHANDLER_H -#define NET_INVENTORYHANDLER_H - -#include "messagehandler.h" - -class InventoryHandler : public MessageHandler -{ - public: - InventoryHandler(); - - void handleMessage(MessageIn &msg); -}; - -#endif diff --git a/src/net/itemhandler.cpp b/src/net/itemhandler.cpp deleted file mode 100644 index 189c6eb9..00000000 --- a/src/net/itemhandler.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "itemhandler.h" -#include "messagein.h" -#include "protocol.h" - -#include "../engine.h" -#include "../flooritemmanager.h" - -ItemHandler::ItemHandler() -{ - static const Uint16 _messages[] = { - GPMSG_ITEMS, - GPMSG_ITEM_APPEAR, - 0 - }; - handledMessages = _messages; -} - -void ItemHandler::handleMessage(MessageIn &msg) -{ - switch (msg.getId()) - { - case GPMSG_ITEM_APPEAR: - case GPMSG_ITEMS: - { - while (msg.getUnreadLength()) - { - int itemId = msg.readInt16(); - int x = msg.readInt16(); - int y = msg.readInt16(); - int id = (x << 16) | y; // dummy id - - if (itemId) - { - floorItemManager->create(id, itemId, x / 32, y / 32, engine->getCurrentMap()); - } - else if (FloorItem *item = floorItemManager->findById(id)) - { - floorItemManager->destroy(item); - } - } - } break; - } -} diff --git a/src/net/itemhandler.h b/src/net/itemhandler.h deleted file mode 100644 index 12057bb1..00000000 --- a/src/net/itemhandler.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef NET_ITEMHANDLER_H -#define NET_ITEMHANDLER_H - -#include "messagehandler.h" - -class ItemHandler : public MessageHandler -{ - public: - ItemHandler(); - - void handleMessage(MessageIn &msg); -}; - -#endif diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp deleted file mode 100644 index 37c3608a..00000000 --- a/src/net/loginhandler.cpp +++ /dev/null @@ -1,225 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "loginhandler.h" - -#include "messagein.h" -#include "protocol.h" - -#include "../logindata.h" -#include "../main.h" - -LoginHandler::LoginHandler() -{ - static const Uint16 _messages[] = { - APMSG_LOGIN_RESPONSE, - APMSG_REGISTER_RESPONSE, - APMSG_RECONNECT_RESPONSE, - APMSG_PASSWORD_CHANGE_RESPONSE, - APMSG_EMAIL_CHANGE_RESPONSE, - 0 - }; - handledMessages = _messages; -} - -void LoginHandler::setLoginData(LoginData *loginData) -{ - mLoginData = loginData; -} - -void LoginHandler::handleMessage(MessageIn &msg) -{ - switch (msg.getId()) - { - case APMSG_LOGIN_RESPONSE: - handleLoginResponse(msg); - break; - case APMSG_REGISTER_RESPONSE: - handleRegisterResponse(msg); - break; - case APMSG_RECONNECT_RESPONSE: - { - int errMsg = msg.readInt8(); - // Successful login - if (errMsg == ERRMSG_OK) - { - state = STATE_CHAR_SELECT; - } - // Login failed - else - { - switch (errMsg) { - case ERRMSG_INVALID_ARGUMENT: - errorMessage = "Wrong magic_token"; - break; - case ERRMSG_FAILURE: - errorMessage = "Already logged in"; - break; - case LOGIN_SERVER_FULL: - errorMessage = "Server is full"; - break; - default: - errorMessage = "Unknown error"; - break; - } - state = STATE_ERROR; - } - } - break; - - case APMSG_PASSWORD_CHANGE_RESPONSE: - { - int errMsg = msg.readInt8(); - // Successful pass change - if (errMsg == ERRMSG_OK) - { - state = STATE_CHANGEPASSWORD; - } - // pass change failed - else - { - switch (errMsg) { - case ERRMSG_INVALID_ARGUMENT: - errorMessage = "New password incorrect"; - break; - case ERRMSG_FAILURE: - errorMessage = "Old password incorrect"; - break; - case ERRMSG_NO_LOGIN: - errorMessage = "Account not connected. Please login first."; - break; - default: - errorMessage = "Unknown error"; - break; - } - state = STATE_ACCOUNTCHANGE_ERROR; - } - } - break; - - case APMSG_EMAIL_CHANGE_RESPONSE: - { - int errMsg = msg.readInt8(); - // Successful pass change - if (errMsg == ERRMSG_OK) - { - state = STATE_CHANGEEMAIL; - } - // pass change failed - else - { - switch (errMsg) { - case ERRMSG_INVALID_ARGUMENT: - errorMessage = "New email address incorrect"; - break; - case ERRMSG_FAILURE: - errorMessage = "Old email address incorrect"; - break; - case ERRMSG_NO_LOGIN: - errorMessage = "Account not connected. Please login first."; - break; - case ERRMSG_EMAIL_ALREADY_EXISTS: - errorMessage = "The new Email Address already exists."; - break; - default: - errorMessage = "Unknown error"; - break; - } - state = STATE_ACCOUNTCHANGE_ERROR; - } - } - break; - - } -} - -void LoginHandler::handleLoginResponse(MessageIn &msg) -{ - const int errMsg = msg.readInt8(); - - if (errMsg == ERRMSG_OK) - { - readUpdateHost(msg); - state = STATE_CHAR_SELECT; - } - else - { - switch (errMsg) { - case LOGIN_INVALID_VERSION: - errorMessage = "Client version is too old"; - break; - case ERRMSG_INVALID_ARGUMENT: - errorMessage = "Wrong username or password"; - break; - case ERRMSG_FAILURE: - errorMessage = "Already logged in"; - break; - case LOGIN_SERVER_FULL: - errorMessage = "Server is full"; - break; - default: - errorMessage = "Unknown error"; - break; - } - state = STATE_LOGIN_ERROR; - } -} - -void LoginHandler::handleRegisterResponse(MessageIn &msg) -{ - const int errMsg = msg.readInt8(); - - if (errMsg == ERRMSG_OK) - { - readUpdateHost(msg); - state = STATE_CHAR_SELECT; - } - else - { - switch (errMsg) { - case REGISTER_INVALID_VERSION: - errorMessage = "Client version is too old"; - break; - case ERRMSG_INVALID_ARGUMENT: - errorMessage = "Wrong username, password or email address"; - break; - case REGISTER_EXISTS_USERNAME: - errorMessage = "Username already exists"; - break; - case REGISTER_EXISTS_EMAIL: - errorMessage = "Email address already exists"; - break; - default: - errorMessage = "Unknown error"; - break; - } - state = STATE_LOGIN_ERROR; - } -} - -void LoginHandler::readUpdateHost(MessageIn &msg) -{ - // Set the update host when included in the message - if (msg.getUnreadLength() > 0) - { - mLoginData->updateHost = msg.readString(); - } -} diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h deleted file mode 100644 index 015d6383..00000000 --- a/src/net/loginhandler.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_LOGINHANDLER_H -#define _TMW_NET_LOGINHANDLER_H - -#include "messagehandler.h" - -class LoginData; - -class LoginHandler : public MessageHandler -{ - public: - LoginHandler(); - - void setLoginData(LoginData *loginData); - - void handleMessage(MessageIn &msg); - - private: - void handleLoginResponse(MessageIn &msg); - void handleRegisterResponse(MessageIn &msg); - - void readUpdateHost(MessageIn &msg); - - LoginData *mLoginData; -}; - -#endif // _TMW_NET_LOGINHANDLER_H diff --git a/src/net/logouthandler.cpp b/src/net/logouthandler.cpp deleted file mode 100644 index 6dea4c83..00000000 --- a/src/net/logouthandler.cpp +++ /dev/null @@ -1,215 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "logouthandler.h" - -#include "messagein.h" -#include "protocol.h" - -#include "../main.h" - -LogoutHandler::LogoutHandler(): -mPassToken(NULL), mScenario(LOGOUT_EXIT), -mLoggedOutAccount(false), mLoggedOutGame(false), mLoggedOutChat(false) -{ - static const Uint16 _messages[] = { - APMSG_LOGOUT_RESPONSE, - APMSG_UNREGISTER_RESPONSE, - GPMSG_DISCONNECT_RESPONSE, - CPMSG_DISCONNECT_RESPONSE, - 0 - }; - handledMessages = _messages; -} - -void LogoutHandler::handleMessage(MessageIn &msg) -{ - switch (msg.getId()) - { - case APMSG_LOGOUT_RESPONSE: - { - int errMsg = msg.readInt8(); - - // Successful logout - if (errMsg == ERRMSG_OK) - { - mLoggedOutAccount = true; - - switch (mScenario) - { - case LOGOUT_SWITCH_ACCOUNTSERVER: - if (mLoggedOutGame && mLoggedOutChat) - state = STATE_SWITCH_ACCOUNTSERVER; - break; - - case LOGOUT_EXIT: - default: - if (mLoggedOutGame && mLoggedOutChat) - state = STATE_FORCE_QUIT; - break; - } - } - // Logout failed - else - { - switch (errMsg) { - case ERRMSG_NO_LOGIN: - errorMessage = "Accountserver: Not logged in"; - break; - default: - errorMessage = "Accountserver: Unknown error"; - break; - } - state = STATE_ERROR; - } - } - break; - case APMSG_UNREGISTER_RESPONSE: - { - int errMsg = msg.readInt8(); - // Successful unregistration - if (errMsg == ERRMSG_OK) - { - state = STATE_UNREGISTER; - } - // Unregistration failed - else - { - switch (errMsg) { - case ERRMSG_INVALID_ARGUMENT: - errorMessage = - "Accountserver: Wrong username or password"; - break; - default: - errorMessage = "Accountserver: Unknown error"; - break; - } - state = STATE_ACCOUNTCHANGE_ERROR; - } - } - break; - case GPMSG_DISCONNECT_RESPONSE: - { - int errMsg = msg.readInt8(); - // Successful logout - if (errMsg == ERRMSG_OK) - { - mLoggedOutGame = true; - - switch (mScenario) - { - case LOGOUT_SWITCH_CHARACTER: - if (mPassToken) - { - *mPassToken = msg.readString(32); - mPassToken = NULL; - } - if (mLoggedOutChat) state = STATE_RECONNECT_ACCOUNT; - break; - - case LOGOUT_SWITCH_ACCOUNTSERVER: - if (mLoggedOutAccount && mLoggedOutChat) - state = STATE_SWITCH_ACCOUNTSERVER; - break; - - case LOGOUT_EXIT: - default: - if (mLoggedOutAccount && mLoggedOutChat) - state = STATE_FORCE_QUIT; - break; - } - } - // Logout failed - else - { - switch (errMsg) { - case ERRMSG_NO_LOGIN: - errorMessage = "Gameserver: Not logged in"; - break; - default: - errorMessage = "Gameserver: Unknown error"; - break; - } - state = STATE_ERROR; - } - } - break; - case CPMSG_DISCONNECT_RESPONSE: - { - int errMsg = msg.readInt8(); - // Successful logout - if (errMsg == ERRMSG_OK) - { - mLoggedOutChat = true; - - switch (mScenario) - { - case LOGOUT_SWITCH_CHARACTER: - if (mLoggedOutGame) state = STATE_RECONNECT_ACCOUNT; - break; - - case LOGOUT_SWITCH_ACCOUNTSERVER: - if (mLoggedOutAccount && mLoggedOutGame) - state = STATE_SWITCH_ACCOUNTSERVER; - break; - - case LOGOUT_EXIT: - default: - if (mLoggedOutAccount && mLoggedOutGame) - { - state = STATE_FORCE_QUIT; - } - break; - } - } - else - { - switch (errMsg) { - case ERRMSG_NO_LOGIN: - errorMessage = "Chatserver: Not logged in"; - break; - default: - errorMessage = "Chatserver: Unknown error"; - break; - } - state = STATE_ERROR; - } - } - break; - } -} - -void -LogoutHandler::setScenario(unsigned short scenario, std::string* passToken) -{ - mScenario = scenario; - mPassToken = passToken; -} - -void -LogoutHandler::reset() -{ - mPassToken = NULL; - mScenario = LOGOUT_EXIT; - mLoggedOutAccount = false; - mLoggedOutGame = false; - mLoggedOutChat = false; -} diff --git a/src/net/logouthandler.h b/src/net/logouthandler.h deleted file mode 100644 index 369eaa80..00000000 --- a/src/net/logouthandler.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_LOGOUTHANDLER_H -#define _TMW_NET_LOGOUTHANDLER_H - -#include - -#include "messagehandler.h" - -/** - * The different scenarios for which LogoutHandler can be used - */ -enum { - LOGOUT_EXIT, - LOGOUT_SWITCH_ACCOUNTSERVER, - LOGOUT_SWITCH_CHARACTER -}; - -class LogoutHandler : public MessageHandler -{ - public: - LogoutHandler(); - - void handleMessage(MessageIn &msg); - - void setScenario(unsigned short scenario, - std::string* passToken = NULL); - - void reset(); - - void setAccountLoggedOut(){ mLoggedOutAccount = true; } - void setGameLoggedOut(){ mLoggedOutGame = true; } - void setChatLoggedOut(){ mLoggedOutChat = true; } - - private: - std::string* mPassToken; - unsigned short mScenario; - bool mLoggedOutAccount; - bool mLoggedOutGame; - bool mLoggedOutChat; -}; - -#endif diff --git a/src/net/messagehandler.cpp b/src/net/messagehandler.cpp index a765d0e8..85f10090 100644 --- a/src/net/messagehandler.cpp +++ b/src/net/messagehandler.cpp @@ -23,7 +23,7 @@ #include "messagehandler.h" #ifdef TMWSERV_SUPPORT -#include "network.h" +#include "tmwserv/network.h" #else #include "ea/network.h" #endif diff --git a/src/net/network.cpp b/src/net/network.cpp deleted file mode 100644 index 57e368e2..00000000 --- a/src/net/network.cpp +++ /dev/null @@ -1,169 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "network.h" - -#include - -#include - -#include "connection.h" -#include "internal.h" -#include "messagehandler.h" -#include "messagein.h" - -#include "../log.h" - -/** - * The local host which is shared for all outgoing connections. - */ -namespace { - ENetHost *client; -} - -typedef std::map MessageHandlers; -typedef MessageHandlers::iterator MessageHandlerIterator; -static MessageHandlers mMessageHandlers; - -void Net::initialize() -{ - if (enet_initialize()) - { - logger->error("Failed to initialize ENet."); - } - - client = enet_host_create(NULL, 3, 0, 0); - - if (!client) - { - logger->error("Failed to create the local host."); - } -} - -void Net::finalize() -{ - if (!client) - return; // Wasn't initialized at all - - if (Net::connections) { - logger->error("Tried to shutdown the network subsystem while there " - "are network connections left!"); - } - - clearHandlers(); - enet_deinitialize(); -} - -Net::Connection *Net::getConnection() -{ - if (!client) - { - logger->error("Tried to instantiate a network object before " - "initializing the network subsystem!"); - } - - return new Net::Connection(client); -} - -void Net::registerHandler(MessageHandler *handler) -{ - for (const Uint16 *i = handler->handledMessages; *i; i++) - { - mMessageHandlers[*i] = handler; - } -} - -void Net::unregisterHandler(MessageHandler *handler) -{ - for (const Uint16 *i = handler->handledMessages; *i; i++) - { - mMessageHandlers.erase(*i); - } -} - -void Net::clearHandlers() -{ - mMessageHandlers.clear(); -} - - -/** - * Dispatches a message to the appropriate message handler and - * destroys it afterwards. - */ -namespace -{ - void dispatchMessage(ENetPacket *packet) - { - MessageIn msg((const char *)packet->data, packet->dataLength); - - MessageHandlerIterator iter = mMessageHandlers.find(msg.getId()); - - if (iter != mMessageHandlers.end()) { - //logger->log("Received packet %x (%i B)", - // msg.getId(), msg.getLength()); - iter->second->handleMessage(msg); - } - else { - logger->log("Unhandled packet %x (%i B)", - msg.getId(), msg.getLength()); - } - - // Clean up the packet now that we're done using it. - enet_packet_destroy(packet); - } -} - -void Net::flush() -{ - ENetEvent event; - - // Wait up to 10 milliseconds for an event. - while (enet_host_service(client, &event, 10) > 0) - { - switch (event.type) - { - case ENET_EVENT_TYPE_CONNECT: - logger->log("Connected to port %d.", event.peer->address.port); - // Store any relevant server information here. - event.peer->data = 0; - break; - - case ENET_EVENT_TYPE_RECEIVE: - dispatchMessage(event.packet); - break; - - case ENET_EVENT_TYPE_DISCONNECT: - logger->log("Disconnected."); - // Reset the server information. - event.peer->data = 0; - break; - - case ENET_EVENT_TYPE_NONE: - logger->log("No event during 10 milliseconds."); - break; - - default: - logger->log("Unhandled enet event."); - break; - } - } -} diff --git a/src/net/network.h b/src/net/network.h deleted file mode 100644 index 13576e79..00000000 --- a/src/net/network.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_NETWORK_H -#define _TMW_NET_NETWORK_H - -#include - -/** - * \defgroup Network Core network layer - */ - -class MessageHandler; -class MessageOut; - -/** - * \ingroup Network - */ -namespace Net -{ - class Connection; - - /** - * Initializes the network subsystem. - */ - void initialize(); - - /** - * Finalizes the network subsystem. - */ - void finalize(); - - /** - * Returns a new Connection object. Should be deleted by the caller. - */ - Connection *getConnection(); - - /** - * Registers a message handler. A message handler handles a certain - * subset of incoming messages. - */ - void registerHandler(MessageHandler *handler); - - /** - * Unregisters a message handler. - */ - void unregisterHandler(MessageHandler *handler); - - /** - * Clears all registered message handlers. - */ - void clearHandlers(); - - /* - * Handles all events and dispatches incoming messages to the - * registered handlers - */ - void flush(); -} - -#endif diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp deleted file mode 100644 index 30507537..00000000 --- a/src/net/npchandler.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "npchandler.h" - -#include "messagein.h" -#include "protocol.h" - -#include "../beingmanager.h" -#include "../npc.h" - -#include "../gui/npclistdialog.h" -#include "../gui/npcpostdialog.h" -#include "../gui/npc_text.h" - -extern NpcListDialog *npcListDialog; -extern NpcTextDialog *npcTextDialog; -extern NpcPostDialog *npcPostDialog; - -NPCHandler::NPCHandler() -{ - static const Uint16 _messages[] = { - GPMSG_NPC_CHOICE, - GPMSG_NPC_POST, - GPMSG_NPC_MESSAGE, - GPMSG_NPC_ERROR, - 0 - }; - handledMessages = _messages; -} - -void NPCHandler::handleMessage(MessageIn &msg) -{ - Being *being = beingManager->findBeing(msg.readInt16()); - if (!being || being->getType() != Being::NPC) - { - return; - } - - current_npc = static_cast< NPC * >(being); - - switch (msg.getId()) - { - case GPMSG_NPC_CHOICE: - npcListDialog->reset(); - while (msg.getUnreadLength()) - { - npcListDialog->addItem(msg.readString()); - } - npcListDialog->setVisible(true); - break; - - case GPMSG_NPC_POST: - npcTextDialog->setVisible(false); - npcPostDialog->clear(); - npcPostDialog->setVisible(true); - break; - - case GPMSG_NPC_ERROR: - current_npc = NULL; - case GPMSG_NPC_MESSAGE: - npcTextDialog->addText(msg.readString(msg.getUnreadLength())); - npcListDialog->setVisible(false); - npcTextDialog->setVisible(true); - npcPostDialog->setVisible(false); - break; - } -} diff --git a/src/net/npchandler.h b/src/net/npchandler.h deleted file mode 100644 index 18ab0a05..00000000 --- a/src/net/npchandler.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef NET_NPCHANDLER_H -#define NET_NPCHANDLER_H - -#include "messagehandler.h" - -class NPCHandler : public MessageHandler -{ - public: - NPCHandler(); - - void handleMessage(MessageIn &msg); -}; - -#endif diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp deleted file mode 100644 index 60c51821..00000000 --- a/src/net/partyhandler.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/* - * The Mana World - * Copyright 2008 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include "partyhandler.h" - -#include "protocol.h" -#include "messagein.h" - -#include "chatserver/chatserver.h" - -#include "../gui/chat.h" -#include "../gui/partywindow.h" -#include "../log.h" -#include "../localplayer.h" - -PartyHandler::PartyHandler() -{ - static const Uint16 _messages[] = { - CPMSG_PARTY_INVITE_RESPONSE, - CPMSG_PARTY_INVITED, - CPMSG_PARTY_ACCEPT_INVITE_RESPONSE, - CPMSG_PARTY_QUIT_RESPONSE, - CPMSG_PARTY_NEW_MEMBER, - CPMSG_PARTY_MEMBER_LEFT, - 0 - }; - handledMessages = _messages; - -} - -void PartyHandler::handleMessage(MessageIn &msg) -{ - switch (msg.getId()) - { - case CPMSG_PARTY_INVITE_RESPONSE: - { - if (msg.readInt8() == ERRMSG_OK) - { - - } - } break; - - case CPMSG_PARTY_INVITED: - { - std::string inviter = msg.readString(); - partyWindow->showPartyInvite(inviter); - } break; - - case CPMSG_PARTY_ACCEPT_INVITE_RESPONSE: - { - if (msg.readInt8() == ERRMSG_OK) - { - player_node->setInParty(true); - chatWindow->chatLog("Joined party"); - } - } - - case CPMSG_PARTY_QUIT_RESPONSE: - { - if (msg.readInt8() == ERRMSG_OK) - { - player_node->setInParty(false); - } - } break; - - case CPMSG_PARTY_NEW_MEMBER: - { - msg.readInt16(); // being id - std::string name = msg.readString(); - - chatWindow->chatLog(name + " joined the party"); - - if (!player_node->getInParty()) - player_node->setInParty(true); - - partyWindow->addPartyMember(name); - } break; - - case CPMSG_PARTY_MEMBER_LEFT: - { - partyWindow->removePartyMember(msg.readString()); - } break; - } -} diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h deleted file mode 100644 index b4257c34..00000000 --- a/src/net/partyhandler.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * The Mana World - * Copyright 2008 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_NET_PARTYHANDLER_H -#define _TMW_NET_PARTYHANDLER_H - -#include "messagehandler.h" - -#include - -class PartyHandler : public MessageHandler -{ -public: - PartyHandler(); - - void handleMessage(MessageIn &msg); - -protected: - -}; - -#endif - diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp deleted file mode 100644 index b4e2f328..00000000 --- a/src/net/playerhandler.cpp +++ /dev/null @@ -1,327 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "playerhandler.h" - -#include "messagein.h" -#include "protocol.h" - -#include "../engine.h" -#include "../localplayer.h" -#include "../log.h" -#include "../particle.h" -#include "../npc.h" - -#include "../gui/buy.h" -#include "../gui/chat.h" -#include "../gui/gui.h" -#include "../gui/npclistdialog.h" -#include "../gui/npc_text.h" -#include "../gui/ok_dialog.h" -#include "../gui/sell.h" -#include "../gui/skill.h" -#include "../gui/viewport.h" - -// TODO Move somewhere else -OkDialog *weightNotice = NULL; -OkDialog *deathNotice = NULL; - -extern NpcListDialog *npcListDialog; -extern NpcTextDialog *npcTextDialog; -extern BuyDialog *buyDialog; -extern SellDialog *sellDialog; -extern Window *buySellDialog; - -/* Max. distance we are willing to scroll after a teleport; - * everything beyond will reset the port hard. - */ -static const int MAP_TELEPORT_SCROLL_DISTANCE = 8 * 32; - -/** - * Listener used for handling the overweigth message. - */ -// TODO Move somewhere else -namespace { - struct WeightListener : public gcn::ActionListener - { - void action(const gcn::ActionEvent &event) - { - weightNotice = NULL; - } - } weightListener; -} - -/** - * Listener used for handling death message. - */ -// TODO Move somewhere else -namespace { - struct DeathListener : public gcn::ActionListener - { - void action(const gcn::ActionEvent &event) - { - player_node->revive(); - deathNotice = NULL; - npcListDialog->setVisible(false); - npcTextDialog->setVisible(false); - buyDialog->setVisible(false); - sellDialog->setVisible(false); - buySellDialog->setVisible(false); - current_npc = 0; - } - } deathListener; -} - -PlayerHandler::PlayerHandler() -{ - static const Uint16 _messages[] = { - GPMSG_PLAYER_MAP_CHANGE, - GPMSG_PLAYER_SERVER_CHANGE, - GPMSG_PLAYER_ATTRIBUTE_CHANGE, - GPMSG_PLAYER_EXP_CHANGE, - GPMSG_LEVELUP, - GPMSG_LEVEL_PROGRESS, - GPMSG_RAISE_ATTRIBUTE_RESPONSE, - GPMSG_LOWER_ATTRIBUTE_RESPONSE, - 0 - }; - handledMessages = _messages; -} - -void PlayerHandler::handleMessage(MessageIn &msg) -{ - switch (msg.getId()) - { - case GPMSG_PLAYER_MAP_CHANGE: - handleMapChangeMessage(msg); - break; - - case GPMSG_PLAYER_SERVER_CHANGE: - { // TODO: Implement reconnecting to another game server - std::string token = msg.readString(32); - std::string address = msg.readString(); - int port = msg.readInt16(); - logger->log("Changing server to %s:%d", address.c_str(), port); - } break; - - case GPMSG_PLAYER_ATTRIBUTE_CHANGE: - { - logger->log("ATTRIBUTE UPDATE:"); - while (msg.getUnreadLength()) - { - int stat = msg.readInt8(); - int base = msg.readInt16(); - int value = msg.readInt16(); - logger->log("%d set to %d %d", stat, base, value); - - if (stat == BASE_ATTR_HP) - { - player_node->setMaxHp(base); - player_node->setHp(value); - } - else if (stat < NB_CHARACTER_ATTRIBUTES) - { - if (stat >= CHAR_SKILL_BEGIN && stat < CHAR_SKILL_END - && player_node->getAttributeBase(stat) < base - && player_node->getAttributeBase(stat) > -1) - { - Particle* effect = particleEngine->addEffect("graphics/particles/skillup.particle.xml", 0, 0); - player_node->controlParticle(effect); - } - - player_node->setAttributeBase(stat, base); - player_node->setAttributeEffective(stat, value); - } - else - { - logger->log("Warning: server wants to update unknown " - "attribute %d to %d", stat, value); - } - } - } break; - - case GPMSG_PLAYER_EXP_CHANGE: - { - logger->log("EXP Update"); - while (msg.getUnreadLength()) - { - int skill = msg.readInt8(); - int current = msg.readInt32(); - int next = msg.readInt32(); - - if (skill < CHAR_SKILL_NB) - { - player_node->setExperience(skill, current, next); - } - else - { - logger->log("Warning: server wants to update experience of unknown " - "skill %d to %d / %d", skill, current, next); - } - } - } break; - - case GPMSG_LEVELUP: - { - player_node->setLevel(msg.readInt16()); - player_node->setCharacterPoints(msg.readInt16()); - player_node->setCorrectionPoints(msg.readInt16()); - Particle* effect = particleEngine->addEffect("graphics/particles/levelup.particle.xml", 0, 0); - player_node->controlParticle(effect); - } break; - - - case GPMSG_LEVEL_PROGRESS: - { - logger->log("Level Progress Update"); - player_node->setLevelProgress(msg.readInt8()); - } break; - - - case GPMSG_RAISE_ATTRIBUTE_RESPONSE: - { - int errCode = msg.readInt8(); - int attrNum = msg.readInt8() - CHAR_ATTR_BEGIN; - switch (errCode) - { - case ATTRIBMOD_OK: - { - // feel(acknowledgment); - } break; - case ATTRIBMOD_INVALID_ATTRIBUTE: - { - logger->log("Warning: Server denied increase of attribute %d (unknown attribute) ", attrNum); - } break; - case ATTRIBMOD_NO_POINTS_LEFT: - { - // when the server says "you got no points" it - // has to be correct. The server is always right! - // undo attribute change and set points to 0 - logger->log("Warning: Server denied increase of attribute %d (no points left) ", attrNum); - int attrValue = player_node->getAttributeBase(attrNum) - 1; - player_node->setCharacterPoints(0); - player_node->setAttributeBase(attrNum, attrValue); - } break; - case ATTRIBMOD_DENIED: - { - // undo attribute change - logger->log("Warning: Server denied increase of attribute %d (reason unknown) ", attrNum); - int points = player_node->getCharacterPoints() - 1; - player_node->setCharacterPoints(points); - int attrValue = player_node->getAttributeBase(attrNum) - 1; - player_node->setAttributeBase(attrNum, attrValue); - } break; - } - } break; - - case GPMSG_LOWER_ATTRIBUTE_RESPONSE: - { - int errCode = msg.readInt8(); - int attrNum = msg.readInt8() - CHAR_ATTR_BEGIN; - switch (errCode) - { - case ATTRIBMOD_OK: - { - // feel(acknowledgment); - } break; - case ATTRIBMOD_INVALID_ATTRIBUTE: - { - logger->log("Warning: Server denied reduction of attribute %d (unknown attribute) ", attrNum); - } break; - case ATTRIBMOD_NO_POINTS_LEFT: - { - // when the server says "you got no points" it - // has to be correct. The server is always right! - // undo attribute change and set points to 0 - logger->log("Warning: Server denied reduction of attribute %d (no points left) ", attrNum); - int attrValue = player_node->getAttributeBase(attrNum) + 1; - player_node->setCorrectionPoints(0); - player_node->setAttributeBase(attrNum, attrValue); - break; - } break; - case ATTRIBMOD_DENIED: - { - // undo attribute change - logger->log("Warning: Server denied reduction of attribute %d (reason unknown) ", attrNum); - int charaPoints = player_node->getCharacterPoints() - 1; - player_node->setCharacterPoints(charaPoints); - int correctPoints = player_node->getCorrectionPoints() + 1; - player_node->setCorrectionPoints(correctPoints); - int attrValue = player_node->getAttributeBase(attrNum) + 1; - player_node->setAttributeBase(attrNum, attrValue); - } break; - } - - } break; - /* - case SMSG_PLAYER_ARROW_MESSAGE: - { - Sint16 type = msg.readInt16(); - - switch (type) { - case 0: - chatWindow->chatLog("Equip arrows first", - BY_SERVER); - break; - default: - logger->log("0x013b: Unhandled message %i", type); - break; - } - } - break; - */ - } -} - -void -PlayerHandler::handleMapChangeMessage(MessageIn &msg) -{ - const std::string mapName = msg.readString(); - const unsigned short x = msg.readInt16(); - const unsigned short y = msg.readInt16(); - const bool nearby = (engine->getCurrentMapName() == mapName); - - logger->log("Changing map to %s (%d, %d)", mapName.c_str(), x, y); - - // Switch the actual map, deleting the previous one - engine->changeMap(mapName); - - current_npc = 0; - - const Vector &playerPos = player_node->getPosition(); - float scrollOffsetX = 0.0f; - float scrollOffsetY = 0.0f; - - /* Scroll if neccessary */ - if (!nearby - || (abs(x - (int) playerPos.x) > MAP_TELEPORT_SCROLL_DISTANCE) - || (abs(y - (int) playerPos.y) > MAP_TELEPORT_SCROLL_DISTANCE)) { - scrollOffsetX = x - (int) playerPos.x; - scrollOffsetY = y - (int) playerPos.y; - } - - player_node->setAction(Being::STAND); - player_node->setPosition(x, y); - - logger->log("Adjust scrolling by %d,%d", (int) scrollOffsetX, - (int) scrollOffsetY); - viewport->scrollBy(scrollOffsetX, scrollOffsetY); -} diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h deleted file mode 100644 index fef767da..00000000 --- a/src/net/playerhandler.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef NET_PLAYERHANDLER_H -#define NET_PLAYERHANDLER_H - -#include "messagehandler.h" - -class PlayerHandler : public MessageHandler -{ - public: - PlayerHandler(); - - void handleMessage(MessageIn &msg); - - private: - void handleMapChangeMessage(MessageIn &msg); -}; - -#endif diff --git a/src/net/protocol.h b/src/net/protocol.h deleted file mode 100644 index 73dd65e0..00000000 --- a/src/net/protocol.h +++ /dev/null @@ -1,295 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_PROTOCOL_ -#define _TMW_PROTOCOL_ - -/** - * Enumerated type for communicated messages: - * - * - PAMSG_*: from client to account server - * - APMSG_*: from account server to client - * - PCMSG_*: from client to chat server - * - CPMSG_*: from chat server to client - * - PGMSG_*: from client to game server - * - GPMSG_*: from game server to client - * - * Components: B byte, W word, D double word, S variable-size string - * C tile-based coordinates (B*3) - * - * Hosts: P (player's client), A (account server), C (char server), - * G (game server) - */ -enum { - // Login/Register - PAMSG_REGISTER = 0x0000, // L version, S username, S password, S email - APMSG_REGISTER_RESPONSE = 0x0002, // B error [, S updatehost] - PAMSG_UNREGISTER = 0x0003, // - - APMSG_UNREGISTER_RESPONSE = 0x0004, // B error - PAMSG_LOGIN = 0x0010, // L version, S username, S password - APMSG_LOGIN_RESPONSE = 0x0012, // B error [, S updatehost] - PAMSG_LOGOUT = 0x0013, // - - APMSG_LOGOUT_RESPONSE = 0x0014, // B error - PAMSG_CHAR_CREATE = 0x0020, // S name, B hair style, B hair color, B gender, W*6 stats - APMSG_CHAR_CREATE_RESPONSE = 0x0021, // B error - PAMSG_CHAR_DELETE = 0x0022, // B index - APMSG_CHAR_DELETE_RESPONSE = 0x0023, // B error - APMSG_CHAR_INFO = 0x0024, // B index, S name, B gender, B hair style, B hair color, W level, W character points, W correction points, D money, W*6 stats - PAMSG_CHAR_SELECT = 0x0026, // B index - APMSG_CHAR_SELECT_RESPONSE = 0x0027, // B error, B*32 token, S game address, W game port, S chat address, W chat port - PAMSG_EMAIL_CHANGE = 0x0030, // S email - APMSG_EMAIL_CHANGE_RESPONSE = 0x0031, // B error - PAMSG_PASSWORD_CHANGE = 0x0034, // S old password, S new password - APMSG_PASSWORD_CHANGE_RESPONSE = 0x0035, // B error - - PGMSG_CONNECT = 0x0050, // B*32 token - GPMSG_CONNECT_RESPONSE = 0x0051, // B error - PCMSG_CONNECT = 0x0053, // B*32 token - CPMSG_CONNECT_RESPONSE = 0x0054, // B error - - PGMSG_DISCONNECT = 0x0060, // B reconnect account - GPMSG_DISCONNECT_RESPONSE = 0x0061, // B error, B*32 token - PCMSG_DISCONNECT = 0x0063, // - - CPMSG_DISCONNECT_RESPONSE = 0x0064, // B error - - PAMSG_RECONNECT = 0x0065, // B*32 token - APMSG_RECONNECT_RESPONSE = 0x0066, // B error - - // Game - GPMSG_PLAYER_MAP_CHANGE = 0x0100, // S filename, W x, W y - GPMSG_PLAYER_SERVER_CHANGE = 0x0101, // B*32 token, S game address, W game port - PGMSG_PICKUP = 0x0110, // W*2 position - PGMSG_DROP = 0x0111, // B slot, B amount - PGMSG_EQUIP = 0x0112, // B slot - PGMSG_UNEQUIP = 0x0113, // B slot - PGMSG_MOVE_ITEM = 0x0114, // B slot1, B slot2, B amount - GPMSG_INVENTORY = 0x0120, // { B slot, W item id [, B amount] }* - GPMSG_INVENTORY_FULL = 0x0121, // { B slot, W item id [, B amount] }* - GPMSG_PLAYER_ATTRIBUTE_CHANGE = 0x0130, // { B attribute, W base value, W modified value }* - GPMSG_PLAYER_EXP_CHANGE = 0x0140, // { B skill, D exp got, D exp needed }* - GPMSG_LEVELUP = 0x0150, // W new level - GPMSG_LEVEL_PROGRESS = 0x0151, // B percent completed to next levelup - PGMSG_RAISE_ATTRIBUTE = 0x0160, // B attribute - GPMSG_RAISE_ATTRIBUTE_RESPONSE = 0x0161, // B error, B attribute - PGMSG_LOWER_ATTRIBUTE = 0x0170, // B attribute - GPMSG_LOWER_ATTRIBUTE_RESPONSE = 0x0171, // B error, B attribute - PGMSG_RESPAWN = 0x0180, // - - GPMSG_BEING_ENTER = 0x0200, // B type, W being id, B action, W*2 position - // player: S name, B hair style, B hair color, B gender, B item bitmask, { W item id }* - // monster: W type id - // npc: W type id - GPMSG_BEING_LEAVE = 0x0201, // W being id - GPMSG_ITEM_APPEAR = 0x0202, // W item id, W*2 position - GPMSG_BEING_LOOKS_CHANGE = 0x0210, // W weapon, W hat, W top clothes, W bottom clothes - PGMSG_WALK = 0x0260, // W*2 destination - PGMSG_ACTION_CHANGE = 0x0270, // B Action - GPMSG_BEING_ACTION_CHANGE = 0x0271, // W being id, B action - PGMSG_DIRECTION_CHANGE = 0x0272, // B Direction - GPMSG_BEING_DIR_CHANGE = 0x0273, // W being id, B direction - GPMSG_BEINGS_MOVE = 0x0280, // { W being id, B flags [, C position, B speed] [, W*2 destination] }* - GPMSG_ITEMS = 0x0281, // { W item id, W*2 position }* - PGMSG_ATTACK = 0x0290, // B direction - PGMSG_USE_SPECIAL = 0x0292, // B specialID - GPMSG_BEING_ATTACK = 0x0291, // W being id - PGMSG_SAY = 0x02A0, // S text - GPMSG_SAY = 0x02A1, // W being id, S text - GPMSG_NPC_CHOICE = 0x02B0, // W being id, { S text }* - GPMSG_NPC_MESSAGE = 0x02B1, // W being id, B* text - PGMSG_NPC_TALK = 0x02B2, // W being id - PGMSG_NPC_TALK_NEXT = 0x02B3, // W being id - PGMSG_NPC_SELECT = 0x02B4, // W being id, B choice - GPMSG_NPC_BUY = 0x02B5, // W being id, { W item id, W amount, W cost }* - GPMSG_NPC_SELL = 0x02B6, // W being id, { W item id, W amount, W cost }* - PGMSG_NPC_BUYSELL = 0x02B7, // W item id, W amount - GPMSG_NPC_ERROR = 0x02B8, // B error - GPMSG_NPC_POST = 0x02D0, // W being id - PGMSG_NPC_POST_SEND = 0x02D1, // S name, S text, W item id - GPMSG_NPC_POST_GET = 0x02D2, // W being id, { S name, S text, W item id } - PGMSG_TRADE_REQUEST = 0x02C0, // W being id - GPMSG_TRADE_REQUEST = 0x02C1, // W being id - GPMSG_TRADE_START = 0x02C2, // - - GPMSG_TRADE_COMPLETE = 0x02C3, // - - PGMSG_TRADE_CANCEL = 0x02C4, // - - GPMSG_TRADE_CANCEL = 0x02C5, // - - PGMSG_TRADE_ACCEPT = 0x02C6, // - - GPMSG_TRADE_ACCEPT = 0x02C7, // - - PGMSG_TRADE_ADD_ITEM = 0x02C8, // B slot, B amount - GPMSG_TRADE_ADD_ITEM = 0x02C9, // W item id, B amount - PGMSG_TRADE_SET_MONEY = 0x02CA, // L amount - GPMSG_TRADE_SET_MONEY = 0x02CB, // L amount - PGMSG_USE_ITEM = 0x0300, // B slot - GPMSG_USE_RESPONSE = 0x0301, // B error - GPMSG_BEINGS_DAMAGE = 0x0310, // { W being id, W amount }* - GPMSG_CREATE_EFFECT = 0x0320, // W effect id, W*2 position - - // Guild - PCMSG_GUILD_CREATE = 0x0350, // S name - CPMSG_GUILD_CREATE_RESPONSE = 0x0351, // B error, W guild, B rights, W channel - PCMSG_GUILD_INVITE = 0x0352, // W id, S name - CPMSG_GUILD_INVITE_RESPONSE = 0x0353, // B error - PCMSG_GUILD_ACCEPT = 0x0354, // W id - CPMSG_GUILD_ACCEPT_RESPONSE = 0x0355, // B error, W guild, B rights, W channel - PCMSG_GUILD_GET_MEMBERS = 0x0356, // W id - CPMSG_GUILD_GET_MEMBERS_RESPONSE = 0x0357, // S names, B online - CPMSG_GUILD_UPDATE_LIST = 0x0358, // W id, S name, B event - PCMSG_GUILD_QUIT = 0x0360, // W id - CPMSG_GUILD_QUIT_RESPONSE = 0x0361, // B error - PCMSG_GUILD_PROMOTE_MEMBER = 0x0365, // W guild, S name, B rights - CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE = 0x0366, // B error - - CPMSG_GUILD_INVITED = 0x0370, // S char name, S guild name, W id - CPMSG_GUILD_REJOIN = 0x0371, // S name, W guild, W rights, W channel, S announce - - // Party - PCMSG_PARTY_INVITE = 0x03A0, // S name - CPMSG_PARTY_INVITE_RESPONSE = 0x03A1, // B error - CPMSG_PARTY_INVITED = 0x03A2, // S name - PCMSG_PARTY_ACCEPT_INVITE = 0x03A5, // S name - CPMSG_PARTY_ACCEPT_INVITE_RESPONSE = 0x03A6, // B error, { S name } - PCMSG_PARTY_QUIT = 0x03AA, // - - CPMSG_PARTY_QUIT_RESPONSE = 0x03AB, // B error - CPMSG_PARTY_NEW_MEMBER = 0x03B0, // W being id, S name - CPMSG_PARTY_MEMBER_LEFT = 0x03B1, // W being id - - // Chat - CPMSG_ERROR = 0x0401, // B error - CPMSG_ANNOUNCEMENT = 0x0402, // S text - CPMSG_PRIVMSG = 0x0403, // S user, S text - CPMSG_PUBMSG = 0x0404, // W channel, S user, S text - PCMSG_CHAT = 0x0410, // S text, W channel - PCMSG_ANNOUNCE = 0x0411, // S text - PCMSG_PRIVMSG = 0x0412, // S user, S text - // -- Channeling - CPMSG_CHANNEL_EVENT = 0x0430, // W channel, B event, S info - PCMSG_ENTER_CHANNEL = 0x0440, // S channel, S password - CPMSG_ENTER_CHANNEL_RESPONSE = 0x0441, // B error, W id, S name, S topic, S userlist - PCMSG_QUIT_CHANNEL = 0x0443, // W channel id - CPMSG_QUIT_CHANNEL_RESPONSE = 0x0444, // B error, W channel id - PCMSG_LIST_CHANNELS = 0x0445, // - - CPMSG_LIST_CHANNELS_RESPONSE = 0x0446, // S names, W number of users - PCMSG_LIST_CHANNELUSERS = 0x0460, // S channel - CPMSG_LIST_CHANNELUSERS_RESPONSE = 0x0461, // S channel, { S user, B mode } - PCMSG_TOPIC_CHANGE = 0x0462, // W channel id, S topic - // -- User mode - PCMSG_USER_MODE = 0x0465, // W channel id, S name, B mode - PCMSG_KICK_USER = 0x0466, // W channel id, S name - - XXMSG_INVALID = 0x7FFF -}; - -// Generic return values - -enum { - ERRMSG_OK = 0, // everything is fine - ERRMSG_FAILURE, // the action failed - ERRMSG_NO_LOGIN, // the user is not yet logged - ERRMSG_NO_CHARACTER_SELECTED, // the user needs a character - ERRMSG_INSUFFICIENT_RIGHTS, // the user is not privileged - ERRMSG_INVALID_ARGUMENT, // part of the received message was invalid - ERRMSG_EMAIL_ALREADY_EXISTS, // The Email Address already exists - ERRMSG_ALREADY_TAKEN, // name used was already taken - ERRMSG_SERVER_FULL, // the server is overloaded - ERRMSG_TIME_OUT // data failed to arrive in due time -}; - -// Login specific return values -enum { - LOGIN_INVALID_VERSION = 0x40, // the user is using an incompatible protocol - LOGIN_SERVER_FULL // the server is overloaded -}; - -// Account register specific return values -enum { - REGISTER_INVALID_VERSION = 0x40, // the user is using an incompatible protocol - REGISTER_EXISTS_USERNAME, // there already is an account with this username - REGISTER_EXISTS_EMAIL // there already is an account with this email address -}; - -// Character creation specific return values -enum { - CREATE_INVALID_HAIRSTYLE = 0x40, - CREATE_INVALID_HAIRCOLOR, - CREATE_INVALID_GENDER, - CREATE_RAW_STATS_TOO_HIGH, - CREATE_RAW_STATS_TOO_LOW, - CREATE_RAW_STATS_EQUAL_TO_ZERO, - CREATE_EXISTS_NAME, - CREATE_TOO_MUCH_CHARACTERS -}; - -// Character attribute modification specific return value -enum AttribmodResponseCode { - ATTRIBMOD_OK = ERRMSG_OK, - ATTRIBMOD_INVALID_ATTRIBUTE = 0x40, - ATTRIBMOD_NO_POINTS_LEFT, - ATTRIBMOD_DENIED -}; -// Object type enumeration -enum { - // A simple item - OBJECT_ITEM = 0, - // An item that can be activated (doors, switchs, sign, ...) - OBJECT_ACTOR, - // Non-Playable-Character is an actor capable of movement and maybe actions - OBJECT_NPC, - // A monster (moving actor with AI. able to toggle map/quest actions, too) - OBJECT_MONSTER, - // A player - OBJECT_PLAYER -}; - -// Moving object flags -enum { - // Payload contains the current position. - MOVING_POSITION = 1, - // Payload contains the destination. - MOVING_DESTINATION = 2 -}; - -// Email change specific return values -enum { - EMAILCHG_EXISTS_EMAIL = 0x40 -}; - -// Chat errors return values -enum { - CHAT_USING_BAD_WORDS = 0x40, - CHAT_UNHANDLED_COMMAND -}; - -// Chat channels event values -enum { - CHAT_EVENT_NEW_PLAYER = 0, - CHAT_EVENT_LEAVING_PLAYER, - CHAT_EVENT_TOPIC_CHANGE, - CHAT_EVENT_MODE_CHANGE, - CHAT_EVENT_KICKED_PLAYER -}; - -// Guild member event values -enum { - GUILD_EVENT_NEW_PLAYER = 0, - GUILD_EVENT_LEAVING_PLAYER, - GUILD_EVENT_ONLINE_PLAYER, - GUILD_EVENT_OFFLINE_PLAYER -}; - -#endif diff --git a/src/net/tmwserv/accountserver/account.cpp b/src/net/tmwserv/accountserver/account.cpp new file mode 100644 index 00000000..a679e233 --- /dev/null +++ b/src/net/tmwserv/accountserver/account.cpp @@ -0,0 +1,107 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "account.h" + +#include + +#include "internal.h" + +#include "../connection.h" +#include "../../messageout.h" +#include "../protocol.h" + +#include "../../../utils/sha256.h" + +void Net::AccountServer::Account::createCharacter( + const std::string &name, char hairStyle, char hairColor, char gender, + short strength, short agility, short vitality, + short intelligence, short dexterity, short willpower) +{ + MessageOut msg(PAMSG_CHAR_CREATE); + + msg.writeString(name); + msg.writeInt8(hairStyle); + msg.writeInt8(hairColor); + msg.writeInt8(gender); + msg.writeInt16(strength); + msg.writeInt16(agility); + msg.writeInt16(vitality); + msg.writeInt16(intelligence); + msg.writeInt16(dexterity); + msg.writeInt16(willpower); + + Net::AccountServer::connection->send(msg); +} + +void Net::AccountServer::Account::deleteCharacter(char slot) +{ + MessageOut msg(PAMSG_CHAR_DELETE); + + msg.writeInt8(slot); + + Net::AccountServer::connection->send(msg); +} + +void Net::AccountServer::Account::selectCharacter(char slot) +{ + MessageOut msg(PAMSG_CHAR_SELECT); + + msg.writeInt8(slot); + + Net::AccountServer::connection->send(msg); +} + +void Net::AccountServer::Account::unregister(const std::string &username, + const std::string &password) +{ + MessageOut msg(PAMSG_UNREGISTER); + + msg.writeString(username); + msg.writeString(sha256(username + password)); + + Net::AccountServer::connection->send(msg); +} + +void Net::AccountServer::Account::changeEmail(const std::string &email) +{ + MessageOut msg(PAMSG_EMAIL_CHANGE); + + // Email is sent clearly so the server can validate the data. + // Encryption is assumed server-side. + msg.writeString(email); + + Net::AccountServer::connection->send(msg); +} + +void Net::AccountServer::Account::changePassword( + const std::string &username, + const std::string &oldPassword, + const std::string &newPassword) +{ + MessageOut msg(PAMSG_PASSWORD_CHANGE); + + // Change password using SHA2 encryption + msg.writeString(sha256(username + oldPassword)); + msg.writeString(sha256(username + newPassword)); + + Net::AccountServer::connection->send(msg); +} diff --git a/src/net/tmwserv/accountserver/account.h b/src/net/tmwserv/accountserver/account.h new file mode 100644 index 00000000..581bcb42 --- /dev/null +++ b/src/net/tmwserv/accountserver/account.h @@ -0,0 +1,54 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_ACCOUNTSERVER_CHARACTER_H +#define _TMW_NET_ACCOUNTSERVER_CHARACTER_H + +#include + +namespace Net +{ + namespace AccountServer + { + namespace Account + { + void createCharacter(const std::string &name, + char hairStyle, char hairColor, char gender, + short strength, short agility, short vitality, + short intelligence, short dexterity, short willpower); + + void deleteCharacter(char slot); + + void selectCharacter(char slot); + + void unregister(const std::string &username, + const std::string &password); + + void changeEmail(const std::string &email); + + void changePassword(const std::string &username, + const std::string &oldPassword, + const std::string &newPassword); + } + } +} + +#endif diff --git a/src/net/tmwserv/accountserver/accountserver.cpp b/src/net/tmwserv/accountserver/accountserver.cpp new file mode 100644 index 00000000..8093468c --- /dev/null +++ b/src/net/tmwserv/accountserver/accountserver.cpp @@ -0,0 +1,81 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "accountserver.h" + +#include + +#include "internal.h" + +#include "../connection.h" +#include "../../messageout.h" +#include "../protocol.h" + +#include "../../../utils/sha256.h" + +void Net::AccountServer::login(Net::Connection *connection, int version, + const std::string &username, const std::string &password) +{ + Net::AccountServer::connection = connection; + + MessageOut msg(PAMSG_LOGIN); + + msg.writeInt32(version); + msg.writeString(username); + msg.writeString(sha256(username + password)); + + Net::AccountServer::connection->send(msg); +} + +void Net::AccountServer::registerAccount(Net::Connection *connection, + int version, const std::string &username, const std::string &password, + const std::string &email) +{ + Net::AccountServer::connection = connection; + + MessageOut msg(PAMSG_REGISTER); + + msg.writeInt32(version); // client version + msg.writeString(username); + // When registering, the password and email hash is assumed by server. + // Hence, data can be validated safely server-side. + // This is the only time we send a clear password. + msg.writeString(password); + msg.writeString(email); + + Net::AccountServer::connection->send(msg); +} + +void Net::AccountServer::logout() +{ + MessageOut msg(PAMSG_LOGOUT); + Net::AccountServer::connection->send(msg); +} + +void Net::AccountServer::reconnectAccount(Net::Connection *connection, + const std::string &passToken) +{ + Net::AccountServer::connection = connection; + + MessageOut msg(PAMSG_RECONNECT); + msg.writeString(passToken, 32); + Net::AccountServer::connection->send(msg); +} diff --git a/src/net/tmwserv/accountserver/accountserver.h b/src/net/tmwserv/accountserver/accountserver.h new file mode 100644 index 00000000..8e0573fc --- /dev/null +++ b/src/net/tmwserv/accountserver/accountserver.h @@ -0,0 +1,47 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_ACCOUNTSERVER_ACCOUNTSERVER_H +#define _TMW_NET_ACCOUNTSERVER_ACCOUNTSERVER_H + +#include + +namespace Net +{ + class Connection; + + namespace AccountServer + { + void login(Net::Connection *connection, int version, + const std::string &username, const std::string &password); + + void registerAccount(Net::Connection *connection, int version, + const std::string &username, const std::string &password, + const std::string &email); + + void logout(); + + void reconnectAccount(Net::Connection *connection, + const std::string &passToken); + } +} + +#endif diff --git a/src/net/tmwserv/accountserver/internal.cpp b/src/net/tmwserv/accountserver/internal.cpp new file mode 100644 index 00000000..a3be76a1 --- /dev/null +++ b/src/net/tmwserv/accountserver/internal.cpp @@ -0,0 +1,32 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "internal.h" + +namespace Net +{ + class Connection; + + namespace AccountServer + { + Connection *connection = 0; + } +} diff --git a/src/net/tmwserv/accountserver/internal.h b/src/net/tmwserv/accountserver/internal.h new file mode 100644 index 00000000..b3d64582 --- /dev/null +++ b/src/net/tmwserv/accountserver/internal.h @@ -0,0 +1,35 @@ +/* + * The Mana World + * Copyright (C) 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_ACCOUNTSERVER_INTERNAL_H +#define _TMW_NET_ACCOUNTSERVER_INTERNAL_H + +namespace Net +{ + class Connection; + + namespace AccountServer + { + extern Connection *connection; + } +} + +#endif diff --git a/src/net/tmwserv/beinghandler.cpp b/src/net/tmwserv/beinghandler.cpp new file mode 100644 index 00000000..ac33b6fe --- /dev/null +++ b/src/net/tmwserv/beinghandler.cpp @@ -0,0 +1,359 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "beinghandler.h" + +#include + +#include "../messagein.h" +#include "protocol.h" + +#include "../../being.h" +#include "../../beingmanager.h" +#include "../../game.h" +#include "../../localplayer.h" +#include "../../log.h" +#include "../../main.h" +#include "../../npc.h" +#include "../../particle.h" +#include "../../sound.h" + +#include "../../gui/ok_dialog.h" + +#include "../../utils/gettext.h" + +#include "gameserver/player.h" + +const int EMOTION_TIME = 150; /**< Duration of emotion icon */ + +BeingHandler::BeingHandler() +{ + static const Uint16 _messages[] = { + GPMSG_BEING_ATTACK, + GPMSG_BEING_ENTER, + GPMSG_BEING_LEAVE, + GPMSG_BEINGS_MOVE, + GPMSG_BEINGS_DAMAGE, + GPMSG_BEING_ACTION_CHANGE, + GPMSG_BEING_LOOKS_CHANGE, + GPMSG_BEING_DIR_CHANGE, + 0 + }; + handledMessages = _messages; +} + +void BeingHandler::handleMessage(MessageIn &msg) +{ + switch (msg.getId()) + { + case GPMSG_BEING_ENTER: + handleBeingEnterMessage(msg); + break; + case GPMSG_BEING_LEAVE: + handleBeingLeaveMessage(msg); + break; + case GPMSG_BEINGS_MOVE: + handleBeingsMoveMessage(msg); + break; + case GPMSG_BEING_ATTACK: + handleBeingAttackMessage(msg); + break; + case GPMSG_BEINGS_DAMAGE: + handleBeingsDamageMessage(msg); + break; + case GPMSG_BEING_ACTION_CHANGE: + handleBeingActionChangeMessage(msg); + break; + case GPMSG_BEING_LOOKS_CHANGE: + handleBeingLooksChangeMessage(msg); + break; + case GPMSG_BEING_DIR_CHANGE: + handleBeingDirChangeMessage(msg); + break; + } +} + +static void handleLooks(Player *being, MessageIn &msg) +{ + // Order of sent slots. Has to be in sync with the server code. + static int const nb_slots = 4; + static int const slots[nb_slots] = + { Being::WEAPON_SPRITE, Being::HAT_SPRITE, Being::TOPCLOTHES_SPRITE, + Being::BOTTOMCLOTHES_SPRITE }; + + int mask = msg.readInt8(); + + if (mask & (1 << 7)) + { + // The equipment has to be cleared first. + for (int i = 0; i < nb_slots; ++i) + { + being->setSprite(slots[i], 0); + } + } + + // Fill slots enumerated by the bitmask. + for (int i = 0; i < nb_slots; ++i) + { + if (!(mask & (1 << i))) continue; + int id = msg.readInt16(); + being->setSprite(slots[i], id); + } +} + +void BeingHandler::handleBeingEnterMessage(MessageIn &msg) +{ + int type = msg.readInt8(); + int id = msg.readInt16(); + Being::Action action = (Being::Action)msg.readInt8(); + int px = msg.readInt16(); + int py = msg.readInt16(); + Being *being; + + switch (type) + { + case OBJECT_PLAYER: + { + std::string name = msg.readString(); + if (player_node->getName() == name) + { + being = player_node; + being->setId(id); + } + else + { + being = beingManager->createBeing(id, type, 0); + being->setName(name); + } + Player *p = static_cast< Player * >(being); + int hs = msg.readInt8(), hc = msg.readInt8(); + p->setHairStyle(hs, hc); + p->setGender(msg.readInt8() == GENDER_MALE ? + GENDER_MALE : GENDER_FEMALE); + handleLooks(p, msg); + } break; + + case OBJECT_MONSTER: + case OBJECT_NPC: + { + int subtype = msg.readInt16(); + being = beingManager->createBeing(id, type, subtype); + std::string name = msg.readString(); + if (name.length() > 0) being->setName(name); + } break; + + default: + return; + } + + being->setPosition(px, py); + being->setDestination(px, py); + being->setAction(action); +} + +void BeingHandler::handleBeingLeaveMessage(MessageIn &msg) +{ + Being *being = beingManager->findBeing(msg.readInt16()); + if (!being) return; + + beingManager->destroyBeing(being); +} + +void BeingHandler::handleBeingsMoveMessage(MessageIn &msg) +{ + while (msg.getUnreadLength()) + { + int id = msg.readInt16(); + int flags = msg.readInt8(); + Being *being = beingManager->findBeing(id); + int sx = 0; + int sy = 0; + int dx = 0; + int dy = 0; + int speed = 0; + + printf("handleBeingsMoveMessage for %p (%s | %s)\n", + (void*) being, + (flags & MOVING_POSITION) ? "pos" : "", + (flags & MOVING_DESTINATION) ? "dest" : ""); + + if (flags & MOVING_POSITION) + { + Uint16 sx2, sy2; + msg.readCoordinates(sx2, sy2); + sx = sx2 * 32 + 16; + sy = sy2 * 32 + 16; + speed = msg.readInt8(); + } + if (flags & MOVING_DESTINATION) + { + dx = msg.readInt16(); + dy = msg.readInt16(); + if (!(flags & MOVING_POSITION)) + { + sx = dx; + sy = dy; + } + } + if (!being || !(flags & (MOVING_POSITION | MOVING_DESTINATION))) + { + continue; + } + if (speed) + { + /* The speed on the server is the cost of moving from one tile to + * the next. Beings get 1000 cost units per second. The speed is + * transferred as devided by 10, so that slower speeds fit in a + * byte. Here we convert the speed to pixels per second. + */ + const float tilesPerSecond = 100.0f / speed; + being->setWalkSpeed((int) (tilesPerSecond * 32)); + } + + // Ignore messages from the server for the local player + if (being == player_node) + continue; + + // If being is a player, and he only moves a little, its ok to be a little out of sync + if (being->getType() == Being::PLAYER && abs(being->getPixelX() - dx) + + abs(being->getPixelY() - dy) < 2 * 32 && + (dx != being->getDestination().x && dy != being->getDestination().y)) + { + being->setDestination(being->getPixelX(),being->getPixelY()); + continue; + } + if (abs(being->getPixelX() - sx) + + abs(being->getPixelY() - sy) > 10 * 32) + { + // Too large a desynchronization. + being->setPosition(sx, sy); + being->setDestination(dx, dy); + } + else if (!(flags & MOVING_POSITION)) + { + being->setDestination(dx, dy); + } + else if (!(flags & MOVING_DESTINATION)) + { + being->adjustCourse(sx, sy); + } + else + { + being->adjustCourse(sx, sy, dx, dy); + } + } +} + +void BeingHandler::handleBeingAttackMessage(MessageIn &msg) +{ + Being *being = beingManager->findBeing(msg.readInt16()); + int direction = msg.readInt8(); + int attackType = msg.readInt8(); + + if (!being) return; + + switch (direction) + { + case DIRECTION_UP: being->setDirection(Being::UP); break; + case DIRECTION_DOWN: being->setDirection(Being::DOWN); break; + case DIRECTION_LEFT: being->setDirection(Being::LEFT); break; + case DIRECTION_RIGHT: being->setDirection(Being::RIGHT); break; + } + + being->setAction(Being::ATTACK, attackType); +} + +void BeingHandler::handleBeingsDamageMessage(MessageIn &msg) +{ + while (msg.getUnreadLength()) + { + Being *being = beingManager->findBeing(msg.readInt16()); + int damage = msg.readInt16(); + if (being) + { + being->takeDamage(damage); + } + } +} + +void BeingHandler::handleBeingActionChangeMessage(MessageIn &msg) +{ + Being* being = beingManager->findBeing(msg.readInt16()); + Being::Action action = (Being::Action) msg.readInt8(); + if (!being) return; + + being->setAction(action); + + if (action == Being::DEAD && being==player_node) + { + static char const *const deadMsg[] = + { + _("You are dead."), + _("We regret to inform you that your character was killed in battle."), + _("You are not that alive anymore."), + _("The cold hands of the grim reaper are grabbing for your soul."), + _("Game Over!"), + _("No, kids. Your character did not really die. It... err... went to a better place."), + _("Your plan of breaking your enemies weapon by bashing it with your throat failed."), + _("I guess this did not run too well."), + _("Do you want your possessions identified?"), // Nethack reference + _("Sadly, no trace of you was ever found..."), // Secret of Mana reference + _("Annihilated."), // Final Fantasy VI reference + _("Looks like you got your head handed to you."), //Earthbound reference + _("You screwed up again, dump your body down the tubes and get you another one.") // Leisure Suit Larry 1 Reference + + }; + std::string message(deadMsg[rand()%13]); + message.append(_(" Press OK to respawn")); + OkDialog *dlg = new OkDialog(_("You died"), message); + dlg->addActionListener(&(Net::GameServer::Player::respawnListener)); + } +} + +void BeingHandler::handleBeingLooksChangeMessage(MessageIn &msg) +{ + Being *being = beingManager->findBeing(msg.readInt16()); + if (!being || being->getType() != Being::PLAYER) return; + Player * player = static_cast< Player * >(being); + handleLooks(player, msg); + if (msg.getUnreadLength()) + { + int style = msg.readInt16(); + int color = msg.readInt16(); + player->setHairStyle(style, color); + player->setGender((Gender)msg.readInt16()); + } +} + +void BeingHandler::handleBeingDirChangeMessage(MessageIn &msg) +{ + Being *being = beingManager->findBeing(msg.readInt16()); + if (!being) return; + int data = msg.readInt8(); + switch (data) + { + case DIRECTION_UP: being->setDirection(Being::UP); break; + case DIRECTION_DOWN: being->setDirection(Being::DOWN); break; + case DIRECTION_LEFT: being->setDirection(Being::LEFT); break; + case DIRECTION_RIGHT: being->setDirection(Being::RIGHT); break; + } +} + diff --git a/src/net/tmwserv/beinghandler.h b/src/net/tmwserv/beinghandler.h new file mode 100644 index 00000000..759a0ba3 --- /dev/null +++ b/src/net/tmwserv/beinghandler.h @@ -0,0 +1,45 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_BEINGHANDLER_H +#define _TMW_NET_BEINGHANDLER_H + +#include "../messagehandler.h" + +class BeingHandler : public MessageHandler +{ + public: + BeingHandler(); + + void handleMessage(MessageIn &msg); + + private: + void handleBeingAttackMessage(MessageIn &msg); + void handleBeingEnterMessage(MessageIn &msg); + void handleBeingLeaveMessage(MessageIn &msg); + void handleBeingsMoveMessage(MessageIn &msg); + void handleBeingsDamageMessage(MessageIn &msg); + void handleBeingActionChangeMessage(MessageIn &msg); + void handleBeingLooksChangeMessage(MessageIn &msg); + void handleBeingDirChangeMessage(MessageIn &msg); +}; + +#endif diff --git a/src/net/tmwserv/buysellhandler.cpp b/src/net/tmwserv/buysellhandler.cpp new file mode 100644 index 00000000..54750cbb --- /dev/null +++ b/src/net/tmwserv/buysellhandler.cpp @@ -0,0 +1,92 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "buysellhandler.h" + +#include + +#include "../messagein.h" +#include "protocol.h" + +#include "../../beingmanager.h" +#include "../../item.h" +#include "../../localplayer.h" +#include "../../npc.h" + +#include "../../gui/buy.h" +#include "../../gui/chat.h" +#include "../../gui/sell.h" + +extern BuyDialog *buyDialog; +extern SellDialog *sellDialog; +extern Window *buySellDialog; + +BuySellHandler::BuySellHandler() +{ + static const Uint16 _messages[] = { + GPMSG_NPC_BUY, + GPMSG_NPC_SELL, + 0 + }; + handledMessages = _messages; +} + +void BuySellHandler::handleMessage(MessageIn &msg) +{ + Being *being = beingManager->findBeing(msg.readInt16()); + if (!being || being->getType() != Being::NPC) + { + return; + } + + current_npc = static_cast< NPC * >(being); + + switch (msg.getId()) + { + case GPMSG_NPC_BUY: + buyDialog->reset(); + buyDialog->setMoney(player_node->getMoney()); + buyDialog->setVisible(true); + + while (msg.getUnreadLength()) + { + int itemId = msg.readInt16(); + int amount = msg.readInt16(); + int value = msg.readInt16(); + buyDialog->addItem(itemId, amount, value); + } + break; + + case GPMSG_NPC_SELL: + sellDialog->setMoney(player_node->getMoney()); + sellDialog->reset(); + sellDialog->setVisible(true); + + while (msg.getUnreadLength()) + { + int itemId = msg.readInt16(); + int amount = msg.readInt16(); + int value = msg.readInt16(); + sellDialog->addItem(itemId, amount, value); + } + break; + } +} diff --git a/src/net/tmwserv/buysellhandler.h b/src/net/tmwserv/buysellhandler.h new file mode 100644 index 00000000..5bf58d8e --- /dev/null +++ b/src/net/tmwserv/buysellhandler.h @@ -0,0 +1,35 @@ +/* + * The Mana World + * Copyright (C) 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef NET_BUYSELLHANDLER_H +#define NET_BUYSELLHANDLER_H + +#include "../messagehandler.h" + +class BuySellHandler : public MessageHandler +{ + public: + BuySellHandler(); + + void handleMessage(MessageIn &msg); +}; + +#endif diff --git a/src/net/tmwserv/charserverhandler.cpp b/src/net/tmwserv/charserverhandler.cpp new file mode 100644 index 00000000..50b0e739 --- /dev/null +++ b/src/net/tmwserv/charserverhandler.cpp @@ -0,0 +1,227 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "charserverhandler.h" + +#include "connection.h" +#include "../messagein.h" +#include "protocol.h" + +#include "../../game.h" +#include "../../localplayer.h" +#include "../../log.h" +#include "../../logindata.h" +#include "../../main.h" + +#include "../../gui/ok_dialog.h" +#include "../../gui/char_select.h" + +extern Net::Connection *gameServerConnection; +extern Net::Connection *chatServerConnection; + +CharServerHandler::CharServerHandler(): + mCharCreateDialog(0) +{ + static const Uint16 _messages[] = { + APMSG_CHAR_CREATE_RESPONSE, + APMSG_CHAR_DELETE_RESPONSE, + APMSG_CHAR_INFO, + APMSG_CHAR_SELECT_RESPONSE, + 0 + }; + handledMessages = _messages; +} + +void CharServerHandler::handleMessage(MessageIn &msg) +{ + int slot; + LocalPlayer *tempPlayer; + + switch (msg.getId()) + { + case APMSG_CHAR_CREATE_RESPONSE: + handleCharCreateResponse(msg); + break; + + case APMSG_CHAR_DELETE_RESPONSE: + { + int errMsg = msg.readInt8(); + // Character deletion successful + if (errMsg == ERRMSG_OK) + { + delete mCharInfo->getEntry(); + mCharInfo->setEntry(0); + mCharInfo->unlock(); + new OkDialog("Info", "Player deleted"); + } + // Character deletion failed + else + { + std::string message = ""; + switch (errMsg) + { + case ERRMSG_NO_LOGIN: + message = "Not logged in"; + break; + case ERRMSG_INVALID_ARGUMENT: + message = "Selection out of range"; + break; + default: + message = "Unknown error"; + } + mCharInfo->unlock(); + new OkDialog("Error", message); + } + } + break; + + case APMSG_CHAR_INFO: + tempPlayer = readPlayerData(msg, slot); + mCharInfo->unlock(); + mCharInfo->select(slot); + mCharInfo->setEntry(tempPlayer); + + // Close the character create dialog + if (mCharCreateDialog) + { + mCharCreateDialog->scheduleDelete(); + mCharCreateDialog = 0; + } + break; + + case APMSG_CHAR_SELECT_RESPONSE: + handleCharSelectResponse(msg); + break; + } +} + +void CharServerHandler::handleCharCreateResponse(MessageIn &msg) +{ + int errMsg = msg.readInt8(); + + // Character creation failed + if (errMsg != ERRMSG_OK) + { + std::string message = ""; + switch (errMsg) + { + case ERRMSG_NO_LOGIN: + message = "Not logged in"; + break; + case CREATE_TOO_MUCH_CHARACTERS: + message = "No empty slot"; + break; + case ERRMSG_INVALID_ARGUMENT: + message = "Invalid name"; + break; + case CREATE_EXISTS_NAME: + message = "Character's name already exists"; + break; + case CREATE_INVALID_HAIRSTYLE: + message = "Invalid hairstyle"; + break; + case CREATE_INVALID_HAIRCOLOR: + message = "Invalid hair color"; + break; + case CREATE_INVALID_GENDER: + message = "Invalid gender"; + break; + case CREATE_RAW_STATS_TOO_HIGH: + message = "Character's stats are too high"; + break; + case CREATE_RAW_STATS_TOO_LOW: + message = "Character's stats are too low"; + break; + case CREATE_RAW_STATS_EQUAL_TO_ZERO: + message = "One stat is zero"; + break; + default: + message = "Unknown error"; + break; + } + new OkDialog("Error", message); + } + + if (mCharCreateDialog) + mCharCreateDialog->unlock(); +} + +void CharServerHandler::handleCharSelectResponse(MessageIn &msg) +{ + int errMsg = msg.readInt8(); + + if (errMsg == ERRMSG_OK) + { + token = msg.readString(32); + std::string gameServer = msg.readString(); + unsigned short gameServerPort = msg.readInt16(); + std::string chatServer = msg.readString(); + unsigned short chatServerPort = msg.readInt16(); + + logger->log("Game server: %s:%d", gameServer.c_str(), gameServerPort); + logger->log("Chat server: %s:%d", chatServer.c_str(), chatServerPort); + + gameServerConnection->connect(gameServer, gameServerPort); + chatServerConnection->connect(chatServer, chatServerPort); + + // Keep the selected character and delete the others + player_node = mCharInfo->getEntry(); + int slot = mCharInfo->getPos(); + mCharInfo->unlock(); + mCharInfo->select(0); + + do { + LocalPlayer *tmp = mCharInfo->getEntry(); + if (tmp != player_node) + { + delete tmp; + mCharInfo->setEntry(0); + } + mCharInfo->next(); + } while (mCharInfo->getPos()); + mCharInfo->select(slot); + + mCharInfo->clear(); //player_node will be deleted by ~Game + + state = STATE_CONNECT_GAME; + } +} + +LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot) +{ + LocalPlayer *tempPlayer = new LocalPlayer; + slot = msg.readInt8(); // character slot + tempPlayer->setName(msg.readString()); + tempPlayer->setGender(msg.readInt8() == GENDER_MALE ? GENDER_MALE : GENDER_FEMALE); + int hs = msg.readInt8(), hc = msg.readInt8(); + tempPlayer->setHairStyle(hs, hc); + tempPlayer->setLevel(msg.readInt16()); + tempPlayer->setCharacterPoints(msg.readInt16()); + tempPlayer->setCorrectionPoints(msg.readInt16()); + tempPlayer->setMoney(msg.readInt32()); + + for (int i = 0; i < 7; i++) + { + tempPlayer->setAttributeBase(i, msg.readInt8()); + } + + return tempPlayer; +} diff --git a/src/net/tmwserv/charserverhandler.h b/src/net/tmwserv/charserverhandler.h new file mode 100644 index 00000000..41afa321 --- /dev/null +++ b/src/net/tmwserv/charserverhandler.h @@ -0,0 +1,72 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_CHARSERVERHANDLER_H +#define _TMW_NET_CHARSERVERHANDLER_H + +#include "../messagehandler.h" + +#include "../../lockedarray.h" + +class CharCreateDialog; +class LocalPlayer; +class LoginData; + +/** + * Deals with incoming messages related to character selection. + */ +class CharServerHandler : public MessageHandler +{ + public: + CharServerHandler(); + + void + handleMessage(MessageIn &msg); + + void + setCharInfo(LockedArray *charInfo) + { + mCharInfo = charInfo; + } + + /** + * Sets the character create dialog. The handler will clean up this + * dialog when a new character is succesfully created, and will unlock + * the dialog when a new character failed to be created. + */ + void setCharCreateDialog(CharCreateDialog *window) + { mCharCreateDialog = window; } + + protected: + void + handleCharCreateResponse(MessageIn &msg); + + void + handleCharSelectResponse(MessageIn &msg); + + LockedArray *mCharInfo; + CharCreateDialog *mCharCreateDialog; + + LocalPlayer* + readPlayerData(MessageIn &msg, int &slot); +}; + +#endif diff --git a/src/net/tmwserv/chathandler.cpp b/src/net/tmwserv/chathandler.cpp new file mode 100644 index 00000000..0d66d8aa --- /dev/null +++ b/src/net/tmwserv/chathandler.cpp @@ -0,0 +1,285 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "chathandler.h" + +#include +#include +#include + +#include "../messagein.h" +#include "protocol.h" + +#include "../../being.h" +#include "../../beingmanager.h" +#include "../../game.h" +#include "../../channel.h" +#include "../../channelmanager.h" + +#include "../../gui/chat.h" +#include "../../gui/guildwindow.h" + +extern Being *player_node; + +ChatHandler::ChatHandler() +{ + static const Uint16 _messages[] = { + GPMSG_SAY, + CPMSG_ENTER_CHANNEL_RESPONSE, + CPMSG_LIST_CHANNELS_RESPONSE, + CPMSG_PUBMSG, + CPMSG_ANNOUNCEMENT, + CPMSG_PRIVMSG, + CPMSG_QUIT_CHANNEL_RESPONSE, + CPMSG_LIST_CHANNELUSERS_RESPONSE, + CPMSG_CHANNEL_EVENT, + 0 + }; + handledMessages = _messages; +} + +void ChatHandler::handleMessage(MessageIn &msg) +{ + switch (msg.getId()) + { + case GPMSG_SAY: + handleGameChatMessage(msg); + break; + + case CPMSG_ENTER_CHANNEL_RESPONSE: + handleEnterChannelResponse(msg); + break; + + case CPMSG_LIST_CHANNELS_RESPONSE: + handleListChannelsResponse(msg); + break; + + case CPMSG_PRIVMSG: + handlePrivateMessage(msg); + break; + + case CPMSG_ANNOUNCEMENT: + handleAnnouncement(msg); + break; + + case CPMSG_PUBMSG: + handleChatMessage(msg); + break; + + case CPMSG_QUIT_CHANNEL_RESPONSE: + handleQuitChannelResponse(msg); + break; + + case CPMSG_LIST_CHANNELUSERS_RESPONSE: + handleListChannelUsersResponse(msg); + break; + + case CPMSG_CHANNEL_EVENT: + handleChannelEvent(msg); + } +} + +void ChatHandler::handleGameChatMessage(MessageIn &msg) +{ + short id = msg.readInt16(); + std::string chatMsg = msg.readString(); + + if (id == 0) + { + chatWindow->chatLog(chatMsg, BY_SERVER); + return; + } + + Being *being = beingManager->findBeing(id); + + if (being) + { + chatWindow->chatLog(being->getName() + " : " + chatMsg, + being == player_node ? BY_PLAYER : BY_OTHER, "General"); + being->setSpeech(chatMsg, SPEECH_TIME); + } + else + { + chatWindow->chatLog("Unknown : " + chatMsg, BY_OTHER, "General"); + } +} + +void ChatHandler::handleEnterChannelResponse(MessageIn &msg) +{ + if(msg.readInt8() == ERRMSG_OK) + { + short channelId = msg.readInt16(); + std::string channelName = msg.readString(); + std::string announcement = msg.readString(); + Channel *channel = new Channel(channelId, channelName, announcement); + channelManager->addChannel(channel); + chatWindow->createNewChannelTab(channelName); + chatWindow->chatLog("Topic: " + announcement, BY_CHANNEL, channelName); + + std::string user; + std::string userModes; + chatWindow->chatLog("Players in this channel:", BY_CHANNEL, channelName); + while(msg.getUnreadLength()) + { + user = msg.readString(); + if (user == "") + return; + userModes = msg.readString(); + if (userModes.find('o') != std::string::npos) + { + user = "@" + user; + } + chatWindow->chatLog(user, BY_CHANNEL, channelName); + } + + } + else + { + chatWindow->chatLog("Error joining channel", BY_SERVER); + } +} + +void ChatHandler::handleListChannelsResponse(MessageIn &msg) +{ + chatWindow->chatLog("Listing Channels", BY_SERVER); + while(msg.getUnreadLength()) + { + std::string channelName = msg.readString(); + if (channelName == "") + return; + std::ostringstream numUsers; + numUsers << msg.readInt16(); + channelName += " - "; + channelName += numUsers.str(); + chatWindow->chatLog(channelName, BY_SERVER); + } + chatWindow->chatLog("End of channel list", BY_SERVER); +} + +void ChatHandler::handlePrivateMessage(MessageIn &msg) +{ + std::string userNick = msg.readString(); + std::string chatMsg = msg.readString(); + + if (!chatWindow->tabExists(userNick)) + { + chatWindow->createNewChannelTab(userNick); + + } + chatWindow->chatLog(userNick + ": " + chatMsg, BY_OTHER, userNick); +} + +void ChatHandler::handleAnnouncement(MessageIn &msg) +{ + std::string chatMsg = msg.readString(); + chatWindow->chatLog(chatMsg, BY_GM); +} + +void ChatHandler::handleChatMessage(MessageIn &msg) +{ + short channelId = msg.readInt16(); + std::string userNick = msg.readString(); + std::string chatMsg = msg.readString(); + + chatWindow->sendToChannel(channelId, userNick, chatMsg); +} + +void ChatHandler::handleQuitChannelResponse(MessageIn &msg) +{ + if(msg.readInt8() == ERRMSG_OK) + { + short channelId = msg.readInt16(); + // remove the chat tab + chatWindow->removeChannel(channelId); + } +} + +void ChatHandler::handleListChannelUsersResponse(MessageIn &msg) +{ + std::string channel = msg.readString(); + std::string userNick; + std::string userModes; + chatWindow->chatLog("Players in this channel:", BY_CHANNEL, channel); + while(msg.getUnreadLength()) + { + userNick = msg.readString(); + if (userNick == "") + { + break; + } + userModes = msg.readString(); + if (userModes.find('o') != std::string::npos) + { + userNick = "@" + userNick; + } + chatWindow->chatLog(userNick, BY_CHANNEL, channel); + } +} + +void ChatHandler::handleChannelEvent(MessageIn &msg) +{ + short channelId = msg.readInt16(); + char eventId = msg.readInt8(); + std::string line = msg.readString(); + Channel *channel = channelManager->findById(channelId); + + if(channel) + { + switch(eventId) + { + case CHAT_EVENT_NEW_PLAYER: + line += " entered the channel."; + break; + + case CHAT_EVENT_LEAVING_PLAYER: + line += " left the channel."; + break; + + case CHAT_EVENT_TOPIC_CHANGE: + line = "Topic: " + line; + break; + + case CHAT_EVENT_MODE_CHANGE: + { + int first = line.find(":"); + int second = line.find(":", first+1); + std::string user1 = line.substr(0, first); + std::string user2 = line.substr(first+1, second); + std::string mode = line.substr(second+1, line.length()); + line = user1 + " has set mode " + mode + " on user " + user2; + } break; + + case CHAT_EVENT_KICKED_PLAYER: + { + int first = line.find(":"); + std::string user1 = line.substr(0, first); + std::string user2 = line.substr(first+1, line.length()); + line = user1 + " has kicked " + user2; + } break; + + default: + line = "Unknown channel event."; + } + + chatWindow->chatLog(line, BY_CHANNEL, channel->getName()); + } +} + diff --git a/src/net/tmwserv/chathandler.h b/src/net/tmwserv/chathandler.h new file mode 100644 index 00000000..013b955d --- /dev/null +++ b/src/net/tmwserv/chathandler.h @@ -0,0 +1,84 @@ +/* + * The Mana World + * Copyright (C) 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef NET_CHATHANDLER_H +#define NET_CHATHANDLER_H + +#include "../messagehandler.h" + +class ChatHandler : public MessageHandler +{ + public: + ChatHandler(); + + /** + * Handle the given message appropriately. + */ + void handleMessage(MessageIn &msg); + + private: + /** + * Handle chat messages sent from the game server. + */ + void handleGameChatMessage(MessageIn &msg); + + /** + * Handle channel entry responses. + */ + void handleEnterChannelResponse(MessageIn &msg); + + /** + * Handle list channels responses. + */ + void handleListChannelsResponse(MessageIn &msg); + + /** + * Handle private messages. + */ + void handlePrivateMessage(MessageIn &msg); + + /** + * Handle announcements. + */ + void handleAnnouncement(MessageIn &msg); + + /** + * Handle chat messages. + */ + void handleChatMessage(MessageIn &msg); + + /** + * Handle quit channel responses. + */ + void handleQuitChannelResponse(MessageIn &msg); + + /** + * Handle list channel users responses. + */ + void handleListChannelUsersResponse(MessageIn &msg); + + /** + * Handle channel events. + */ + void handleChannelEvent(MessageIn &msg); +}; + +#endif diff --git a/src/net/tmwserv/chatserver/chatserver.cpp b/src/net/tmwserv/chatserver/chatserver.cpp new file mode 100644 index 00000000..39ffef4a --- /dev/null +++ b/src/net/tmwserv/chatserver/chatserver.cpp @@ -0,0 +1,146 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "chatserver.h" + +#include "internal.h" + +#include "../connection.h" +#include "../../messageout.h" +#include "../protocol.h" + +using Net::ChatServer::connection; + +void Net::ChatServer::connect(Net::Connection *connection, + const std::string &token) +{ + Net::ChatServer::connection = connection; + + MessageOut msg(PCMSG_CONNECT); + + msg.writeString(token, 32); + + connection->send(msg); +} + +void Net::ChatServer::logout() +{ + MessageOut msg(PCMSG_DISCONNECT); + + connection->send(msg); +} + +void Net::ChatServer::chat(short channel, const std::string &text) +{ + MessageOut msg(PCMSG_CHAT); + + msg.writeString(text); + msg.writeInt16(channel); + + connection->send(msg); +} + +void Net::ChatServer::announce(const std::string &text) +{ + MessageOut msg(PCMSG_ANNOUNCE); + + msg.writeString(text); + + connection->send(msg); +} + +void Net::ChatServer::privMsg(const std::string &recipient, + const std::string &text) +{ + MessageOut msg(PCMSG_PRIVMSG); + + msg.writeString(recipient); + msg.writeString(text); + + connection->send(msg); +} + +void Net::ChatServer::enterChannel(const std::string &channel, const std::string &password) +{ + MessageOut msg(PCMSG_ENTER_CHANNEL); + + msg.writeString(channel); + msg.writeString(password); + + connection->send(msg); +} + +void Net::ChatServer::quitChannel(short channel) +{ + MessageOut msg(PCMSG_QUIT_CHANNEL); + + msg.writeInt16(channel); + + connection->send(msg); +} + +void Net::ChatServer::getChannelList() +{ + MessageOut msg(PCMSG_LIST_CHANNELS); + + connection->send(msg); +} + +void Net::ChatServer::getUserList(const std::string &channel) +{ + MessageOut msg(PCMSG_LIST_CHANNELUSERS); + + msg.writeString(channel); + + connection->send(msg); +} + +void Net::ChatServer::setChannelTopic(short channel, const std::string &topic) +{ + MessageOut msg(PCMSG_TOPIC_CHANGE); + + msg.writeInt16(channel); + msg.writeString(topic); + + connection->send(msg); +} + +void Net::ChatServer::setUserMode(short channel, const std::string &user, + unsigned char mode) +{ + MessageOut msg(PCMSG_USER_MODE); + + msg.writeInt16(channel); + msg.writeString(user); + msg.writeInt8(mode); + + connection->send(msg); +} + +void Net::ChatServer::kickUser(short channel, const std::string &user) +{ + MessageOut msg(PCMSG_KICK_USER); + + msg.writeInt16(channel); + msg.writeString(user); + + connection->send(msg); +} diff --git a/src/net/tmwserv/chatserver/chatserver.h b/src/net/tmwserv/chatserver/chatserver.h new file mode 100644 index 00000000..1129239a --- /dev/null +++ b/src/net/tmwserv/chatserver/chatserver.h @@ -0,0 +1,60 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_CHATSERVER_CHATSERVER_H +#define _TMW_NET_CHATSERVER_CHATSERVER_H + +#include + +namespace Net +{ + class Connection; + + namespace ChatServer + { + void connect(Net::Connection *connection, const std::string &token); + + void logout(); + + void chat(short channel, const std::string &text); + + void announce(const std::string &text); + + void privMsg(const std::string &recipient, const std::string &text); + + void enterChannel(const std::string &channel, const std::string &password); + + void quitChannel(short channel); + + void getChannelList(); + + void getUserList(const std::string &channel); + + void setChannelTopic(short channel, const std::string &topic); + + void setUserMode(short channel, const std::string &user, unsigned char mode); + + void kickUser(short channel, const std::string &user); + + } +} + +#endif diff --git a/src/net/tmwserv/chatserver/guild.cpp b/src/net/tmwserv/chatserver/guild.cpp new file mode 100644 index 00000000..649eccdf --- /dev/null +++ b/src/net/tmwserv/chatserver/guild.cpp @@ -0,0 +1,95 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#include "guild.h" + +#include "internal.h" + +#include "../connection.h" +#include "../../messageout.h" +#include "../protocol.h" + +#include "../../../log.h" + +void Net::ChatServer::Guild::createGuild(const std::string &name) +{ + logger->log("Sending PCMSG_GUILD_CREATE"); + MessageOut msg(PCMSG_GUILD_CREATE); + + msg.writeString(name); + + Net::ChatServer::connection->send(msg); +} + +void Net::ChatServer::Guild::invitePlayer(const std::string &name, short guildId) +{ + logger->log("Sending PCMSG_GUILD_INVITE"); + MessageOut msg(PCMSG_GUILD_INVITE); + + msg.writeInt16(guildId); + msg.writeString(name); + + Net::ChatServer::connection->send(msg); +} + +void Net::ChatServer::Guild::acceptInvite(const std::string &name) +{ + logger->log("Sending PCMSG_GUILD_ACCEPT"); + MessageOut msg(PCMSG_GUILD_ACCEPT); + + msg.writeString(name); + + Net::ChatServer::connection->send(msg); +} + +void Net::ChatServer::Guild::getGuildMembers(short guildId) +{ + logger->log("Sending PCMSG_GUILD_GET_MEMBERS"); + MessageOut msg(PCMSG_GUILD_GET_MEMBERS); + + msg.writeInt16(guildId); + + Net::ChatServer::connection->send(msg); +} + +void Net::ChatServer::Guild::promoteMember(const std::string &name, + short guildId, short level) +{ + logger->log("Sending PCMSG_GUILD_PROMOTE_MEMBER"); + MessageOut msg(PCMSG_GUILD_PROMOTE_MEMBER); + + msg.writeInt16(guildId); + msg.writeString(name); + msg.writeInt8(level); + + Net::ChatServer::connection->send(msg); +} + +void Net::ChatServer::Guild::quitGuild(short guildId) +{ + logger->log("Sending PCMSG_GUILD_QUIT"); + MessageOut msg(PCMSG_GUILD_QUIT); + + msg.writeInt16(guildId); + + Net::ChatServer::connection->send(msg); +} diff --git a/src/net/tmwserv/chatserver/guild.h b/src/net/tmwserv/chatserver/guild.h new file mode 100644 index 00000000..6c35be9f --- /dev/null +++ b/src/net/tmwserv/chatserver/guild.h @@ -0,0 +1,69 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#ifndef _TMW_NET_CHATSERVER_GUILD_H +#define _TMW_NET_CHATSERVER_GUILD_H + +#include + +namespace Net +{ + namespace ChatServer + { + namespace Guild + { + /** + * Create guild. + */ + void createGuild(const std::string &name); + + /** + * Invite a player to your guild. + */ + void invitePlayer(const std::string &name, short guildId); + + /** + * Accept an invite another player has sent to join their guild. + */ + void acceptInvite(const std::string &name); + + /** + * Get a list of members in a guild. + */ + void getGuildMembers(short guildId); + + /** + * Promote guild member + */ + void promoteMember(const std::string &name, short guildId, + short level); + + /** + * Quit guild. + */ + void quitGuild(short guildId); + } + } +} + +#endif + diff --git a/src/net/tmwserv/chatserver/internal.cpp b/src/net/tmwserv/chatserver/internal.cpp new file mode 100644 index 00000000..0822d93d --- /dev/null +++ b/src/net/tmwserv/chatserver/internal.cpp @@ -0,0 +1,32 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "internal.h" + +namespace Net +{ + class Connection; + + namespace ChatServer + { + Connection *connection = 0; + } +} diff --git a/src/net/tmwserv/chatserver/internal.h b/src/net/tmwserv/chatserver/internal.h new file mode 100644 index 00000000..b0f137c5 --- /dev/null +++ b/src/net/tmwserv/chatserver/internal.h @@ -0,0 +1,35 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_CHATSERVER_INTERNAL_H +#define _TMW_NET_CHATSERVER_INTERNAL_H + +namespace Net +{ + class Connection; + + namespace ChatServer + { + extern Connection *connection; + } +} + +#endif diff --git a/src/net/tmwserv/chatserver/party.cpp b/src/net/tmwserv/chatserver/party.cpp new file mode 100644 index 00000000..c2c0b00a --- /dev/null +++ b/src/net/tmwserv/chatserver/party.cpp @@ -0,0 +1,70 @@ +/* + * The Mana World + * Copyright 2008 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#include "party.h" + +#include "internal.h" + +#include "../connection.h" +#include "../../messageout.h" +#include "../protocol.h" + +#include "../../../log.h" + +void Net::ChatServer::Party::invitePlayer(const std::string &name) +{ + logger->log("Sending PCMSG_PARTY_INVITE"); + MessageOut msg(PCMSG_PARTY_INVITE); + + msg.writeString(name); + + Net::ChatServer::connection->send(msg); +} + +void Net::ChatServer::Party::acceptInvite(const std::string &name) +{ + logger->log("Sending PCMSG_PARTY_ACCEPT_INVITE"); + MessageOut msg(PCMSG_PARTY_ACCEPT_INVITE); + + msg.writeString(name); + + Net::ChatServer::connection->send(msg); +} + +void Net::ChatServer::Party::getPartyMembers() +{ + logger->log("Sending PCMSG_PARTY_GET_MEMBERS"); +// MessageOut msg(PCMSG_GUILD_GET_MEMBERS); + +// msg.writeInt16(guildId); + +// Net::ChatServer::connection->send(msg); +} + +void Net::ChatServer::Party::quitParty() +{ + logger->log("Sending PCMSG_PARTY_QUIT"); + MessageOut msg(PCMSG_PARTY_QUIT); + + Net::ChatServer::connection->send(msg); +} + diff --git a/src/net/tmwserv/chatserver/party.h b/src/net/tmwserv/chatserver/party.h new file mode 100644 index 00000000..c1febd66 --- /dev/null +++ b/src/net/tmwserv/chatserver/party.h @@ -0,0 +1,57 @@ +/* + * The Mana World + * Copyright 2008 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#ifndef _TMW_NET_CHATSERVER_PARTY_H +#define _TMW_NET_CHATSERVER_PARTY_H + +#include + +namespace Net +{ + namespace ChatServer + { + namespace Party + { + /** + * Invite a player to the party. + */ + void invitePlayer(const std::string &name); + + /** + * Accept an invite another player has sent to join their party + */ + void acceptInvite(const std::string &name); + + /** + * Get a list of party members + */ + void getPartyMembers(); + + /** + * Leave party + */ + void quitParty(); + } + } +} + +#endif diff --git a/src/net/tmwserv/connection.cpp b/src/net/tmwserv/connection.cpp new file mode 100644 index 00000000..5e61ba61 --- /dev/null +++ b/src/net/tmwserv/connection.cpp @@ -0,0 +1,103 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "connection.h" + +#include + +#include "internal.h" +#include "../messageout.h" + +#include "../../log.h" + +Net::Connection::Connection(ENetHost *client): + mConnection(0), mClient(client) +{ + Net::connections++; +} + +Net::Connection::~Connection() +{ + Net::connections--; +} + +bool Net::Connection::connect(const std::string &address, short port) +{ + logger->log("Net::Connection::connect(%s, %i)", address.c_str(), port); + + if (address.empty()) + { + logger->log("Net::Connection::connect() got empty address!"); + mState = NET_ERROR; + return false; + } + + ENetAddress enetAddress; + + enet_address_set_host(&enetAddress, address.c_str()); + enetAddress.port = port; + + // Initiate the connection, allocating channel 0. + mConnection = enet_host_connect(mClient, &enetAddress, 1); + + if (!mConnection) + { + logger->log("Unable to initiate connection to the server."); + mState = NET_ERROR; + return false; + } + + return true; +} + +void Net::Connection::disconnect() +{ + if (!mConnection) + return; + + enet_peer_disconnect(mConnection, 0); + enet_host_flush(mClient); + enet_peer_reset(mConnection); + + mConnection = 0; +} + +bool Net::Connection::isConnected() +{ + return bool (mConnection) ? + (mConnection->state == ENET_PEER_STATE_CONNECTED) : false; +} + +void Net::Connection::send(const MessageOut &msg) +{ + if (!isConnected()) + { + logger->log("Warning: cannot send message to not connected server!"); + return; + } + + //logger->log("Sending message of size %d...", msg.getDataSize()); + + ENetPacket *packet = enet_packet_create(msg.getData(), + msg.getDataSize(), + ENET_PACKET_FLAG_RELIABLE); + enet_peer_send(mConnection, 0, packet); +} diff --git a/src/net/tmwserv/connection.h b/src/net/tmwserv/connection.h new file mode 100644 index 00000000..4ab3d24d --- /dev/null +++ b/src/net/tmwserv/connection.h @@ -0,0 +1,80 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_CONNECTION_H +#define _TMW_NET_CONNECTION_H + +#include + +#include + +class MessageOut; + +namespace Net +{ + /** + * \ingroup Network + */ + class Connection + { + public: + enum State { + OK, + NET_ERROR + }; + + ~Connection(); + + /** + * Connects to the given server with the specified address and port. + * This method is non-blocking, use isConnected to check whether the + * server is connected. + */ + bool connect(const std::string &address, short port); + + /** + * Disconnects from the given server. + */ + void disconnect(); + + State getState() { return mState; } + + /** + * Returns whether the server is connected. + */ + bool isConnected(); + + /** + * Sends a message. + */ + void send(const MessageOut &msg); + + private: + friend Connection *Net::getConnection(); + Connection(ENetHost *client); + + ENetPeer *mConnection; + ENetHost *mClient; + State mState; + }; +} + +#endif diff --git a/src/net/tmwserv/effecthandler.cpp b/src/net/tmwserv/effecthandler.cpp new file mode 100644 index 00000000..ef8d63fb --- /dev/null +++ b/src/net/tmwserv/effecthandler.cpp @@ -0,0 +1,58 @@ +/* + * The Mana World + * Copyright (C) 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "effecthandler.h" + +#include "../messagein.h" +#include "protocol.h" + +#include "../../effectmanager.h" + + +EffectHandler::EffectHandler() +{ + static const Uint16 _messages[] = { + GPMSG_CREATE_EFFECT, + 0 + }; + handledMessages = _messages; +} + +void EffectHandler::handleMessage(MessageIn &msg) +{ + switch (msg.getId()) + { + case GPMSG_CREATE_EFFECT: + handleCreateEffects(msg); + break; + default: + break; + } +} + +void EffectHandler::handleCreateEffects(MessageIn &msg) +{ + int id = msg.readInt16(); + Uint16 x = msg.readInt16(); + Uint16 y = msg.readInt16(); + effectManager->trigger(id, x, y); +} + diff --git a/src/net/tmwserv/effecthandler.h b/src/net/tmwserv/effecthandler.h new file mode 100644 index 00000000..a19f13c3 --- /dev/null +++ b/src/net/tmwserv/effecthandler.h @@ -0,0 +1,38 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_EFFECTSHANDLER_H +#define _TMW_NET_EFFECTSHANDLER_H + +#include "../messagehandler.h" + +class EffectHandler : public MessageHandler +{ + public: + EffectHandler(); + + void handleMessage(MessageIn &msg); + + private: + void handleCreateEffects(MessageIn &msg); +}; + +#endif diff --git a/src/net/tmwserv/gameserver/gameserver.cpp b/src/net/tmwserv/gameserver/gameserver.cpp new file mode 100644 index 00000000..013356d8 --- /dev/null +++ b/src/net/tmwserv/gameserver/gameserver.cpp @@ -0,0 +1,49 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "gameserver.h" + +#include "internal.h" + +#include "../connection.h" +#include "../../messageout.h" +#include "../protocol.h" + +void Net::GameServer::connect(Net::Connection *connection, + const std::string &token) +{ + Net::GameServer::connection = connection; + + MessageOut msg(PGMSG_CONNECT); + + msg.writeString(token, 32); + + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::logout(bool reconnectAccount) +{ + MessageOut msg(PGMSG_DISCONNECT); + + msg.writeInt8((unsigned char) reconnectAccount); + + Net::GameServer::connection->send(msg); +} diff --git a/src/net/tmwserv/gameserver/gameserver.h b/src/net/tmwserv/gameserver/gameserver.h new file mode 100644 index 00000000..5ea2c718 --- /dev/null +++ b/src/net/tmwserv/gameserver/gameserver.h @@ -0,0 +1,39 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_GAMESERVER_GAMESERVER_H +#define _TMW_NET_GAMESERVER_GAMESERVER_H + +#include + +namespace Net +{ + class Connection; + + namespace GameServer + { + void connect(Net::Connection *connection, const std::string &token); + + void logout(bool reconnectAccount); + } +} + +#endif diff --git a/src/net/tmwserv/gameserver/internal.cpp b/src/net/tmwserv/gameserver/internal.cpp new file mode 100644 index 00000000..6b6ba081 --- /dev/null +++ b/src/net/tmwserv/gameserver/internal.cpp @@ -0,0 +1,32 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "internal.h" + +namespace Net +{ + class Connection; + + namespace GameServer + { + Connection *connection = 0; + } +} diff --git a/src/net/tmwserv/gameserver/internal.h b/src/net/tmwserv/gameserver/internal.h new file mode 100644 index 00000000..df9787fe --- /dev/null +++ b/src/net/tmwserv/gameserver/internal.h @@ -0,0 +1,35 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_GAMESERVER_INTERNAL_H +#define _TMW_NET_GAMESERVER_INTERNAL_H + +namespace Net +{ + class Connection; + + namespace GameServer + { + extern Connection *connection; + } +} + +#endif diff --git a/src/net/tmwserv/gameserver/player.cpp b/src/net/tmwserv/gameserver/player.cpp new file mode 100644 index 00000000..4eccdceb --- /dev/null +++ b/src/net/tmwserv/gameserver/player.cpp @@ -0,0 +1,202 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "player.h" + +#include "internal.h" + +#include "../connection.h" +#include "../../messageout.h" +#include "../protocol.h" + +void RespawnRequestListener::action(const gcn::ActionEvent &event) +{ + Net::GameServer::Player::respawn(); +} + +void Net::GameServer::Player::say(const std::string &text) +{ + MessageOut msg(PGMSG_SAY); + msg.writeString(text); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::walk(int x, int y) +{ + MessageOut msg(PGMSG_WALK); + msg.writeInt16(x); + msg.writeInt16(y); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::pickUp(int x, int y) +{ + MessageOut msg(PGMSG_PICKUP); + msg.writeInt16(x); + msg.writeInt16(y); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::moveItem(int oldSlot, int newSlot, int amount) +{ + MessageOut msg(PGMSG_MOVE_ITEM); + msg.writeInt8(oldSlot); + msg.writeInt8(newSlot); + msg.writeInt8(amount); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::drop(int slot, int amount) +{ + MessageOut msg(PGMSG_DROP); + msg.writeInt8(slot); + msg.writeInt8(amount); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::equip(int slot) +{ + MessageOut msg(PGMSG_EQUIP); + msg.writeInt8(slot); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::unequip(int slot) +{ + MessageOut msg(PGMSG_UNEQUIP); + msg.writeInt8(slot); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::useItem(int slot) +{ + MessageOut msg(PGMSG_USE_ITEM); + msg.writeInt8(slot); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::attack(int direction) +{ + MessageOut msg(PGMSG_ATTACK); + msg.writeInt8(direction); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::useSpecial(int special) +{ + MessageOut msg(PGMSG_USE_SPECIAL); + msg.writeInt8(special); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::changeAction(Being::Action action) +{ + MessageOut msg(PGMSG_ACTION_CHANGE); + msg.writeInt8(action); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::talkToNPC(int id, bool restart) +{ + MessageOut msg(restart ? PGMSG_NPC_TALK : PGMSG_NPC_TALK_NEXT); + msg.writeInt16(id); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::selectFromNPC(int id, int choice) +{ + MessageOut msg(PGMSG_NPC_SELECT); + msg.writeInt16(id); + msg.writeInt8(choice); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::requestTrade(int id) +{ + MessageOut msg(PGMSG_TRADE_REQUEST); + msg.writeInt16(id); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::acceptTrade(bool accept) +{ + MessageOut msg(accept ? PGMSG_TRADE_ACCEPT : PGMSG_TRADE_CANCEL); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::tradeItem(int slot, int amount) +{ + MessageOut msg(PGMSG_TRADE_ADD_ITEM); + msg.writeInt8(slot); + msg.writeInt8(amount); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::tradeMoney(int amount) +{ + MessageOut msg(PGMSG_TRADE_SET_MONEY); + msg.writeInt32(amount); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::tradeWithNPC(int item, int amount) +{ + MessageOut msg(PGMSG_NPC_BUYSELL); + msg.writeInt16(item); + msg.writeInt16(amount); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::sendLetter(const std::string &player, + const std::string &text) +{ + MessageOut msg(PGMSG_NPC_POST_SEND); + msg.writeString(player); + msg.writeString(text); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::raiseAttribute(int attribute) +{ + MessageOut msg(PGMSG_RAISE_ATTRIBUTE); + msg.writeInt8(attribute); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::lowerAttribute(int attribute) +{ + MessageOut msg(PGMSG_LOWER_ATTRIBUTE); + msg.writeInt8(attribute); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::respawn() +{ + MessageOut msg(PGMSG_RESPAWN); + Net::GameServer::connection->send(msg); +} + +void Net::GameServer::Player::changeDir(unsigned char dir) +{ + MessageOut msg(PGMSG_DIRECTION_CHANGE); + msg.writeInt8(dir); + Net::GameServer::connection->send(msg); +} diff --git a/src/net/tmwserv/gameserver/player.h b/src/net/tmwserv/gameserver/player.h new file mode 100644 index 00000000..496e3a70 --- /dev/null +++ b/src/net/tmwserv/gameserver/player.h @@ -0,0 +1,71 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_GAMESERVER_PLAYER_H +#define _TMW_NET_GAMESERVER_PLAYER_H + +#include "../../../being.h" + +#include + +#include + + +struct RespawnRequestListener : public gcn::ActionListener +{ + void action(const gcn::ActionEvent &event); +}; + +namespace Net +{ + namespace GameServer + { + namespace Player + { + void say(const std::string &text); + void walk(int x, int y); + void pickUp(int x, int y); + void moveItem(int oldSlot, int newSlot, int amount); + void drop(int slot, int amount); + void equip(int slot); + void unequip(int slot); + void useItem(int slot); + void attack(int direction); + void useSpecial(int special); + void changeAction(Being::Action action); + void talkToNPC(int id, bool restart); + void selectFromNPC(int id, int choice); + void requestTrade(int id); + void acceptTrade(bool accept); + void tradeItem(int slot, int amount); + void tradeMoney(int amount); + void tradeWithNPC(int item, int amount); + void sendLetter(const std::string &player, const std::string &text); + void raiseAttribute(int attribute); + void lowerAttribute(int attribute); + void respawn(); + static RespawnRequestListener respawnListener; + void changeDir(unsigned char dir); + } + } +} + +#endif diff --git a/src/net/tmwserv/guildhandler.cpp b/src/net/tmwserv/guildhandler.cpp new file mode 100644 index 00000000..1699ffac --- /dev/null +++ b/src/net/tmwserv/guildhandler.cpp @@ -0,0 +1,240 @@ +/* + * The Mana World + * Copyright 2008 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include "guildhandler.h" + +#include "protocol.h" +#include "../messagein.h" + +#include "chatserver/chatserver.h" +#include "chatserver/guild.h" + +#include "../../gui/guildwindow.h" +#include "../../gui/chat.h" +#include "../../guild.h" +#include "../../log.h" +#include "../../localplayer.h" +#include "../../channel.h" +#include "../../channelmanager.h" + +GuildHandler::GuildHandler() +{ + static const Uint16 _messages[] = { + CPMSG_GUILD_CREATE_RESPONSE, + CPMSG_GUILD_INVITE_RESPONSE, + CPMSG_GUILD_ACCEPT_RESPONSE, + CPMSG_GUILD_GET_MEMBERS_RESPONSE, + CPMSG_GUILD_UPDATE_LIST, + CPMSG_GUILD_INVITED, + CPMSG_GUILD_REJOIN, + CPMSG_GUILD_QUIT_RESPONSE, + 0 + }; + handledMessages = _messages; + +} + +void GuildHandler::handleMessage(MessageIn &msg) +{ + switch (msg.getId()) + { + case CPMSG_GUILD_CREATE_RESPONSE: + { + logger->log("Received CPMSG_GUILD_CREATE_RESPONSE"); + if(msg.readInt8() == ERRMSG_OK) + { + // TODO - Acknowledge guild was created + chatWindow->chatLog("Guild created."); + joinedGuild(msg); + } + else + { + chatWindow->chatLog("Error creating guild."); + } + } break; + + case CPMSG_GUILD_INVITE_RESPONSE: + { + logger->log("Received CPMSG_GUILD_INVITE_RESPONSE"); + if(msg.readInt8() == ERRMSG_OK) + { + // TODO - Acknowledge invite was sent + chatWindow->chatLog("Invite sent."); + } + } break; + + case CPMSG_GUILD_ACCEPT_RESPONSE: + { + logger->log("Received CPMSG_GUILD_ACCEPT_RESPONSE"); + if(msg.readInt8() == ERRMSG_OK) + { + // TODO - Acknowledge accepted into guild + joinedGuild(msg); + } + } break; + + case CPMSG_GUILD_GET_MEMBERS_RESPONSE: + { + logger->log("Received CPMSG_GUILD_GET_MEMBERS_RESPONSE"); + if(msg.readInt8() == ERRMSG_OK) + { + std::string guildMember; + bool online; + std::string guildName; + Guild *guild; + + short guildId = msg.readInt16(); + guild = player_node->getGuild(guildId); + + if (!guild) + return; + + guildName = guild->getName(); + + while(msg.getUnreadLength()) + { + guildMember = msg.readString(); + online = msg.readInt8(); + if(guildMember != "") + { + guild->addMember(guildMember); + guildWindow->setOnline(guildName, guildMember, online); + } + } + + guildWindow->updateTab(); + } + } break; + + case CPMSG_GUILD_UPDATE_LIST: + { + logger->log("Received CPMSG_GUILD_UPDATE_LIST"); + short guildId = msg.readInt16(); + std::string guildMember = msg.readString(); + char eventId = msg.readInt8(); + + Guild *guild = player_node->getGuild(guildId); + if (guild) + { + switch(eventId) + { + case GUILD_EVENT_NEW_PLAYER: + guild->addMember(guildMember); + guildWindow->setOnline(guild->getName(), guildMember, true); + break; + + case GUILD_EVENT_LEAVING_PLAYER: + guild->removeMember(guildMember); + break; + + case GUILD_EVENT_ONLINE_PLAYER: + guildWindow->setOnline(guild->getName(), guildMember, true); + break; + + case GUILD_EVENT_OFFLINE_PLAYER: + guildWindow->setOnline(guild->getName(), guildMember, false); + break; + + default: + logger->log("Invalid guild event"); + } + } + guildWindow->updateTab(); + + + } break; + + case CPMSG_GUILD_INVITED: + { + logger->log("Received CPMSG_GUILD_INVITED"); + std::string inviterName = msg.readString(); + std::string guildName = msg.readString(); + + // Open a dialog asking if the player accepts joining the guild. + guildWindow->openAcceptDialog(inviterName, guildName); + } break; + + case CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE: + { + logger->log("Received CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE"); + + if (msg.readInt8() == ERRMSG_OK) + { + // promotion succeeded + chatWindow->chatLog("Member was promoted successfully"); + } + else + { + // promotion failed + chatWindow->chatLog("Failed to promote member"); + } + } + + case CPMSG_GUILD_REJOIN: + { + logger->log("Received CPMSG_GUILD_REJOIN"); + + joinedGuild(msg); + } break; + + case CPMSG_GUILD_QUIT_RESPONSE: + { + logger->log("Received CPMSG_GUILD_QUIT_RESPONSE"); + + if (msg.readInt8() == ERRMSG_OK) + { + // Must remove tab first, as it wont find the guild + // name after its removed from the player + int guildId = msg.readInt16(); + Guild *guild = player_node->getGuild(guildId); + if (guild) + { + chatWindow->removeChannel(guild->getName()); + guildWindow->removeTab(guildId); + player_node->removeGuild(guildId); + } + } + } break; + } +} + +void GuildHandler::joinedGuild(MessageIn &msg) +{ + std::string guildName = msg.readString(); + short guildId = msg.readInt16(); + short permissions = msg.readInt16(); + short channelId = msg.readInt16(); + std::string announcement = msg.readString(); + + // Add guild to player and create new guild tab + Guild *guild = player_node->addGuild(guildId, permissions); + guild->setName(guildName); + guildWindow->newGuildTab(guildName); + guildWindow->requestMemberList(guildId); + + // Automatically create the guild channel + // COMMENT: Should this go here?? + Channel *channel = new Channel(channelId, guildName, announcement); + channelManager->addChannel(channel); + chatWindow->createNewChannelTab(guildName); + chatWindow->chatLog("Topic: " + announcement, BY_CHANNEL, guildName); +} diff --git a/src/net/tmwserv/guildhandler.h b/src/net/tmwserv/guildhandler.h new file mode 100644 index 00000000..a962a577 --- /dev/null +++ b/src/net/tmwserv/guildhandler.h @@ -0,0 +1,40 @@ +/* + * The Mana World + * Copyright 2008 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_GUILDHANDLER_H +#define _TMW_NET_GUILDHANDLER_H + +#include "../messagehandler.h" + +#include + +class GuildHandler : public MessageHandler +{ +public: + GuildHandler(); + + void handleMessage(MessageIn &msg); + +protected: + void joinedGuild(MessageIn &msg); +}; + +#endif diff --git a/src/net/tmwserv/internal.cpp b/src/net/tmwserv/internal.cpp new file mode 100644 index 00000000..4cb88a4e --- /dev/null +++ b/src/net/tmwserv/internal.cpp @@ -0,0 +1,27 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "internal.h" + +namespace Net +{ + int connections = 0; +} diff --git a/src/net/tmwserv/internal.h b/src/net/tmwserv/internal.h new file mode 100644 index 00000000..1e411605 --- /dev/null +++ b/src/net/tmwserv/internal.h @@ -0,0 +1,30 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_INTERNAL_H +#define _TMW_NET_INTERNAL_H + +namespace Net +{ + extern int connections; +} + +#endif diff --git a/src/net/tmwserv/inventoryhandler.cpp b/src/net/tmwserv/inventoryhandler.cpp new file mode 100644 index 00000000..c6e82410 --- /dev/null +++ b/src/net/tmwserv/inventoryhandler.cpp @@ -0,0 +1,79 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "inventoryhandler.h" + +#include + +#include "../messagein.h" +#include "protocol.h" + +#include "../../equipment.h" +#include "../../inventory.h" +#include "../../item.h" +#include "../../itemshortcut.h" +#include "../../localplayer.h" + +#include "../../gui/chat.h" +#include "../../resources/iteminfo.h" + +InventoryHandler::InventoryHandler() +{ + static const Uint16 _messages[] = { + GPMSG_INVENTORY_FULL, + GPMSG_INVENTORY, + 0 + }; + handledMessages = _messages; +} + +void InventoryHandler::handleMessage(MessageIn &msg) +{ + switch (msg.getId()) + { + case GPMSG_INVENTORY_FULL: + player_node->clearInventory(); + // no break! + + case GPMSG_INVENTORY: + while (msg.getUnreadLength()) + { + int slot = msg.readInt8(); + if (slot == 255) + { + player_node->setMoney(msg.readInt32()); + continue; + } + + int id = msg.readInt16(); + if (slot < EQUIPMENT_SIZE) + { + player_node->mEquipment->setEquipment(slot, id); + } + else if (slot >= 32 && slot < 32 + INVENTORY_SIZE) + { + int amount = id ? msg.readInt8() : 0; + player_node->setInvItem(slot - 32, id, amount); + } + }; + break; + } +} diff --git a/src/net/tmwserv/inventoryhandler.h b/src/net/tmwserv/inventoryhandler.h new file mode 100644 index 00000000..b2e469fa --- /dev/null +++ b/src/net/tmwserv/inventoryhandler.h @@ -0,0 +1,35 @@ +/* + * The Mana World + * Copyright (C) 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef NET_INVENTORYHANDLER_H +#define NET_INVENTORYHANDLER_H + +#include "../messagehandler.h" + +class InventoryHandler : public MessageHandler +{ + public: + InventoryHandler(); + + void handleMessage(MessageIn &msg); +}; + +#endif diff --git a/src/net/tmwserv/itemhandler.cpp b/src/net/tmwserv/itemhandler.cpp new file mode 100644 index 00000000..23d210cf --- /dev/null +++ b/src/net/tmwserv/itemhandler.cpp @@ -0,0 +1,64 @@ +/* + * The Mana World + * Copyright (C) 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "itemhandler.h" +#include "../messagein.h" +#include "protocol.h" + +#include "../../engine.h" +#include "../../flooritemmanager.h" + +ItemHandler::ItemHandler() +{ + static const Uint16 _messages[] = { + GPMSG_ITEMS, + GPMSG_ITEM_APPEAR, + 0 + }; + handledMessages = _messages; +} + +void ItemHandler::handleMessage(MessageIn &msg) +{ + switch (msg.getId()) + { + case GPMSG_ITEM_APPEAR: + case GPMSG_ITEMS: + { + while (msg.getUnreadLength()) + { + int itemId = msg.readInt16(); + int x = msg.readInt16(); + int y = msg.readInt16(); + int id = (x << 16) | y; // dummy id + + if (itemId) + { + floorItemManager->create(id, itemId, x / 32, y / 32, engine->getCurrentMap()); + } + else if (FloorItem *item = floorItemManager->findById(id)) + { + floorItemManager->destroy(item); + } + } + } break; + } +} diff --git a/src/net/tmwserv/itemhandler.h b/src/net/tmwserv/itemhandler.h new file mode 100644 index 00000000..da93f6b4 --- /dev/null +++ b/src/net/tmwserv/itemhandler.h @@ -0,0 +1,35 @@ +/* + * The Mana World + * Copyright (C) 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef NET_ITEMHANDLER_H +#define NET_ITEMHANDLER_H + +#include "../messagehandler.h" + +class ItemHandler : public MessageHandler +{ + public: + ItemHandler(); + + void handleMessage(MessageIn &msg); +}; + +#endif diff --git a/src/net/tmwserv/loginhandler.cpp b/src/net/tmwserv/loginhandler.cpp new file mode 100644 index 00000000..c49d6e47 --- /dev/null +++ b/src/net/tmwserv/loginhandler.cpp @@ -0,0 +1,225 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "loginhandler.h" + +#include "../messagein.h" +#include "protocol.h" + +#include "../../logindata.h" +#include "../../main.h" + +LoginHandler::LoginHandler() +{ + static const Uint16 _messages[] = { + APMSG_LOGIN_RESPONSE, + APMSG_REGISTER_RESPONSE, + APMSG_RECONNECT_RESPONSE, + APMSG_PASSWORD_CHANGE_RESPONSE, + APMSG_EMAIL_CHANGE_RESPONSE, + 0 + }; + handledMessages = _messages; +} + +void LoginHandler::setLoginData(LoginData *loginData) +{ + mLoginData = loginData; +} + +void LoginHandler::handleMessage(MessageIn &msg) +{ + switch (msg.getId()) + { + case APMSG_LOGIN_RESPONSE: + handleLoginResponse(msg); + break; + case APMSG_REGISTER_RESPONSE: + handleRegisterResponse(msg); + break; + case APMSG_RECONNECT_RESPONSE: + { + int errMsg = msg.readInt8(); + // Successful login + if (errMsg == ERRMSG_OK) + { + state = STATE_CHAR_SELECT; + } + // Login failed + else + { + switch (errMsg) { + case ERRMSG_INVALID_ARGUMENT: + errorMessage = "Wrong magic_token"; + break; + case ERRMSG_FAILURE: + errorMessage = "Already logged in"; + break; + case LOGIN_SERVER_FULL: + errorMessage = "Server is full"; + break; + default: + errorMessage = "Unknown error"; + break; + } + state = STATE_ERROR; + } + } + break; + + case APMSG_PASSWORD_CHANGE_RESPONSE: + { + int errMsg = msg.readInt8(); + // Successful pass change + if (errMsg == ERRMSG_OK) + { + state = STATE_CHANGEPASSWORD; + } + // pass change failed + else + { + switch (errMsg) { + case ERRMSG_INVALID_ARGUMENT: + errorMessage = "New password incorrect"; + break; + case ERRMSG_FAILURE: + errorMessage = "Old password incorrect"; + break; + case ERRMSG_NO_LOGIN: + errorMessage = "Account not connected. Please login first."; + break; + default: + errorMessage = "Unknown error"; + break; + } + state = STATE_ACCOUNTCHANGE_ERROR; + } + } + break; + + case APMSG_EMAIL_CHANGE_RESPONSE: + { + int errMsg = msg.readInt8(); + // Successful pass change + if (errMsg == ERRMSG_OK) + { + state = STATE_CHANGEEMAIL; + } + // pass change failed + else + { + switch (errMsg) { + case ERRMSG_INVALID_ARGUMENT: + errorMessage = "New email address incorrect"; + break; + case ERRMSG_FAILURE: + errorMessage = "Old email address incorrect"; + break; + case ERRMSG_NO_LOGIN: + errorMessage = "Account not connected. Please login first."; + break; + case ERRMSG_EMAIL_ALREADY_EXISTS: + errorMessage = "The new Email Address already exists."; + break; + default: + errorMessage = "Unknown error"; + break; + } + state = STATE_ACCOUNTCHANGE_ERROR; + } + } + break; + + } +} + +void LoginHandler::handleLoginResponse(MessageIn &msg) +{ + const int errMsg = msg.readInt8(); + + if (errMsg == ERRMSG_OK) + { + readUpdateHost(msg); + state = STATE_CHAR_SELECT; + } + else + { + switch (errMsg) { + case LOGIN_INVALID_VERSION: + errorMessage = "Client version is too old"; + break; + case ERRMSG_INVALID_ARGUMENT: + errorMessage = "Wrong username or password"; + break; + case ERRMSG_FAILURE: + errorMessage = "Already logged in"; + break; + case LOGIN_SERVER_FULL: + errorMessage = "Server is full"; + break; + default: + errorMessage = "Unknown error"; + break; + } + state = STATE_LOGIN_ERROR; + } +} + +void LoginHandler::handleRegisterResponse(MessageIn &msg) +{ + const int errMsg = msg.readInt8(); + + if (errMsg == ERRMSG_OK) + { + readUpdateHost(msg); + state = STATE_CHAR_SELECT; + } + else + { + switch (errMsg) { + case REGISTER_INVALID_VERSION: + errorMessage = "Client version is too old"; + break; + case ERRMSG_INVALID_ARGUMENT: + errorMessage = "Wrong username, password or email address"; + break; + case REGISTER_EXISTS_USERNAME: + errorMessage = "Username already exists"; + break; + case REGISTER_EXISTS_EMAIL: + errorMessage = "Email address already exists"; + break; + default: + errorMessage = "Unknown error"; + break; + } + state = STATE_LOGIN_ERROR; + } +} + +void LoginHandler::readUpdateHost(MessageIn &msg) +{ + // Set the update host when included in the message + if (msg.getUnreadLength() > 0) + { + mLoginData->updateHost = msg.readString(); + } +} diff --git a/src/net/tmwserv/loginhandler.h b/src/net/tmwserv/loginhandler.h new file mode 100644 index 00000000..a7310407 --- /dev/null +++ b/src/net/tmwserv/loginhandler.h @@ -0,0 +1,47 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_LOGINHANDLER_H +#define _TMW_NET_LOGINHANDLER_H + +#include "../messagehandler.h" + +class LoginData; + +class LoginHandler : public MessageHandler +{ + public: + LoginHandler(); + + void setLoginData(LoginData *loginData); + + void handleMessage(MessageIn &msg); + + private: + void handleLoginResponse(MessageIn &msg); + void handleRegisterResponse(MessageIn &msg); + + void readUpdateHost(MessageIn &msg); + + LoginData *mLoginData; +}; + +#endif // _TMW_NET_LOGINHANDLER_H diff --git a/src/net/tmwserv/logouthandler.cpp b/src/net/tmwserv/logouthandler.cpp new file mode 100644 index 00000000..a7a1eb2e --- /dev/null +++ b/src/net/tmwserv/logouthandler.cpp @@ -0,0 +1,215 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "logouthandler.h" + +#include "../messagein.h" +#include "protocol.h" + +#include "../../main.h" + +LogoutHandler::LogoutHandler(): +mPassToken(NULL), mScenario(LOGOUT_EXIT), +mLoggedOutAccount(false), mLoggedOutGame(false), mLoggedOutChat(false) +{ + static const Uint16 _messages[] = { + APMSG_LOGOUT_RESPONSE, + APMSG_UNREGISTER_RESPONSE, + GPMSG_DISCONNECT_RESPONSE, + CPMSG_DISCONNECT_RESPONSE, + 0 + }; + handledMessages = _messages; +} + +void LogoutHandler::handleMessage(MessageIn &msg) +{ + switch (msg.getId()) + { + case APMSG_LOGOUT_RESPONSE: + { + int errMsg = msg.readInt8(); + + // Successful logout + if (errMsg == ERRMSG_OK) + { + mLoggedOutAccount = true; + + switch (mScenario) + { + case LOGOUT_SWITCH_ACCOUNTSERVER: + if (mLoggedOutGame && mLoggedOutChat) + state = STATE_SWITCH_ACCOUNTSERVER; + break; + + case LOGOUT_EXIT: + default: + if (mLoggedOutGame && mLoggedOutChat) + state = STATE_FORCE_QUIT; + break; + } + } + // Logout failed + else + { + switch (errMsg) { + case ERRMSG_NO_LOGIN: + errorMessage = "Accountserver: Not logged in"; + break; + default: + errorMessage = "Accountserver: Unknown error"; + break; + } + state = STATE_ERROR; + } + } + break; + case APMSG_UNREGISTER_RESPONSE: + { + int errMsg = msg.readInt8(); + // Successful unregistration + if (errMsg == ERRMSG_OK) + { + state = STATE_UNREGISTER; + } + // Unregistration failed + else + { + switch (errMsg) { + case ERRMSG_INVALID_ARGUMENT: + errorMessage = + "Accountserver: Wrong username or password"; + break; + default: + errorMessage = "Accountserver: Unknown error"; + break; + } + state = STATE_ACCOUNTCHANGE_ERROR; + } + } + break; + case GPMSG_DISCONNECT_RESPONSE: + { + int errMsg = msg.readInt8(); + // Successful logout + if (errMsg == ERRMSG_OK) + { + mLoggedOutGame = true; + + switch (mScenario) + { + case LOGOUT_SWITCH_CHARACTER: + if (mPassToken) + { + *mPassToken = msg.readString(32); + mPassToken = NULL; + } + if (mLoggedOutChat) state = STATE_RECONNECT_ACCOUNT; + break; + + case LOGOUT_SWITCH_ACCOUNTSERVER: + if (mLoggedOutAccount && mLoggedOutChat) + state = STATE_SWITCH_ACCOUNTSERVER; + break; + + case LOGOUT_EXIT: + default: + if (mLoggedOutAccount && mLoggedOutChat) + state = STATE_FORCE_QUIT; + break; + } + } + // Logout failed + else + { + switch (errMsg) { + case ERRMSG_NO_LOGIN: + errorMessage = "Gameserver: Not logged in"; + break; + default: + errorMessage = "Gameserver: Unknown error"; + break; + } + state = STATE_ERROR; + } + } + break; + case CPMSG_DISCONNECT_RESPONSE: + { + int errMsg = msg.readInt8(); + // Successful logout + if (errMsg == ERRMSG_OK) + { + mLoggedOutChat = true; + + switch (mScenario) + { + case LOGOUT_SWITCH_CHARACTER: + if (mLoggedOutGame) state = STATE_RECONNECT_ACCOUNT; + break; + + case LOGOUT_SWITCH_ACCOUNTSERVER: + if (mLoggedOutAccount && mLoggedOutGame) + state = STATE_SWITCH_ACCOUNTSERVER; + break; + + case LOGOUT_EXIT: + default: + if (mLoggedOutAccount && mLoggedOutGame) + { + state = STATE_FORCE_QUIT; + } + break; + } + } + else + { + switch (errMsg) { + case ERRMSG_NO_LOGIN: + errorMessage = "Chatserver: Not logged in"; + break; + default: + errorMessage = "Chatserver: Unknown error"; + break; + } + state = STATE_ERROR; + } + } + break; + } +} + +void +LogoutHandler::setScenario(unsigned short scenario, std::string* passToken) +{ + mScenario = scenario; + mPassToken = passToken; +} + +void +LogoutHandler::reset() +{ + mPassToken = NULL; + mScenario = LOGOUT_EXIT; + mLoggedOutAccount = false; + mLoggedOutGame = false; + mLoggedOutChat = false; +} diff --git a/src/net/tmwserv/logouthandler.h b/src/net/tmwserv/logouthandler.h new file mode 100644 index 00000000..3b4f9738 --- /dev/null +++ b/src/net/tmwserv/logouthandler.h @@ -0,0 +1,62 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_LOGOUTHANDLER_H +#define _TMW_NET_LOGOUTHANDLER_H + +#include + +#include "../messagehandler.h" + +/** + * The different scenarios for which LogoutHandler can be used + */ +enum { + LOGOUT_EXIT, + LOGOUT_SWITCH_ACCOUNTSERVER, + LOGOUT_SWITCH_CHARACTER +}; + +class LogoutHandler : public MessageHandler +{ + public: + LogoutHandler(); + + void handleMessage(MessageIn &msg); + + void setScenario(unsigned short scenario, + std::string* passToken = NULL); + + void reset(); + + void setAccountLoggedOut(){ mLoggedOutAccount = true; } + void setGameLoggedOut(){ mLoggedOutGame = true; } + void setChatLoggedOut(){ mLoggedOutChat = true; } + + private: + std::string* mPassToken; + unsigned short mScenario; + bool mLoggedOutAccount; + bool mLoggedOutGame; + bool mLoggedOutChat; +}; + +#endif diff --git a/src/net/tmwserv/network.cpp b/src/net/tmwserv/network.cpp new file mode 100644 index 00000000..d3bc88fa --- /dev/null +++ b/src/net/tmwserv/network.cpp @@ -0,0 +1,169 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "network.h" + +#include + +#include + +#include "connection.h" +#include "internal.h" +#include "../messagehandler.h" +#include "../messagein.h" + +#include "../../log.h" + +/** + * The local host which is shared for all outgoing connections. + */ +namespace { + ENetHost *client; +} + +typedef std::map MessageHandlers; +typedef MessageHandlers::iterator MessageHandlerIterator; +static MessageHandlers mMessageHandlers; + +void Net::initialize() +{ + if (enet_initialize()) + { + logger->error("Failed to initialize ENet."); + } + + client = enet_host_create(NULL, 3, 0, 0); + + if (!client) + { + logger->error("Failed to create the local host."); + } +} + +void Net::finalize() +{ + if (!client) + return; // Wasn't initialized at all + + if (Net::connections) { + logger->error("Tried to shutdown the network subsystem while there " + "are network connections left!"); + } + + clearHandlers(); + enet_deinitialize(); +} + +Net::Connection *Net::getConnection() +{ + if (!client) + { + logger->error("Tried to instantiate a network object before " + "initializing the network subsystem!"); + } + + return new Net::Connection(client); +} + +void Net::registerHandler(MessageHandler *handler) +{ + for (const Uint16 *i = handler->handledMessages; *i; i++) + { + mMessageHandlers[*i] = handler; + } +} + +void Net::unregisterHandler(MessageHandler *handler) +{ + for (const Uint16 *i = handler->handledMessages; *i; i++) + { + mMessageHandlers.erase(*i); + } +} + +void Net::clearHandlers() +{ + mMessageHandlers.clear(); +} + + +/** + * Dispatches a message to the appropriate message handler and + * destroys it afterwards. + */ +namespace +{ + void dispatchMessage(ENetPacket *packet) + { + MessageIn msg((const char *)packet->data, packet->dataLength); + + MessageHandlerIterator iter = mMessageHandlers.find(msg.getId()); + + if (iter != mMessageHandlers.end()) { + //logger->log("Received packet %x (%i B)", + // msg.getId(), msg.getLength()); + iter->second->handleMessage(msg); + } + else { + logger->log("Unhandled packet %x (%i B)", + msg.getId(), msg.getLength()); + } + + // Clean up the packet now that we're done using it. + enet_packet_destroy(packet); + } +} + +void Net::flush() +{ + ENetEvent event; + + // Wait up to 10 milliseconds for an event. + while (enet_host_service(client, &event, 10) > 0) + { + switch (event.type) + { + case ENET_EVENT_TYPE_CONNECT: + logger->log("Connected to port %d.", event.peer->address.port); + // Store any relevant server information here. + event.peer->data = 0; + break; + + case ENET_EVENT_TYPE_RECEIVE: + dispatchMessage(event.packet); + break; + + case ENET_EVENT_TYPE_DISCONNECT: + logger->log("Disconnected."); + // Reset the server information. + event.peer->data = 0; + break; + + case ENET_EVENT_TYPE_NONE: + logger->log("No event during 10 milliseconds."); + break; + + default: + logger->log("Unhandled enet event."); + break; + } + } +} diff --git a/src/net/tmwserv/network.h b/src/net/tmwserv/network.h new file mode 100644 index 00000000..13576e79 --- /dev/null +++ b/src/net/tmwserv/network.h @@ -0,0 +1,79 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_NETWORK_H +#define _TMW_NET_NETWORK_H + +#include + +/** + * \defgroup Network Core network layer + */ + +class MessageHandler; +class MessageOut; + +/** + * \ingroup Network + */ +namespace Net +{ + class Connection; + + /** + * Initializes the network subsystem. + */ + void initialize(); + + /** + * Finalizes the network subsystem. + */ + void finalize(); + + /** + * Returns a new Connection object. Should be deleted by the caller. + */ + Connection *getConnection(); + + /** + * Registers a message handler. A message handler handles a certain + * subset of incoming messages. + */ + void registerHandler(MessageHandler *handler); + + /** + * Unregisters a message handler. + */ + void unregisterHandler(MessageHandler *handler); + + /** + * Clears all registered message handlers. + */ + void clearHandlers(); + + /* + * Handles all events and dispatches incoming messages to the + * registered handlers + */ + void flush(); +} + +#endif diff --git a/src/net/tmwserv/npchandler.cpp b/src/net/tmwserv/npchandler.cpp new file mode 100644 index 00000000..53f3c7b2 --- /dev/null +++ b/src/net/tmwserv/npchandler.cpp @@ -0,0 +1,86 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "npchandler.h" + +#include "../messagein.h" +#include "protocol.h" + +#include "../../beingmanager.h" +#include "../../npc.h" + +#include "../../gui/npclistdialog.h" +#include "../../gui/npcpostdialog.h" +#include "../../gui/npc_text.h" + +extern NpcListDialog *npcListDialog; +extern NpcTextDialog *npcTextDialog; +extern NpcPostDialog *npcPostDialog; + +NPCHandler::NPCHandler() +{ + static const Uint16 _messages[] = { + GPMSG_NPC_CHOICE, + GPMSG_NPC_POST, + GPMSG_NPC_MESSAGE, + GPMSG_NPC_ERROR, + 0 + }; + handledMessages = _messages; +} + +void NPCHandler::handleMessage(MessageIn &msg) +{ + Being *being = beingManager->findBeing(msg.readInt16()); + if (!being || being->getType() != Being::NPC) + { + return; + } + + current_npc = static_cast< NPC * >(being); + + switch (msg.getId()) + { + case GPMSG_NPC_CHOICE: + npcListDialog->reset(); + while (msg.getUnreadLength()) + { + npcListDialog->addItem(msg.readString()); + } + npcListDialog->setVisible(true); + break; + + case GPMSG_NPC_POST: + npcTextDialog->setVisible(false); + npcPostDialog->clear(); + npcPostDialog->setVisible(true); + break; + + case GPMSG_NPC_ERROR: + current_npc = NULL; + case GPMSG_NPC_MESSAGE: + npcTextDialog->addText(msg.readString(msg.getUnreadLength())); + npcListDialog->setVisible(false); + npcTextDialog->setVisible(true); + npcPostDialog->setVisible(false); + break; + } +} diff --git a/src/net/tmwserv/npchandler.h b/src/net/tmwserv/npchandler.h new file mode 100644 index 00000000..49df20c3 --- /dev/null +++ b/src/net/tmwserv/npchandler.h @@ -0,0 +1,35 @@ +/* + * The Mana World + * Copyright (C) 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef NET_NPCHANDLER_H +#define NET_NPCHANDLER_H + +#include "../messagehandler.h" + +class NPCHandler : public MessageHandler +{ + public: + NPCHandler(); + + void handleMessage(MessageIn &msg); +}; + +#endif diff --git a/src/net/tmwserv/partyhandler.cpp b/src/net/tmwserv/partyhandler.cpp new file mode 100644 index 00000000..eb331bac --- /dev/null +++ b/src/net/tmwserv/partyhandler.cpp @@ -0,0 +1,103 @@ +/* + * The Mana World + * Copyright 2008 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include "partyhandler.h" + +#include "protocol.h" +#include "../messagein.h" + +#include "chatserver/chatserver.h" + +#include "../../gui/chat.h" +#include "../../gui/partywindow.h" +#include "../../log.h" +#include "../../localplayer.h" + +PartyHandler::PartyHandler() +{ + static const Uint16 _messages[] = { + CPMSG_PARTY_INVITE_RESPONSE, + CPMSG_PARTY_INVITED, + CPMSG_PARTY_ACCEPT_INVITE_RESPONSE, + CPMSG_PARTY_QUIT_RESPONSE, + CPMSG_PARTY_NEW_MEMBER, + CPMSG_PARTY_MEMBER_LEFT, + 0 + }; + handledMessages = _messages; + +} + +void PartyHandler::handleMessage(MessageIn &msg) +{ + switch (msg.getId()) + { + case CPMSG_PARTY_INVITE_RESPONSE: + { + if (msg.readInt8() == ERRMSG_OK) + { + + } + } break; + + case CPMSG_PARTY_INVITED: + { + std::string inviter = msg.readString(); + partyWindow->showPartyInvite(inviter); + } break; + + case CPMSG_PARTY_ACCEPT_INVITE_RESPONSE: + { + if (msg.readInt8() == ERRMSG_OK) + { + player_node->setInParty(true); + chatWindow->chatLog("Joined party"); + } + } + + case CPMSG_PARTY_QUIT_RESPONSE: + { + if (msg.readInt8() == ERRMSG_OK) + { + player_node->setInParty(false); + } + } break; + + case CPMSG_PARTY_NEW_MEMBER: + { + msg.readInt16(); // being id + std::string name = msg.readString(); + + chatWindow->chatLog(name + " joined the party"); + + if (!player_node->getInParty()) + player_node->setInParty(true); + + partyWindow->addPartyMember(name); + } break; + + case CPMSG_PARTY_MEMBER_LEFT: + { + partyWindow->removePartyMember(msg.readString()); + } break; + } +} diff --git a/src/net/tmwserv/partyhandler.h b/src/net/tmwserv/partyhandler.h new file mode 100644 index 00000000..c1ec6eda --- /dev/null +++ b/src/net/tmwserv/partyhandler.h @@ -0,0 +1,41 @@ +/* + * The Mana World + * Copyright 2008 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_NET_PARTYHANDLER_H +#define _TMW_NET_PARTYHANDLER_H + +#include "../messagehandler.h" + +#include + +class PartyHandler : public MessageHandler +{ +public: + PartyHandler(); + + void handleMessage(MessageIn &msg); + +protected: + +}; + +#endif + diff --git a/src/net/tmwserv/playerhandler.cpp b/src/net/tmwserv/playerhandler.cpp new file mode 100644 index 00000000..d4850f43 --- /dev/null +++ b/src/net/tmwserv/playerhandler.cpp @@ -0,0 +1,327 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "playerhandler.h" + +#include "../messagein.h" +#include "protocol.h" + +#include "../../engine.h" +#include "../../localplayer.h" +#include "../../log.h" +#include "../../particle.h" +#include "../../npc.h" + +#include "../../gui/buy.h" +#include "../../gui/chat.h" +#include "../../gui/gui.h" +#include "../../gui/npclistdialog.h" +#include "../../gui/npc_text.h" +#include "../../gui/ok_dialog.h" +#include "../../gui/sell.h" +#include "../../gui/skill.h" +#include "../../gui/viewport.h" + +// TODO Move somewhere else +OkDialog *weightNotice = NULL; +OkDialog *deathNotice = NULL; + +extern NpcListDialog *npcListDialog; +extern NpcTextDialog *npcTextDialog; +extern BuyDialog *buyDialog; +extern SellDialog *sellDialog; +extern Window *buySellDialog; + +/* Max. distance we are willing to scroll after a teleport; + * everything beyond will reset the port hard. + */ +static const int MAP_TELEPORT_SCROLL_DISTANCE = 8 * 32; + +/** + * Listener used for handling the overweigth message. + */ +// TODO Move somewhere else +namespace { + struct WeightListener : public gcn::ActionListener + { + void action(const gcn::ActionEvent &event) + { + weightNotice = NULL; + } + } weightListener; +} + +/** + * Listener used for handling death message. + */ +// TODO Move somewhere else +namespace { + struct DeathListener : public gcn::ActionListener + { + void action(const gcn::ActionEvent &event) + { + player_node->revive(); + deathNotice = NULL; + npcListDialog->setVisible(false); + npcTextDialog->setVisible(false); + buyDialog->setVisible(false); + sellDialog->setVisible(false); + buySellDialog->setVisible(false); + current_npc = 0; + } + } deathListener; +} + +PlayerHandler::PlayerHandler() +{ + static const Uint16 _messages[] = { + GPMSG_PLAYER_MAP_CHANGE, + GPMSG_PLAYER_SERVER_CHANGE, + GPMSG_PLAYER_ATTRIBUTE_CHANGE, + GPMSG_PLAYER_EXP_CHANGE, + GPMSG_LEVELUP, + GPMSG_LEVEL_PROGRESS, + GPMSG_RAISE_ATTRIBUTE_RESPONSE, + GPMSG_LOWER_ATTRIBUTE_RESPONSE, + 0 + }; + handledMessages = _messages; +} + +void PlayerHandler::handleMessage(MessageIn &msg) +{ + switch (msg.getId()) + { + case GPMSG_PLAYER_MAP_CHANGE: + handleMapChangeMessage(msg); + break; + + case GPMSG_PLAYER_SERVER_CHANGE: + { // TODO: Implement reconnecting to another game server + std::string token = msg.readString(32); + std::string address = msg.readString(); + int port = msg.readInt16(); + logger->log("Changing server to %s:%d", address.c_str(), port); + } break; + + case GPMSG_PLAYER_ATTRIBUTE_CHANGE: + { + logger->log("ATTRIBUTE UPDATE:"); + while (msg.getUnreadLength()) + { + int stat = msg.readInt8(); + int base = msg.readInt16(); + int value = msg.readInt16(); + logger->log("%d set to %d %d", stat, base, value); + + if (stat == BASE_ATTR_HP) + { + player_node->setMaxHp(base); + player_node->setHp(value); + } + else if (stat < NB_CHARACTER_ATTRIBUTES) + { + if (stat >= CHAR_SKILL_BEGIN && stat < CHAR_SKILL_END + && player_node->getAttributeBase(stat) < base + && player_node->getAttributeBase(stat) > -1) + { + Particle* effect = particleEngine->addEffect("graphics/particles/skillup.particle.xml", 0, 0); + player_node->controlParticle(effect); + } + + player_node->setAttributeBase(stat, base); + player_node->setAttributeEffective(stat, value); + } + else + { + logger->log("Warning: server wants to update unknown " + "attribute %d to %d", stat, value); + } + } + } break; + + case GPMSG_PLAYER_EXP_CHANGE: + { + logger->log("EXP Update"); + while (msg.getUnreadLength()) + { + int skill = msg.readInt8(); + int current = msg.readInt32(); + int next = msg.readInt32(); + + if (skill < CHAR_SKILL_NB) + { + player_node->setExperience(skill, current, next); + } + else + { + logger->log("Warning: server wants to update experience of unknown " + "skill %d to %d / %d", skill, current, next); + } + } + } break; + + case GPMSG_LEVELUP: + { + player_node->setLevel(msg.readInt16()); + player_node->setCharacterPoints(msg.readInt16()); + player_node->setCorrectionPoints(msg.readInt16()); + Particle* effect = particleEngine->addEffect("graphics/particles/levelup.particle.xml", 0, 0); + player_node->controlParticle(effect); + } break; + + + case GPMSG_LEVEL_PROGRESS: + { + logger->log("Level Progress Update"); + player_node->setLevelProgress(msg.readInt8()); + } break; + + + case GPMSG_RAISE_ATTRIBUTE_RESPONSE: + { + int errCode = msg.readInt8(); + int attrNum = msg.readInt8() - CHAR_ATTR_BEGIN; + switch (errCode) + { + case ATTRIBMOD_OK: + { + // feel(acknowledgment); + } break; + case ATTRIBMOD_INVALID_ATTRIBUTE: + { + logger->log("Warning: Server denied increase of attribute %d (unknown attribute) ", attrNum); + } break; + case ATTRIBMOD_NO_POINTS_LEFT: + { + // when the server says "you got no points" it + // has to be correct. The server is always right! + // undo attribute change and set points to 0 + logger->log("Warning: Server denied increase of attribute %d (no points left) ", attrNum); + int attrValue = player_node->getAttributeBase(attrNum) - 1; + player_node->setCharacterPoints(0); + player_node->setAttributeBase(attrNum, attrValue); + } break; + case ATTRIBMOD_DENIED: + { + // undo attribute change + logger->log("Warning: Server denied increase of attribute %d (reason unknown) ", attrNum); + int points = player_node->getCharacterPoints() - 1; + player_node->setCharacterPoints(points); + int attrValue = player_node->getAttributeBase(attrNum) - 1; + player_node->setAttributeBase(attrNum, attrValue); + } break; + } + } break; + + case GPMSG_LOWER_ATTRIBUTE_RESPONSE: + { + int errCode = msg.readInt8(); + int attrNum = msg.readInt8() - CHAR_ATTR_BEGIN; + switch (errCode) + { + case ATTRIBMOD_OK: + { + // feel(acknowledgment); + } break; + case ATTRIBMOD_INVALID_ATTRIBUTE: + { + logger->log("Warning: Server denied reduction of attribute %d (unknown attribute) ", attrNum); + } break; + case ATTRIBMOD_NO_POINTS_LEFT: + { + // when the server says "you got no points" it + // has to be correct. The server is always right! + // undo attribute change and set points to 0 + logger->log("Warning: Server denied reduction of attribute %d (no points left) ", attrNum); + int attrValue = player_node->getAttributeBase(attrNum) + 1; + player_node->setCorrectionPoints(0); + player_node->setAttributeBase(attrNum, attrValue); + break; + } break; + case ATTRIBMOD_DENIED: + { + // undo attribute change + logger->log("Warning: Server denied reduction of attribute %d (reason unknown) ", attrNum); + int charaPoints = player_node->getCharacterPoints() - 1; + player_node->setCharacterPoints(charaPoints); + int correctPoints = player_node->getCorrectionPoints() + 1; + player_node->setCorrectionPoints(correctPoints); + int attrValue = player_node->getAttributeBase(attrNum) + 1; + player_node->setAttributeBase(attrNum, attrValue); + } break; + } + + } break; + /* + case SMSG_PLAYER_ARROW_MESSAGE: + { + Sint16 type = msg.readInt16(); + + switch (type) { + case 0: + chatWindow->chatLog("Equip arrows first", + BY_SERVER); + break; + default: + logger->log("0x013b: Unhandled message %i", type); + break; + } + } + break; + */ + } +} + +void +PlayerHandler::handleMapChangeMessage(MessageIn &msg) +{ + const std::string mapName = msg.readString(); + const unsigned short x = msg.readInt16(); + const unsigned short y = msg.readInt16(); + const bool nearby = (engine->getCurrentMapName() == mapName); + + logger->log("Changing map to %s (%d, %d)", mapName.c_str(), x, y); + + // Switch the actual map, deleting the previous one + engine->changeMap(mapName); + + current_npc = 0; + + const Vector &playerPos = player_node->getPosition(); + float scrollOffsetX = 0.0f; + float scrollOffsetY = 0.0f; + + /* Scroll if neccessary */ + if (!nearby + || (abs(x - (int) playerPos.x) > MAP_TELEPORT_SCROLL_DISTANCE) + || (abs(y - (int) playerPos.y) > MAP_TELEPORT_SCROLL_DISTANCE)) { + scrollOffsetX = x - (int) playerPos.x; + scrollOffsetY = y - (int) playerPos.y; + } + + player_node->setAction(Being::STAND); + player_node->setPosition(x, y); + + logger->log("Adjust scrolling by %d,%d", (int) scrollOffsetX, + (int) scrollOffsetY); + viewport->scrollBy(scrollOffsetX, scrollOffsetY); +} diff --git a/src/net/tmwserv/playerhandler.h b/src/net/tmwserv/playerhandler.h new file mode 100644 index 00000000..a11109c6 --- /dev/null +++ b/src/net/tmwserv/playerhandler.h @@ -0,0 +1,38 @@ +/* + * The Mana World + * Copyright (C) 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef NET_PLAYERHANDLER_H +#define NET_PLAYERHANDLER_H + +#include "../messagehandler.h" + +class PlayerHandler : public MessageHandler +{ + public: + PlayerHandler(); + + void handleMessage(MessageIn &msg); + + private: + void handleMapChangeMessage(MessageIn &msg); +}; + +#endif diff --git a/src/net/tmwserv/protocol.h b/src/net/tmwserv/protocol.h new file mode 100644 index 00000000..73dd65e0 --- /dev/null +++ b/src/net/tmwserv/protocol.h @@ -0,0 +1,295 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TMW_PROTOCOL_ +#define _TMW_PROTOCOL_ + +/** + * Enumerated type for communicated messages: + * + * - PAMSG_*: from client to account server + * - APMSG_*: from account server to client + * - PCMSG_*: from client to chat server + * - CPMSG_*: from chat server to client + * - PGMSG_*: from client to game server + * - GPMSG_*: from game server to client + * + * Components: B byte, W word, D double word, S variable-size string + * C tile-based coordinates (B*3) + * + * Hosts: P (player's client), A (account server), C (char server), + * G (game server) + */ +enum { + // Login/Register + PAMSG_REGISTER = 0x0000, // L version, S username, S password, S email + APMSG_REGISTER_RESPONSE = 0x0002, // B error [, S updatehost] + PAMSG_UNREGISTER = 0x0003, // - + APMSG_UNREGISTER_RESPONSE = 0x0004, // B error + PAMSG_LOGIN = 0x0010, // L version, S username, S password + APMSG_LOGIN_RESPONSE = 0x0012, // B error [, S updatehost] + PAMSG_LOGOUT = 0x0013, // - + APMSG_LOGOUT_RESPONSE = 0x0014, // B error + PAMSG_CHAR_CREATE = 0x0020, // S name, B hair style, B hair color, B gender, W*6 stats + APMSG_CHAR_CREATE_RESPONSE = 0x0021, // B error + PAMSG_CHAR_DELETE = 0x0022, // B index + APMSG_CHAR_DELETE_RESPONSE = 0x0023, // B error + APMSG_CHAR_INFO = 0x0024, // B index, S name, B gender, B hair style, B hair color, W level, W character points, W correction points, D money, W*6 stats + PAMSG_CHAR_SELECT = 0x0026, // B index + APMSG_CHAR_SELECT_RESPONSE = 0x0027, // B error, B*32 token, S game address, W game port, S chat address, W chat port + PAMSG_EMAIL_CHANGE = 0x0030, // S email + APMSG_EMAIL_CHANGE_RESPONSE = 0x0031, // B error + PAMSG_PASSWORD_CHANGE = 0x0034, // S old password, S new password + APMSG_PASSWORD_CHANGE_RESPONSE = 0x0035, // B error + + PGMSG_CONNECT = 0x0050, // B*32 token + GPMSG_CONNECT_RESPONSE = 0x0051, // B error + PCMSG_CONNECT = 0x0053, // B*32 token + CPMSG_CONNECT_RESPONSE = 0x0054, // B error + + PGMSG_DISCONNECT = 0x0060, // B reconnect account + GPMSG_DISCONNECT_RESPONSE = 0x0061, // B error, B*32 token + PCMSG_DISCONNECT = 0x0063, // - + CPMSG_DISCONNECT_RESPONSE = 0x0064, // B error + + PAMSG_RECONNECT = 0x0065, // B*32 token + APMSG_RECONNECT_RESPONSE = 0x0066, // B error + + // Game + GPMSG_PLAYER_MAP_CHANGE = 0x0100, // S filename, W x, W y + GPMSG_PLAYER_SERVER_CHANGE = 0x0101, // B*32 token, S game address, W game port + PGMSG_PICKUP = 0x0110, // W*2 position + PGMSG_DROP = 0x0111, // B slot, B amount + PGMSG_EQUIP = 0x0112, // B slot + PGMSG_UNEQUIP = 0x0113, // B slot + PGMSG_MOVE_ITEM = 0x0114, // B slot1, B slot2, B amount + GPMSG_INVENTORY = 0x0120, // { B slot, W item id [, B amount] }* + GPMSG_INVENTORY_FULL = 0x0121, // { B slot, W item id [, B amount] }* + GPMSG_PLAYER_ATTRIBUTE_CHANGE = 0x0130, // { B attribute, W base value, W modified value }* + GPMSG_PLAYER_EXP_CHANGE = 0x0140, // { B skill, D exp got, D exp needed }* + GPMSG_LEVELUP = 0x0150, // W new level + GPMSG_LEVEL_PROGRESS = 0x0151, // B percent completed to next levelup + PGMSG_RAISE_ATTRIBUTE = 0x0160, // B attribute + GPMSG_RAISE_ATTRIBUTE_RESPONSE = 0x0161, // B error, B attribute + PGMSG_LOWER_ATTRIBUTE = 0x0170, // B attribute + GPMSG_LOWER_ATTRIBUTE_RESPONSE = 0x0171, // B error, B attribute + PGMSG_RESPAWN = 0x0180, // - + GPMSG_BEING_ENTER = 0x0200, // B type, W being id, B action, W*2 position + // player: S name, B hair style, B hair color, B gender, B item bitmask, { W item id }* + // monster: W type id + // npc: W type id + GPMSG_BEING_LEAVE = 0x0201, // W being id + GPMSG_ITEM_APPEAR = 0x0202, // W item id, W*2 position + GPMSG_BEING_LOOKS_CHANGE = 0x0210, // W weapon, W hat, W top clothes, W bottom clothes + PGMSG_WALK = 0x0260, // W*2 destination + PGMSG_ACTION_CHANGE = 0x0270, // B Action + GPMSG_BEING_ACTION_CHANGE = 0x0271, // W being id, B action + PGMSG_DIRECTION_CHANGE = 0x0272, // B Direction + GPMSG_BEING_DIR_CHANGE = 0x0273, // W being id, B direction + GPMSG_BEINGS_MOVE = 0x0280, // { W being id, B flags [, C position, B speed] [, W*2 destination] }* + GPMSG_ITEMS = 0x0281, // { W item id, W*2 position }* + PGMSG_ATTACK = 0x0290, // B direction + PGMSG_USE_SPECIAL = 0x0292, // B specialID + GPMSG_BEING_ATTACK = 0x0291, // W being id + PGMSG_SAY = 0x02A0, // S text + GPMSG_SAY = 0x02A1, // W being id, S text + GPMSG_NPC_CHOICE = 0x02B0, // W being id, { S text }* + GPMSG_NPC_MESSAGE = 0x02B1, // W being id, B* text + PGMSG_NPC_TALK = 0x02B2, // W being id + PGMSG_NPC_TALK_NEXT = 0x02B3, // W being id + PGMSG_NPC_SELECT = 0x02B4, // W being id, B choice + GPMSG_NPC_BUY = 0x02B5, // W being id, { W item id, W amount, W cost }* + GPMSG_NPC_SELL = 0x02B6, // W being id, { W item id, W amount, W cost }* + PGMSG_NPC_BUYSELL = 0x02B7, // W item id, W amount + GPMSG_NPC_ERROR = 0x02B8, // B error + GPMSG_NPC_POST = 0x02D0, // W being id + PGMSG_NPC_POST_SEND = 0x02D1, // S name, S text, W item id + GPMSG_NPC_POST_GET = 0x02D2, // W being id, { S name, S text, W item id } + PGMSG_TRADE_REQUEST = 0x02C0, // W being id + GPMSG_TRADE_REQUEST = 0x02C1, // W being id + GPMSG_TRADE_START = 0x02C2, // - + GPMSG_TRADE_COMPLETE = 0x02C3, // - + PGMSG_TRADE_CANCEL = 0x02C4, // - + GPMSG_TRADE_CANCEL = 0x02C5, // - + PGMSG_TRADE_ACCEPT = 0x02C6, // - + GPMSG_TRADE_ACCEPT = 0x02C7, // - + PGMSG_TRADE_ADD_ITEM = 0x02C8, // B slot, B amount + GPMSG_TRADE_ADD_ITEM = 0x02C9, // W item id, B amount + PGMSG_TRADE_SET_MONEY = 0x02CA, // L amount + GPMSG_TRADE_SET_MONEY = 0x02CB, // L amount + PGMSG_USE_ITEM = 0x0300, // B slot + GPMSG_USE_RESPONSE = 0x0301, // B error + GPMSG_BEINGS_DAMAGE = 0x0310, // { W being id, W amount }* + GPMSG_CREATE_EFFECT = 0x0320, // W effect id, W*2 position + + // Guild + PCMSG_GUILD_CREATE = 0x0350, // S name + CPMSG_GUILD_CREATE_RESPONSE = 0x0351, // B error, W guild, B rights, W channel + PCMSG_GUILD_INVITE = 0x0352, // W id, S name + CPMSG_GUILD_INVITE_RESPONSE = 0x0353, // B error + PCMSG_GUILD_ACCEPT = 0x0354, // W id + CPMSG_GUILD_ACCEPT_RESPONSE = 0x0355, // B error, W guild, B rights, W channel + PCMSG_GUILD_GET_MEMBERS = 0x0356, // W id + CPMSG_GUILD_GET_MEMBERS_RESPONSE = 0x0357, // S names, B online + CPMSG_GUILD_UPDATE_LIST = 0x0358, // W id, S name, B event + PCMSG_GUILD_QUIT = 0x0360, // W id + CPMSG_GUILD_QUIT_RESPONSE = 0x0361, // B error + PCMSG_GUILD_PROMOTE_MEMBER = 0x0365, // W guild, S name, B rights + CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE = 0x0366, // B error + + CPMSG_GUILD_INVITED = 0x0370, // S char name, S guild name, W id + CPMSG_GUILD_REJOIN = 0x0371, // S name, W guild, W rights, W channel, S announce + + // Party + PCMSG_PARTY_INVITE = 0x03A0, // S name + CPMSG_PARTY_INVITE_RESPONSE = 0x03A1, // B error + CPMSG_PARTY_INVITED = 0x03A2, // S name + PCMSG_PARTY_ACCEPT_INVITE = 0x03A5, // S name + CPMSG_PARTY_ACCEPT_INVITE_RESPONSE = 0x03A6, // B error, { S name } + PCMSG_PARTY_QUIT = 0x03AA, // - + CPMSG_PARTY_QUIT_RESPONSE = 0x03AB, // B error + CPMSG_PARTY_NEW_MEMBER = 0x03B0, // W being id, S name + CPMSG_PARTY_MEMBER_LEFT = 0x03B1, // W being id + + // Chat + CPMSG_ERROR = 0x0401, // B error + CPMSG_ANNOUNCEMENT = 0x0402, // S text + CPMSG_PRIVMSG = 0x0403, // S user, S text + CPMSG_PUBMSG = 0x0404, // W channel, S user, S text + PCMSG_CHAT = 0x0410, // S text, W channel + PCMSG_ANNOUNCE = 0x0411, // S text + PCMSG_PRIVMSG = 0x0412, // S user, S text + // -- Channeling + CPMSG_CHANNEL_EVENT = 0x0430, // W channel, B event, S info + PCMSG_ENTER_CHANNEL = 0x0440, // S channel, S password + CPMSG_ENTER_CHANNEL_RESPONSE = 0x0441, // B error, W id, S name, S topic, S userlist + PCMSG_QUIT_CHANNEL = 0x0443, // W channel id + CPMSG_QUIT_CHANNEL_RESPONSE = 0x0444, // B error, W channel id + PCMSG_LIST_CHANNELS = 0x0445, // - + CPMSG_LIST_CHANNELS_RESPONSE = 0x0446, // S names, W number of users + PCMSG_LIST_CHANNELUSERS = 0x0460, // S channel + CPMSG_LIST_CHANNELUSERS_RESPONSE = 0x0461, // S channel, { S user, B mode } + PCMSG_TOPIC_CHANGE = 0x0462, // W channel id, S topic + // -- User mode + PCMSG_USER_MODE = 0x0465, // W channel id, S name, B mode + PCMSG_KICK_USER = 0x0466, // W channel id, S name + + XXMSG_INVALID = 0x7FFF +}; + +// Generic return values + +enum { + ERRMSG_OK = 0, // everything is fine + ERRMSG_FAILURE, // the action failed + ERRMSG_NO_LOGIN, // the user is not yet logged + ERRMSG_NO_CHARACTER_SELECTED, // the user needs a character + ERRMSG_INSUFFICIENT_RIGHTS, // the user is not privileged + ERRMSG_INVALID_ARGUMENT, // part of the received message was invalid + ERRMSG_EMAIL_ALREADY_EXISTS, // The Email Address already exists + ERRMSG_ALREADY_TAKEN, // name used was already taken + ERRMSG_SERVER_FULL, // the server is overloaded + ERRMSG_TIME_OUT // data failed to arrive in due time +}; + +// Login specific return values +enum { + LOGIN_INVALID_VERSION = 0x40, // the user is using an incompatible protocol + LOGIN_SERVER_FULL // the server is overloaded +}; + +// Account register specific return values +enum { + REGISTER_INVALID_VERSION = 0x40, // the user is using an incompatible protocol + REGISTER_EXISTS_USERNAME, // there already is an account with this username + REGISTER_EXISTS_EMAIL // there already is an account with this email address +}; + +// Character creation specific return values +enum { + CREATE_INVALID_HAIRSTYLE = 0x40, + CREATE_INVALID_HAIRCOLOR, + CREATE_INVALID_GENDER, + CREATE_RAW_STATS_TOO_HIGH, + CREATE_RAW_STATS_TOO_LOW, + CREATE_RAW_STATS_EQUAL_TO_ZERO, + CREATE_EXISTS_NAME, + CREATE_TOO_MUCH_CHARACTERS +}; + +// Character attribute modification specific return value +enum AttribmodResponseCode { + ATTRIBMOD_OK = ERRMSG_OK, + ATTRIBMOD_INVALID_ATTRIBUTE = 0x40, + ATTRIBMOD_NO_POINTS_LEFT, + ATTRIBMOD_DENIED +}; +// Object type enumeration +enum { + // A simple item + OBJECT_ITEM = 0, + // An item that can be activated (doors, switchs, sign, ...) + OBJECT_ACTOR, + // Non-Playable-Character is an actor capable of movement and maybe actions + OBJECT_NPC, + // A monster (moving actor with AI. able to toggle map/quest actions, too) + OBJECT_MONSTER, + // A player + OBJECT_PLAYER +}; + +// Moving object flags +enum { + // Payload contains the current position. + MOVING_POSITION = 1, + // Payload contains the destination. + MOVING_DESTINATION = 2 +}; + +// Email change specific return values +enum { + EMAILCHG_EXISTS_EMAIL = 0x40 +}; + +// Chat errors return values +enum { + CHAT_USING_BAD_WORDS = 0x40, + CHAT_UNHANDLED_COMMAND +}; + +// Chat channels event values +enum { + CHAT_EVENT_NEW_PLAYER = 0, + CHAT_EVENT_LEAVING_PLAYER, + CHAT_EVENT_TOPIC_CHANGE, + CHAT_EVENT_MODE_CHANGE, + CHAT_EVENT_KICKED_PLAYER +}; + +// Guild member event values +enum { + GUILD_EVENT_NEW_PLAYER = 0, + GUILD_EVENT_LEAVING_PLAYER, + GUILD_EVENT_ONLINE_PLAYER, + GUILD_EVENT_OFFLINE_PLAYER +}; + +#endif diff --git a/src/net/tmwserv/tradehandler.cpp b/src/net/tmwserv/tradehandler.cpp new file mode 100644 index 00000000..12d47745 --- /dev/null +++ b/src/net/tmwserv/tradehandler.cpp @@ -0,0 +1,137 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "tradehandler.h" + +#include "../messagein.h" +#include "protocol.h" + +#include "gameserver/player.h" + +#include "../../beingmanager.h" +#include "../../item.h" +#include "../../localplayer.h" + +#include "../../gui/chat.h" +#include "../../gui/confirm_dialog.h" +#include "../../gui/trade.h" + +std::string tradePartnerName; +int tradePartnerID; + +/** + * Listener for request trade dialogs + */ +namespace { + struct RequestTradeListener : public gcn::ActionListener + { + void action(const gcn::ActionEvent &event) + { + if (event.getId() == "yes") + Net::GameServer::Player::requestTrade(tradePartnerID); + else + Net::GameServer::Player::acceptTrade(false); + } + } listener; +} + +TradeHandler::TradeHandler(): + mAcceptTradeRequests(true) +{ + static const Uint16 _messages[] = { + GPMSG_TRADE_REQUEST, + GPMSG_TRADE_CANCEL, + GPMSG_TRADE_START, + GPMSG_TRADE_COMPLETE, + GPMSG_TRADE_ACCEPT, + GPMSG_TRADE_ADD_ITEM, + GPMSG_TRADE_SET_MONEY, + 0 + }; + handledMessages = _messages; +} + +void TradeHandler::setAcceptTradeRequests(bool acceptTradeRequests) +{ + mAcceptTradeRequests = acceptTradeRequests; + if (mAcceptTradeRequests) { + chatWindow->chatLog("Accepting incoming trade requests", BY_SERVER); + } else { + chatWindow->chatLog("Ignoring incoming trade requests", BY_SERVER); + } +} + +void TradeHandler::handleMessage(MessageIn &msg) +{ + switch (msg.getId()) + { + case GPMSG_TRADE_REQUEST: + { + Being *being = beingManager->findBeing(msg.readInt16()); + if (!being || !mAcceptTradeRequests) + { + Net::GameServer::Player::acceptTrade(false); + break; + } + player_node->setTrading(true); + tradePartnerName = being->getName(); + tradePartnerID = being->getId(); + ConfirmDialog *dlg = new ConfirmDialog("Request for trade", + tradePartnerName + " wants to trade with you, do you accept?"); + dlg->addActionListener(&listener); + } break; + + case GPMSG_TRADE_ADD_ITEM: + { + int type = msg.readInt16(); + int amount = msg.readInt8(); + tradeWindow->addItem(type, false, amount); + } break; + + case GPMSG_TRADE_SET_MONEY: + tradeWindow->setMoney(msg.readInt32()); + break; + + case GPMSG_TRADE_START: + tradeWindow->reset(); + tradeWindow->setCaption("Trading with " + tradePartnerName); + tradeWindow->setVisible(true); + break; + + case GPMSG_TRADE_ACCEPT: + tradeWindow->receivedOk(); + break; + + case GPMSG_TRADE_CANCEL: + chatWindow->chatLog("Trade canceled.", BY_SERVER); + tradeWindow->setVisible(false); + tradeWindow->reset(); + player_node->setTrading(false); + break; + + case GPMSG_TRADE_COMPLETE: + chatWindow->chatLog("Trade completed.", BY_SERVER); + tradeWindow->setVisible(false); + tradeWindow->reset(); + player_node->setTrading(false); + break; + } +} diff --git a/src/net/tmwserv/tradehandler.h b/src/net/tmwserv/tradehandler.h new file mode 100644 index 00000000..0b634b66 --- /dev/null +++ b/src/net/tmwserv/tradehandler.h @@ -0,0 +1,53 @@ +/* + * The Mana World + * Copyright (C) 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef NET_TRADEHANDLER_H +#define NET_TRADEHANDLER_H + +#include "../messagehandler.h" + +class TradeHandler : public MessageHandler +{ + public: + TradeHandler(); + + void handleMessage(MessageIn &msg); + + /** + * Returns whether trade requests are accepted. + * + * @see setAcceptTradeRequests + */ + bool acceptTradeRequests() const + { return mAcceptTradeRequests; } + + /** + * Sets whether trade requests are accepted. When set to false, trade + * requests are automatically denied. When true, a popup will ask the + * player whether he wants to trade. + */ + void setAcceptTradeRequests(bool acceptTradeRequests); + + private: + bool mAcceptTradeRequests; +}; + +#endif diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp deleted file mode 100644 index 5d93016f..00000000 --- a/src/net/tradehandler.cpp +++ /dev/null @@ -1,137 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "tradehandler.h" - -#include "messagein.h" -#include "protocol.h" - -#include "gameserver/player.h" - -#include "../beingmanager.h" -#include "../item.h" -#include "../localplayer.h" - -#include "../gui/chat.h" -#include "../gui/confirm_dialog.h" -#include "../gui/trade.h" - -std::string tradePartnerName; -int tradePartnerID; - -/** - * Listener for request trade dialogs - */ -namespace { - struct RequestTradeListener : public gcn::ActionListener - { - void action(const gcn::ActionEvent &event) - { - if (event.getId() == "yes") - Net::GameServer::Player::requestTrade(tradePartnerID); - else - Net::GameServer::Player::acceptTrade(false); - } - } listener; -} - -TradeHandler::TradeHandler(): - mAcceptTradeRequests(true) -{ - static const Uint16 _messages[] = { - GPMSG_TRADE_REQUEST, - GPMSG_TRADE_CANCEL, - GPMSG_TRADE_START, - GPMSG_TRADE_COMPLETE, - GPMSG_TRADE_ACCEPT, - GPMSG_TRADE_ADD_ITEM, - GPMSG_TRADE_SET_MONEY, - 0 - }; - handledMessages = _messages; -} - -void TradeHandler::setAcceptTradeRequests(bool acceptTradeRequests) -{ - mAcceptTradeRequests = acceptTradeRequests; - if (mAcceptTradeRequests) { - chatWindow->chatLog("Accepting incoming trade requests", BY_SERVER); - } else { - chatWindow->chatLog("Ignoring incoming trade requests", BY_SERVER); - } -} - -void TradeHandler::handleMessage(MessageIn &msg) -{ - switch (msg.getId()) - { - case GPMSG_TRADE_REQUEST: - { - Being *being = beingManager->findBeing(msg.readInt16()); - if (!being || !mAcceptTradeRequests) - { - Net::GameServer::Player::acceptTrade(false); - break; - } - player_node->setTrading(true); - tradePartnerName = being->getName(); - tradePartnerID = being->getId(); - ConfirmDialog *dlg = new ConfirmDialog("Request for trade", - tradePartnerName + " wants to trade with you, do you accept?"); - dlg->addActionListener(&listener); - } break; - - case GPMSG_TRADE_ADD_ITEM: - { - int type = msg.readInt16(); - int amount = msg.readInt8(); - tradeWindow->addItem(type, false, amount); - } break; - - case GPMSG_TRADE_SET_MONEY: - tradeWindow->setMoney(msg.readInt32()); - break; - - case GPMSG_TRADE_START: - tradeWindow->reset(); - tradeWindow->setCaption("Trading with " + tradePartnerName); - tradeWindow->setVisible(true); - break; - - case GPMSG_TRADE_ACCEPT: - tradeWindow->receivedOk(); - break; - - case GPMSG_TRADE_CANCEL: - chatWindow->chatLog("Trade canceled.", BY_SERVER); - tradeWindow->setVisible(false); - tradeWindow->reset(); - player_node->setTrading(false); - break; - - case GPMSG_TRADE_COMPLETE: - chatWindow->chatLog("Trade completed.", BY_SERVER); - tradeWindow->setVisible(false); - tradeWindow->reset(); - player_node->setTrading(false); - break; - } -} diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h deleted file mode 100644 index 6ffe17b5..00000000 --- a/src/net/tradehandler.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef NET_TRADEHANDLER_H -#define NET_TRADEHANDLER_H - -#include "messagehandler.h" - -class TradeHandler : public MessageHandler -{ - public: - TradeHandler(); - - void handleMessage(MessageIn &msg); - - /** - * Returns whether trade requests are accepted. - * - * @see setAcceptTradeRequests - */ - bool acceptTradeRequests() const - { return mAcceptTradeRequests; } - - /** - * Sets whether trade requests are accepted. When set to false, trade - * requests are automatically denied. When true, a popup will ask the - * player whether he wants to trade. - */ - void setAcceptTradeRequests(bool acceptTradeRequests); - - private: - bool mAcceptTradeRequests; -}; - -#endif diff --git a/src/npc.cpp b/src/npc.cpp index bc25fa5d..792d1aa4 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -27,7 +27,7 @@ #include "gui/npc_text.h" #ifdef TMWSERV_SUPPORT -#include "net/gameserver/player.h" +#include "net/tmwserv/gameserver/player.h" #else #include "net/messageout.h" #include "net/ea/protocol.h" -- cgit v1.2.3-70-g09d2