diff options
Diffstat (limited to 'src/net')
35 files changed, 34 insertions, 58 deletions
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h index 26bfb4ba3..e212ea432 100644 --- a/src/net/charserverhandler.h +++ b/src/net/charserverhandler.h @@ -23,10 +23,15 @@ #ifndef NET_CHARSERVERHANDLER_H #define NET_CHARSERVERHANDLER_H -#include "being/localplayer.h" +#include "enums/being/gender.h" + +#include "enums/simpletypes/beingid.h" #include "net/characters.h" +#include <string> +#include <vector> + class CharCreateDialog; class CharSelectDialog; diff --git a/src/net/ea/beingrecv.h b/src/net/ea/beingrecv.h index 753191b8d..d3b6a642d 100644 --- a/src/net/ea/beingrecv.h +++ b/src/net/ea/beingrecv.h @@ -31,7 +31,7 @@ namespace Net { class MessageIn; -} +} // namespace Net class Being; diff --git a/src/net/ea/chatrecv.h b/src/net/ea/chatrecv.h index d34a54a2a..eced8fd0e 100644 --- a/src/net/ea/chatrecv.h +++ b/src/net/ea/chatrecv.h @@ -39,7 +39,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace Ea { diff --git a/src/net/ea/guildrecv.h b/src/net/ea/guildrecv.h index 1815db58a..330787bb8 100644 --- a/src/net/ea/guildrecv.h +++ b/src/net/ea/guildrecv.h @@ -27,7 +27,7 @@ namespace Net { class MessageIn; -} +} // namespace Net class Guild; diff --git a/src/net/ea/inventoryrecv.cpp b/src/net/ea/inventoryrecv.cpp index 830675a44..3910011d4 100644 --- a/src/net/ea/inventoryrecv.cpp +++ b/src/net/ea/inventoryrecv.cpp @@ -28,8 +28,6 @@ #include "const/net/inventory.h" -#include "enums/equipslot.h" - #include "enums/resources/notifytypes.h" #include "gui/widgets/createwidget.h" diff --git a/src/net/ea/inventoryrecv.h b/src/net/ea/inventoryrecv.h index 472dc8362..731e01b85 100644 --- a/src/net/ea/inventoryrecv.h +++ b/src/net/ea/inventoryrecv.h @@ -34,7 +34,7 @@ namespace Net { class MessageIn; -} +} // namespace Net class Inventory; diff --git a/src/net/ea/loginrecv.h b/src/net/ea/loginrecv.h index 33d58eb1e..b134bc7b3 100644 --- a/src/net/ea/loginrecv.h +++ b/src/net/ea/loginrecv.h @@ -30,7 +30,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace Ea { diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp index 9efc807c7..bee70d46f 100644 --- a/src/net/ea/network.cpp +++ b/src/net/ea/network.cpp @@ -29,8 +29,6 @@ #include "utils/gettext.h" #include "utils/sdlhelper.h" -#include "net/packetinfo.h" - #include <sstream> #include "debug.h" diff --git a/src/net/ea/npcrecv.h b/src/net/ea/npcrecv.h index 1c26f5521..645b36fd1 100644 --- a/src/net/ea/npcrecv.h +++ b/src/net/ea/npcrecv.h @@ -30,7 +30,7 @@ class NpcDialog; namespace Net { class MessageIn; -} +} // namespace Net namespace Ea { diff --git a/src/net/ea/partyrecv.h b/src/net/ea/partyrecv.h index 4c56a0617..c65388716 100644 --- a/src/net/ea/partyrecv.h +++ b/src/net/ea/partyrecv.h @@ -29,7 +29,7 @@ class Party; namespace Net { class MessageIn; -} +} // namespace Net namespace Ea { diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index aeec03c7b..0c57ab0ef 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -22,21 +22,8 @@ #include "net/ea/playerhandler.h" -#include "party.h" -#include "notifymanager.h" -#include "units.h" - -#include "being/localplayer.h" #include "being/playerinfo.h" -#include "enums/resources/notifytypes.h" - -#include "gui/windows/skilldialog.h" -#include "gui/windows/statuswindow.h" - -#include "net/ea/eaprotocol.h" -#include "net/ea/playerrecv.h" - #include "debug.h" namespace Ea diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index d19fdd28a..6b3b85073 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -27,11 +27,6 @@ #include <climits> -namespace Net -{ - class MessageIn; -} - namespace Ea { diff --git a/src/net/ea/playerrecv.h b/src/net/ea/playerrecv.h index 715c8e16f..4c800d13b 100644 --- a/src/net/ea/playerrecv.h +++ b/src/net/ea/playerrecv.h @@ -28,7 +28,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace Ea { @@ -44,7 +44,6 @@ namespace Ea void processMapMusic(Net::MessageIn &msg); void processMapMask(Net::MessageIn &msg); } // namespace PlayerRecv - } // namespace Ea #endif // NET_EA_PLAYERRECV_H diff --git a/src/net/eathena/battlegroundrecv.h b/src/net/eathena/battlegroundrecv.h index 084061831..4349c532c 100644 --- a/src/net/eathena/battlegroundrecv.h +++ b/src/net/eathena/battlegroundrecv.h @@ -26,7 +26,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace EAthena { diff --git a/src/net/eathena/beingrecv.h b/src/net/eathena/beingrecv.h index d2d0a749e..416d7c894 100644 --- a/src/net/eathena/beingrecv.h +++ b/src/net/eathena/beingrecv.h @@ -42,7 +42,7 @@ namespace Net { class MessageIn; -} +} // namespace Net class Being; diff --git a/src/net/eathena/buyingstorerecv.h b/src/net/eathena/buyingstorerecv.h index 88a8ef7b7..ea0f76b00 100644 --- a/src/net/eathena/buyingstorerecv.h +++ b/src/net/eathena/buyingstorerecv.h @@ -26,7 +26,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace EAthena { diff --git a/src/net/eathena/charserverrecv.h b/src/net/eathena/charserverrecv.h index 1935a888b..13b791d86 100644 --- a/src/net/eathena/charserverrecv.h +++ b/src/net/eathena/charserverrecv.h @@ -32,7 +32,7 @@ namespace Net class MessageIn; struct Character; -} +} // namespace Net namespace EAthena { diff --git a/src/net/eathena/chatrecv.h b/src/net/eathena/chatrecv.h index d1845b0d3..d469bcbda 100644 --- a/src/net/eathena/chatrecv.h +++ b/src/net/eathena/chatrecv.h @@ -30,7 +30,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace EAthena { diff --git a/src/net/eathena/inventoryrecv.cpp b/src/net/eathena/inventoryrecv.cpp index f1d17a6ca..cc639e6e3 100644 --- a/src/net/eathena/inventoryrecv.cpp +++ b/src/net/eathena/inventoryrecv.cpp @@ -44,8 +44,6 @@ #include "listeners/arrowslistener.h" #include "net/inventoryhandler.h" - -#include "net/inventoryhandler.h" #include "net/messagein.h" #include "net/eathena/itemflags.h" @@ -97,7 +95,7 @@ namespace InventoryRecv }; Ea::InventoryItems mCartItems; -} +} // namespace InventoryRecv void InventoryRecv::processPlayerEquipment(Net::MessageIn &msg) { diff --git a/src/net/eathena/inventoryrecv.h b/src/net/eathena/inventoryrecv.h index 2050f2338..d024c8362 100644 --- a/src/net/eathena/inventoryrecv.h +++ b/src/net/eathena/inventoryrecv.h @@ -28,7 +28,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace EAthena { diff --git a/src/net/eathena/mailrecv.h b/src/net/eathena/mailrecv.h index 7ef41e8dd..3eabf7042 100644 --- a/src/net/eathena/mailrecv.h +++ b/src/net/eathena/mailrecv.h @@ -24,7 +24,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace EAthena { diff --git a/src/net/eathena/npcrecv.h b/src/net/eathena/npcrecv.h index 84f28b574..876d0f7dc 100644 --- a/src/net/eathena/npcrecv.h +++ b/src/net/eathena/npcrecv.h @@ -24,7 +24,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace EAthena { diff --git a/src/net/eathena/partyrecv.h b/src/net/eathena/partyrecv.h index ef188b9ff..9d7711ad8 100644 --- a/src/net/eathena/partyrecv.h +++ b/src/net/eathena/partyrecv.h @@ -25,7 +25,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace EAthena { diff --git a/src/net/eathena/playerrecv.h b/src/net/eathena/playerrecv.h index 8dfab5944..e6ef1f776 100644 --- a/src/net/eathena/playerrecv.h +++ b/src/net/eathena/playerrecv.h @@ -26,7 +26,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace EAthena { diff --git a/src/net/eathena/skillrecv.h b/src/net/eathena/skillrecv.h index c40e858e2..d40477ab5 100644 --- a/src/net/eathena/skillrecv.h +++ b/src/net/eathena/skillrecv.h @@ -26,7 +26,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace EAthena { diff --git a/src/net/eathena/sp.h b/src/net/eathena/sp.h index f3f1c7e1d..7a5e08181 100644 --- a/src/net/eathena/sp.h +++ b/src/net/eathena/sp.h @@ -268,4 +268,4 @@ namespace Sp }; } // namespace Sp -#endif // NET_EATHENA_H +#endif // NET_EATHENA_SP_H diff --git a/src/net/eathena/traderecv.h b/src/net/eathena/traderecv.h index 3e70b392d..39e8327bc 100644 --- a/src/net/eathena/traderecv.h +++ b/src/net/eathena/traderecv.h @@ -26,7 +26,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace EAthena { diff --git a/src/net/eathena/vendingrecv.h b/src/net/eathena/vendingrecv.h index af7ddd382..edff20856 100644 --- a/src/net/eathena/vendingrecv.h +++ b/src/net/eathena/vendingrecv.h @@ -26,7 +26,7 @@ class BuyDialog; namespace Net { class MessageIn; -} +} // namespace Net namespace EAthena { diff --git a/src/net/tmwa/beingrecv.h b/src/net/tmwa/beingrecv.h index afb8e484b..0d7dd93ff 100644 --- a/src/net/tmwa/beingrecv.h +++ b/src/net/tmwa/beingrecv.h @@ -38,7 +38,7 @@ namespace Net { class MessageIn; -} +} // namespace Net class Being; diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 9fc0478c2..e9a7924b9 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -22,8 +22,6 @@ #include "net/tmwa/charserverhandler.h" -#include "client.h" - #include "gui/windows/charcreatedialog.h" #include "net/character.h" diff --git a/src/net/tmwa/chatrecv.h b/src/net/tmwa/chatrecv.h index a46c0b8df..44758bbb2 100644 --- a/src/net/tmwa/chatrecv.h +++ b/src/net/tmwa/chatrecv.h @@ -28,7 +28,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace TmwAthena { diff --git a/src/net/tmwa/inventoryrecv.cpp b/src/net/tmwa/inventoryrecv.cpp index 1586c5aa7..1bc89676a 100644 --- a/src/net/tmwa/inventoryrecv.cpp +++ b/src/net/tmwa/inventoryrecv.cpp @@ -72,7 +72,7 @@ namespace InventoryRecv EquipSlot::SHADOW_ACCESSORY2_SLOT, // Shadow Accessory 2 EquipSlot::SHADOW_ACCESSORY1_SLOT, // Shadow Accessory 1 }; -} +} // namespace InventoryRecv void InventoryRecv::processPlayerEquipment(Net::MessageIn &msg) { diff --git a/src/net/tmwa/inventoryrecv.h b/src/net/tmwa/inventoryrecv.h index 4408e00d3..102a6a871 100644 --- a/src/net/tmwa/inventoryrecv.h +++ b/src/net/tmwa/inventoryrecv.h @@ -28,7 +28,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace TmwAthena { diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index ad6ad5dce..d48c5123f 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -22,8 +22,6 @@ #include "net/tmwa/loginhandler.h" -#include "client.h" - #include "net/serverfeatures.h" #include "net/ea/loginrecv.h" diff --git a/src/net/tmwa/traderecv.h b/src/net/tmwa/traderecv.h index 761164bf2..f8cd97609 100644 --- a/src/net/tmwa/traderecv.h +++ b/src/net/tmwa/traderecv.h @@ -26,7 +26,7 @@ namespace Net { class MessageIn; -} +} // namespace Net namespace TmwAthena { |