From de5b0753bd94e014f0e81fc676b21c251aabd326 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 15 Jun 2015 23:21:52 +0300 Subject: Fix code style. --- src/net/ea/beinghandler.cpp | 1 + src/net/ea/tradehandler.cpp | 1 + src/net/eathena/charserverhandler.cpp | 2 +- src/net/eathena/chathandler.cpp | 1 + src/net/eathena/protocol.h | 4 ++-- src/net/tmwa/chathandler.cpp | 1 + src/net/tmwa/protocol.h | 4 ++-- src/net/tmwa/tradehandler.cpp | 1 + 8 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 515deeee7..0c4a83b42 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -27,6 +27,7 @@ #include "party.h" #include "being/localplayer.h" +#include "being/playerrelation.h" #include "being/playerrelations.h" #include "gui/viewport.h" diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 848e0a024..c27dba4f4 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -25,6 +25,7 @@ #include "notifymanager.h" #include "being/playerinfo.h" +#include "being/playerrelation.h" #include "gui/windows/tradewindow.h" diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 692ea5dfb..58e302c8a 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -33,13 +33,13 @@ #include "gui/widgets/createwidget.h" #include "net/character.h" +#include "net/playerhandler.h" #include "net/serverfeatures.h" #include "net/eathena/gamehandler.h" #include "net/eathena/loginhandler.h" #include "net/eathena/messageout.h" #include "net/eathena/network.h" -#include "net/eathena/playerhandler.h" #include "net/eathena/protocol.h" #include "net/eathena/sprite.h" diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp index db7bb5829..712e66f86 100644 --- a/src/net/eathena/chathandler.cpp +++ b/src/net/eathena/chathandler.cpp @@ -27,6 +27,7 @@ #include "being/localplayer.h" #include "being/playerinfo.h" +#include "being/playerrelation.h" #include "being/playerrelations.h" #include "gui/chatconsts.h" diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index e977477df..faef51ac2 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -68,7 +68,7 @@ packet(SMSG_MAP_LOGIN_SUCCESS, 0x0a18); /**< Contains starting location */ packet(SMSG_MAP_AUTH_REFUSE, 0x0074); packet(SMSG_MAP_QUIT_RESPONSE, 0x018b); packet(SMSG_PLAYER_STOP, 0x0088); /**< Stop walking, set position */ -packet(SMSG_PLAYER_MOVE_TO_ATTACK, 0x0139); /**< Move to within attack range */ +packet(SMSG_PLAYER_MOVE_TO_ATTACK, 0x0139); packet(SMSG_PLAYER_STAT_UPDATE_1, 0x00b0); packet(SMSG_PLAYER_STAT_UPDATE_2, 0x00b1); packet(SMSG_PLAYER_STAT_UPDATE_3, 0x0141); @@ -77,7 +77,7 @@ packet(SMSG_PLAYER_STAT_UPDATE_5, 0x00bd); packet(SMSG_PLAYER_STAT_UPDATE_6, 0x00be); packet(SMSG_PLAYER_GET_EXP, 0x07f6); packet(SMSG_WHO_ANSWER, 0x00c2); -packet(SMSG_PLAYER_WARP, 0x0091); /**< Warp player to map/location */ +packet(SMSG_PLAYER_WARP, 0x0091); packet(SMSG_PLAYER_INVENTORY, 0x0991); packet(SMSG_PLAYER_INVENTORY_ADD, 0x0990); packet(SMSG_PLAYER_INVENTORY_REMOVE, 0x00af); diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 70ee87049..152a31bd8 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -26,6 +26,7 @@ #include "configuration.h" #include "being/localplayer.h" +#include "being/playerrelation.h" #include "being/playerrelations.h" #include "gui/chatconsts.h" diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h index 70ad201d3..9a455e03a 100644 --- a/src/net/tmwa/protocol.h +++ b/src/net/tmwa/protocol.h @@ -63,7 +63,7 @@ packet(SMSG_PLAYER_UPDATE_1, 0x01d8); packet(SMSG_PLAYER_UPDATE_2, 0x01d9); packet(SMSG_PLAYER_MOVE, 0x01da); /**< A nearby player moves */ packet(SMSG_PLAYER_STOP, 0x0088); /**< Stop walking, set position */ -packet(SMSG_PLAYER_MOVE_TO_ATTACK, 0x0139); /**< Move to within attack range */ +packet(SMSG_PLAYER_MOVE_TO_ATTACK, 0x0139); packet(SMSG_PLAYER_STAT_UPDATE_1, 0x00b0); packet(SMSG_PLAYER_STAT_UPDATE_2, 0x00b1); packet(SMSG_PLAYER_STAT_UPDATE_3, 0x0141); @@ -71,7 +71,7 @@ packet(SMSG_PLAYER_STAT_UPDATE_4, 0x00bc); packet(SMSG_PLAYER_STAT_UPDATE_5, 0x00bd); packet(SMSG_PLAYER_STAT_UPDATE_6, 0x00be); packet(SMSG_WHO_ANSWER, 0x00c2); -packet(SMSG_PLAYER_WARP, 0x0091); /**< Warp player to map/location */ +packet(SMSG_PLAYER_WARP, 0x0091); packet(SMSG_PLAYER_INVENTORY, 0x01ee); packet(SMSG_PLAYER_INVENTORY_ADD, 0x00a0); packet(SMSG_PLAYER_INVENTORY_REMOVE, 0x00af); diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 4ad803640..f43c5b266 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -27,6 +27,7 @@ #include "notifymanager.h" #include "being/playerinfo.h" +#include "being/playerrelation.h" #include "being/playerrelations.h" #include "gui/windows/confirmdialog.h" -- cgit v1.2.3-70-g09d2