diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-08-14 20:48:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-08-14 22:57:54 +0300 |
| commit | 38be14fed30a1058e7ab91a6d2ec6ce0dd3c6ce1 (patch) | |
| tree | 9643297cc43031704afb655d8828c671877a71d5 /src/net | |
| parent | de337195bdbb72df1e56b630f0b83d394648bbb8 (diff) | |
| download | manaplus-38be14fed30a1058e7ab91a6d2ec6ce0dd3c6ce1.tar.gz manaplus-38be14fed30a1058e7ab91a6d2ec6ce0dd3c6ce1.tar.bz2 manaplus-38be14fed30a1058e7ab91a6d2ec6ce0dd3c6ce1.tar.xz manaplus-38be14fed30a1058e7ab91a6d2ec6ce0dd3c6ce1.zip | |
fix code style.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 5 | ||||
| -rw-r--r-- | src/net/eathena/protocol.h | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 492d1894e..35d549149 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -28,9 +28,7 @@ #include "notifymanager.h" #include "party.h" -#include "being/localplayer.h" #include "being/mercenaryinfo.h" -#include "being/playerinfo.h" #include "enums/resources/notifytypes.h" @@ -38,7 +36,6 @@ #include "input/keyboardconfig.h" -#include "gui/windows/charselectdialog.h" #include "gui/windows/skilldialog.h" #include "gui/windows/socialwindow.h" #include "gui/windows/outfitwindow.h" @@ -537,7 +534,7 @@ void BeingHandler::processBeingChangeLookCards(Net::MessageIn &msg) Net::Characters &chars = Net::CharServerHandler::mCharacters; const BeingId id = msg.readBeingId("being id"); - FOR_EACH(Net::Characters::iterator, it, chars) + FOR_EACH (Net::Characters::iterator, it, chars) { Net::Character *character = *it; if (character->dummy && character->dummy->getId() == id) diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index 79910fa95..d3f0b3cb2 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -160,7 +160,7 @@ packet(SMSG_BEING_SPECIAL_EFFECT, 0x01f3); packet(SMSG_BEING_SPECIAL_EFFECT_NUM, 0x0284); packet(SMSG_BEING_SOUND_EFFECT, 0x01d3); packet(SMSG_BEING_EMOTION, 0x00c0); -packet(SMSG_BEING_ACTION, 0x008a); /**< Attack, sit, stand up, ... */ +packet(SMSG_BEING_ACTION, 0x008a); /**< Attack, sit, stand up, ...*/ packet(SMSG_BEING_ACTION2, 0x02e1); packet(SMSG_BEING_CHAT, 0x008d); /**< A being talks */ packet(SMSG_BEING_SLIDE, 0x01ff); @@ -264,14 +264,14 @@ packet(SMSG_PARTY_MEMBER_INFO, 0x01e9); packet(SMSG_PARTY_ITEM_PICKUP, 0x02b8); packet(SMSG_PARTY_LEADER, 0x07fc); -packet(SMSG_PLAYER_STORAGE_ITEMS, 0x0995); /**< Item list for storage */ -packet(SMSG_PLAYER_STORAGE_EQUIP, 0x0996); /**< Equipment list for storage */ -packet(SMSG_PLAYER_STORAGE_STATUS, 0x00f2); /**< Slots used and total slots */ +packet(SMSG_PLAYER_STORAGE_ITEMS, 0x0995); /* Item list for storage */ +packet(SMSG_PLAYER_STORAGE_EQUIP, 0x0996); /* Equipment list for storage */ +packet(SMSG_PLAYER_STORAGE_STATUS, 0x00f2); /* Slots used and total slots */ packet(SMSG_PLAYER_STORAGE_ADD_OUTDATED, 0x00f4); -packet(SMSG_PLAYER_STORAGE_ADD, 0x01c4); /**< Add item/equip to storage */ +packet(SMSG_PLAYER_STORAGE_ADD, 0x01c4); /* Add item/equip to storage */ // Remove item/equip from storage packet(SMSG_PLAYER_STORAGE_REMOVE, 0x00f6); -packet(SMSG_PLAYER_STORAGE_CLOSE, 0x00f8); /**< Storage access closed */ +packet(SMSG_PLAYER_STORAGE_CLOSE, 0x00f8); /* Storage access closed */ packet(SMSG_PLAYER_STORAGE_PASSWORD, 0x023a); packet(SMSG_PLAYER_STORAGE_PASSWORD_RESULT, 0x023c); |