diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-02-08 00:49:41 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-02-08 00:49:41 +0300 |
commit | ff5e17ff14a78af31d9d23cd1dfdb5404f9a8fa9 (patch) | |
tree | 51a99a43eba0b09ca9e5f554b3676d0308685797 /src/net | |
parent | 538261b13990ee02bbc62d9704233885b15cee04 (diff) | |
download | manaplus-ff5e17ff14a78af31d9d23cd1dfdb5404f9a8fa9.tar.gz manaplus-ff5e17ff14a78af31d9d23cd1dfdb5404f9a8fa9.tar.bz2 manaplus-ff5e17ff14a78af31d9d23cd1dfdb5404f9a8fa9.tar.xz manaplus-ff5e17ff14a78af31d9d23cd1dfdb5404f9a8fa9.zip |
Fix code style with new tool.
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/ea/beinghandler.cpp | 6 | ||||
-rw-r--r-- | src/net/ea/gui/partytab.cpp | 1 | ||||
-rw-r--r-- | src/net/ea/inventoryhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/manaserv/chathandler.cpp | 2 | ||||
-rw-r--r-- | src/net/manaserv/guildhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/manaserv/playerhandler.cpp | 3 | ||||
-rw-r--r-- | src/net/net.cpp | 1 | ||||
-rw-r--r-- | src/net/tmwa/gui/guildtab.cpp | 1 | ||||
-rw-r--r-- | src/net/tmwa/gui/partytab.cpp | 1 | ||||
-rw-r--r-- | src/net/tmwa/network.cpp | 4 |
10 files changed, 12 insertions, 11 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 84bd03bb1..d9e7e7506 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -511,6 +511,12 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) } break; + case 0x01: // dead + break; + // tmw server can send here garbage? +// if (srcBeing) +// srcBeing->setAction(Being::DEAD); + case 0x02: // Sit if (srcBeing) { diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp index cf62af459..d5e344ac2 100644 --- a/src/net/ea/gui/partytab.cpp +++ b/src/net/ea/gui/partytab.cpp @@ -242,4 +242,3 @@ void PartyTab::saveToLogFile(std::string &msg) } } // namespace Ea - diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 4c4fb760c..d870eff38 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -330,7 +330,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg) { Item *item = inventory->getItem(index); - if (item && item->getId() == itemId) + if (item && item->getId() == itemId) amount += item->getQuantity(); if (serverVersion < 1 && identified > 1) diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp index f0a23127c..12451e6f6 100644 --- a/src/net/manaserv/chathandler.cpp +++ b/src/net/manaserv/chathandler.cpp @@ -293,7 +293,7 @@ void ChatHandler::handleChannelEvent(Net::MessageIn &msg) if (channel) { - switch(eventId) + switch (eventId) { case CHAT_EVENT_NEW_PLAYER: channel->getTab()->chatLog(strprintf(_("%s entered the " diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp index dfd2ed3cf..aa82d6dcd 100644 --- a/src/net/manaserv/guildhandler.cpp +++ b/src/net/manaserv/guildhandler.cpp @@ -153,7 +153,7 @@ void GuildHandler::handleMessage(Net::MessageIn &msg) Guild *guild = player_node->getGuild(guildId); if (guild) { - switch(eventId) + switch (eventId) { case GUILD_EVENT_NEW_PLAYER: member = guild->addMember(name); diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp index aa79d4d41..b2609cf02 100644 --- a/src/net/manaserv/playerhandler.cpp +++ b/src/net/manaserv/playerhandler.cpp @@ -151,8 +151,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg) PlayerInfo::setAttribute(CORR_POINTS, msg.readInt16()); Particle* effect = particleEngine->addEffect( paths.getStringValue("particles") - + paths.getStringValue("levelUpEffectFile") - , 0, 0); + + paths.getStringValue("levelUpEffectFile"), 0, 0); player_node->controlParticle(effect); } break; diff --git a/src/net/net.cpp b/src/net/net.cpp index 713b6aa7e..75bc35b72 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -202,4 +202,3 @@ ServerInfo::Type getNetworkType() } } // namespace Net - diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp index af90f5c6b..496ba64f5 100644 --- a/src/net/tmwa/gui/guildtab.cpp +++ b/src/net/tmwa/gui/guildtab.cpp @@ -53,4 +53,3 @@ GuildTab::~GuildTab() } } // namespace TmwAthena - diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index d0738e79c..02bcfd54f 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -56,4 +56,3 @@ PartyTab::~PartyTab() } } // namespace TmwAthena - diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index 31329eafb..6e9e367c0 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -133,8 +133,8 @@ Network::~Network() mMutex = nullptr; mInstance = nullptr; - delete[] mInBuffer; - delete[] mOutBuffer; + delete []mInBuffer; + delete []mOutBuffer; SDLNet_Quit(); } |