summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-03-04 16:27:43 +0200
committerAndrei Karas <akaras@inbox.ru>2011-03-04 16:27:43 +0200
commit47aa9bcf5eb537456abc393699c8fec07a4d5153 (patch)
tree453309d61789d8b27879abcc98c013cc7affd576 /src/net
parentc3669ceb38114c68a6de11de46b0d3fd3713db59 (diff)
downloadmv-47aa9bcf5eb537456abc393699c8fec07a4d5153.tar.gz
mv-47aa9bcf5eb537456abc393699c8fec07a4d5153.tar.bz2
mv-47aa9bcf5eb537456abc393699c8fec07a4d5153.tar.xz
mv-47aa9bcf5eb537456abc393699c8fec07a4d5153.zip
Fix code style.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/manaserv/beinghandler.cpp3
-rw-r--r--src/net/tmwa/beinghandler.cpp6
-rw-r--r--src/net/tmwa/charserverhandler.cpp9
-rw-r--r--src/net/tmwa/inventoryhandler.cpp5
-rw-r--r--src/net/tmwa/tradehandler.cpp4
5 files changed, 18 insertions, 9 deletions
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index b726bc52e..578b947f2 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -350,7 +350,8 @@ void BeingHandler::handleBeingLooksChangeMessage(Net::MessageIn &msg)
{
int style = msg.readInt16();
int color = msg.readInt16();
- being->setSprite(SPRITE_HAIR, style * -1, ColorDB::getHairColor(color));
+ being->setSprite(SPRITE_HAIR, style * -1,
+ ColorDB::getHairColor(color));
}
}
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 000941c30..9945bdac3 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -671,7 +671,8 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
player_node->imitateOutfit(dstBeing, SPRITE_TOPCLOTHES);
break;
case 6: // eAthena LOOK_HAIR_COLOR
- dstBeing->setSpriteColor(SPRITE_HAIR, ColorDB::getHairColor(id));
+ dstBeing->setSpriteColor(SPRITE_HAIR,
+ ColorDB::getHairColor(id));
break;
case 8: // eAthena LOOK_SHIELD
if (!config.getBoolValue("hideShield"))
@@ -909,7 +910,8 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
//dstBeing->setSprite(SPRITE_SHOE, shoes);
if (serverVersion > 0)
{
- dstBeing->setSprite(SPRITE_BOTTOMCLOTHES, headBottom, "", colors[0]);
+ dstBeing->setSprite(SPRITE_BOTTOMCLOTHES, headBottom,
+ "", colors[0]);
dstBeing->setSprite(SPRITE_TOPCLOTHES, headMid, "", colors[2]);
dstBeing->setSprite(SPRITE_HAT, headTop, "", colors[1]);
}
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index daf531f04..2265afb84 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -325,15 +325,18 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
tempPlayer->setSprite(SPRITE_GLOVES, gloves, "", msg.readInt8());
tempPlayer->setSprite(SPRITE_CAPE, cape, "", msg.readInt8());
tempPlayer->setSprite(SPRITE_MISC1, misc1, "", msg.readInt8());
- tempPlayer->setSprite(SPRITE_BOTTOMCLOTHES, bottomClothes, "", msg.readInt8());
+ tempPlayer->setSprite(SPRITE_BOTTOMCLOTHES, bottomClothes,
+ "", msg.readInt8());
//to avoid show error (error.xml) need remove this sprite
if (!config.getBoolValue("hideShield"))
tempPlayer->setSprite(SPRITE_SHIELD, shield, "", msg.readInt8());
else
msg.readInt8();
- tempPlayer->setSprite(SPRITE_HAT, hat, "", msg.readInt8()); // head option top
- tempPlayer->setSprite(SPRITE_TOPCLOTHES, topClothes, "", msg.readInt8());
+ tempPlayer->setSprite(SPRITE_HAT, hat, "",
+ msg.readInt8()); // head option top
+ tempPlayer->setSprite(SPRITE_TOPCLOTHES, topClothes, "",
+ msg.readInt8());
tempPlayer->setSprite(SPRITE_MISC2, misc2, "", msg.readInt8());
msg.skip(5);
character->slot = msg.readInt8(); // character slot
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 7113cddb3..afec336c7 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -490,7 +490,10 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
identified = 1;
if (inventory)
- inventory->setItem(index, itemId, 1, refine, identified, true);
+ {
+ inventory->setItem(index, itemId, 1, refine,
+ identified, true);
+ }
if (equipType)
mEquips.setEquipment(getSlot(equipType), index);
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index a63c530a6..581031f23 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -237,8 +237,8 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
if (tradeWindow)
{
- tradeWindow->addItem2(item->getId(), true, quantity,
- item->getRefine(), item->getColor(),
+ tradeWindow->addItem2(item->getId(), true,
+ quantity, item->getRefine(), item->getColor(),
item->isEquipment());
}
item->increaseQuantity(-quantity);