diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-11-08 11:00:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-11-08 11:00:57 +0300 |
| commit | 41b1958bffdec520c30c476fc8c6371873b940d3 (patch) | |
| tree | 2bb2d34c7ca90c7cc9b2b31e69d70138fbb28e4e /src/net | |
| parent | c6dbf10ed70e6f94d28ad555545b7522ea7348b8 (diff) | |
| download | manaplus-41b1958bffdec520c30c476fc8c6371873b940d3.tar.gz manaplus-41b1958bffdec520c30c476fc8c6371873b940d3.tar.bz2 manaplus-41b1958bffdec520c30c476fc8c6371873b940d3.tar.xz manaplus-41b1958bffdec520c30c476fc8c6371873b940d3.zip | |
Fix code style.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/eathena/charserverhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/inventoryhandler.cpp | 1 | ||||
| -rw-r--r-- | src/net/eathena/network.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/generalhandler.cpp | 1 | ||||
| -rw-r--r-- | src/net/tmwa/inventoryhandler.cpp | 1 |
5 files changed, 2 insertions, 5 deletions
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 4d90e4505..a4908413d 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -204,7 +204,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg, msg.readInt16("speed"); tempPlayer->setSubtype(msg.readInt16("class"), 0); const int hairStyle = msg.readInt16("hair style"); - const uint16_t weapon = msg.readInt32("weapon"); + const int weapon = msg.readInt32("weapon"); tempPlayer->setSprite(SPRITE_WEAPON, weapon, "", 1, true); diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index 14fa4df3b..b55aea477 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -25,7 +25,6 @@ #include "notifymanager.h" #include "being/localplayer.h" -#include "being/pickup.h" #include "listeners/arrowslistener.h" diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp index f0f727462..d47166d78 100644 --- a/src/net/eathena/network.cpp +++ b/src/net/eathena/network.cpp @@ -145,7 +145,7 @@ bool Network::messageReady() len = 10; } else if (msgId >= 0 && static_cast<unsigned int>(msgId) - < packet_lengths_size) + < packet_lengths_size) { len = packet_lengths[msgId]; } diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 219cedc3d..995d5b4b1 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -33,7 +33,6 @@ #include "gui/windows/socialwindow.h" #include "gui/windows/statuswindow.h" -#include "gui/widgets/tabs/chat/guildtab.h" #include "gui/widgets/tabs/chat/partytab.h" #include "net/tmwa/adminhandler.h" diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 43cc5fd3b..83bc38e6a 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -25,7 +25,6 @@ #include "notifymanager.h" #include "being/localplayer.h" -#include "being/pickup.h" #include "listeners/arrowslistener.h" |