summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-26 22:22:22 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-06 00:27:26 +0100
commitc75511fffc77d517fbf854ec8bef791f055de44c (patch)
treec431846c7d7a6934f103d21129a20a0dc4fd1c8e /src/net
parent646cc317351d60e0fefcab789248310662fcbbc8 (diff)
downloadmana-c75511fffc77d517fbf854ec8bef791f055de44c.tar.gz
mana-c75511fffc77d517fbf854ec8bef791f055de44c.tar.bz2
mana-c75511fffc77d517fbf854ec8bef791f055de44c.tar.xz
mana-c75511fffc77d517fbf854ec8bef791f055de44c.zip
Got rid of Sint{8,16,32} and Uint32 for being ID
Using unsigned rarely makes sense, especially when the server doesn't use it either. Other uses of unsigned should be reviewed. In all other cases, int is the fastest integer type on any architecture. Using 8 or 16 bits can basically only be a memory optimization.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/beinghandler.cpp6
-rw-r--r--src/net/buysellhandler.cpp8
-rw-r--r--src/net/chathandler.cpp2
-rw-r--r--src/net/equipmenthandler.cpp6
-rw-r--r--src/net/inventoryhandler.cpp6
-rw-r--r--src/net/itemhandler.cpp2
-rw-r--r--src/net/npchandler.cpp2
-rw-r--r--src/net/playerhandler.cpp22
-rw-r--r--src/net/skillhandler.cpp8
-rw-r--r--src/net/tradehandler.cpp6
10 files changed, 34 insertions, 34 deletions
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index b706b088..356d9509 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -69,16 +69,16 @@ BeingHandler::BeingHandler(bool enableSync):
void BeingHandler::handleMessage(MessageIn *msg)
{
- Uint32 id;
+ int id;
Uint16 job, speed;
Uint16 headTop, headMid, headBottom;
Uint16 shoes, gloves;
Uint16 weapon, shield;
Uint16 gmstatus;
- Sint16 param1;
+ int param1;
int stunMode;
Uint32 statusEffects;
- Sint8 type;
+ int type;
Uint16 status;
Being *srcBeing, *dstBeing;
int hairStyle, hairColor, flag;
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index 65f8498a..520a1fe6 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.cpp
@@ -77,10 +77,10 @@ void BuySellHandler::handleMessage(MessageIn *msg)
for (int k = 0; k < n_items; k++)
{
- Sint32 value = msg->readInt32();
+ int value = msg->readInt32();
msg->readInt32(); // DCvalue
msg->readInt8(); // type
- Sint16 itemId = msg->readInt16();
+ int itemId = msg->readInt16();
buyDialog->addItem(itemId, value);
}
break;
@@ -96,8 +96,8 @@ void BuySellHandler::handleMessage(MessageIn *msg)
for (int k = 0; k < n_items; k++)
{
- Sint16 index = msg->readInt16();
- Sint32 value = msg->readInt32();
+ int index = msg->readInt16();
+ int value = msg->readInt32();
msg->readInt32(); // OCvalue
Item *item = player_node->getInventory()->getItem(index);
diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp
index a3ccc4fb..8e108142 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.cpp
@@ -60,7 +60,7 @@ void ChatHandler::handleMessage(MessageIn *msg)
Being *being;
std::string chatMsg;
std::string nick;
- Sint16 chatMsgLength;
+ int chatMsgLength;
switch (msg->getId())
{
diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 9a3c396a..a31da38e 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -48,9 +48,9 @@ EquipmentHandler::EquipmentHandler()
void EquipmentHandler::handleMessage(MessageIn *msg)
{
- Sint32 itemCount;
- Sint16 index, equipPoint, itemId;
- Sint8 type;
+ int itemCount;
+ int index, equipPoint, itemId;
+ int type;
int mask, position;
Item *item;
Inventory *inventory = player_node->getInventory();
diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index a227701e..d78a7a45 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.cpp
@@ -61,9 +61,9 @@ InventoryHandler::InventoryHandler()
void InventoryHandler::handleMessage(MessageIn *msg)
{
- Sint32 number;
- Sint16 index, amount, itemId, equipType, arrow;
- Sint16 identified, cards[4], itemType;
+ int number;
+ int index, amount, itemId, equipType, arrow;
+ int identified, cards[4], itemType;
Inventory *inventory = player_node->getInventory();
Inventory *storage = player_node->getStorage();
diff --git a/src/net/itemhandler.cpp b/src/net/itemhandler.cpp
index 8c4af4e4..b7ac23a8 100644
--- a/src/net/itemhandler.cpp
+++ b/src/net/itemhandler.cpp
@@ -41,7 +41,7 @@ void ItemHandler::handleMessage(MessageIn *msg)
{
Uint32 id;
Uint16 x, y;
- Sint16 itemId;
+ int itemId;
switch (msg->getId())
{
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 2ecd4726..487b358f 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -50,7 +50,7 @@ NPCHandler::NPCHandler()
void NPCHandler::handleMessage(MessageIn *msg)
{
- Uint32 id;
+ int id;
switch (msg->getId())
{
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 7790cdd0..d99a97a5 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -164,8 +164,8 @@ void PlayerHandler::handleMessage(MessageIn *msg)
player_node->mY = y;
logger->log("Adjust scrolling by %d:%d",
- (int)scrollOffsetX,
- (int)scrollOffsetY);
+ (int) scrollOffsetX,
+ (int) scrollOffsetY);
viewport->scrollBy(scrollOffsetX, scrollOffsetY);
}
@@ -173,7 +173,7 @@ void PlayerHandler::handleMessage(MessageIn *msg)
case SMSG_PLAYER_STAT_UPDATE_1:
{
- Sint16 type = msg->readInt16();
+ int type = msg->readInt16();
Uint32 value = msg->readInt32();
switch (type)
@@ -301,10 +301,10 @@ void PlayerHandler::handleMessage(MessageIn *msg)
case SMSG_PLAYER_STAT_UPDATE_3:
{
- Sint32 type = msg->readInt32();
- Sint32 base = msg->readInt32();
- Sint32 bonus = msg->readInt32();
- Sint32 total = base + bonus;
+ int type = msg->readInt32();
+ int base = msg->readInt32();
+ int bonus = msg->readInt32();
+ int total = base + bonus;
switch (type) {
case 0x000d: player_node->mAttr[LocalPlayer::STR] = total;
@@ -325,9 +325,9 @@ void PlayerHandler::handleMessage(MessageIn *msg)
case SMSG_PLAYER_STAT_UPDATE_4:
{
- Sint16 type = msg->readInt16();
- Sint8 fail = msg->readInt8();
- Sint8 value = msg->readInt8();
+ int type = msg->readInt16();
+ int fail = msg->readInt8();
+ int value = msg->readInt8();
if (fail != 1)
break;
@@ -404,7 +404,7 @@ void PlayerHandler::handleMessage(MessageIn *msg)
case SMSG_PLAYER_ARROW_MESSAGE:
{
- Sint16 type = msg->readInt16();
+ int type = msg->readInt16();
switch (type) {
case 0:
diff --git a/src/net/skillhandler.cpp b/src/net/skillhandler.cpp
index e2185524..526698f4 100644
--- a/src/net/skillhandler.cpp
+++ b/src/net/skillhandler.cpp
@@ -51,14 +51,14 @@ void SkillHandler::handleMessage(MessageIn *msg)
for (int k = 0; k < skillCount; k++)
{
- Sint16 skillId = msg->readInt16();
+ int skillId = msg->readInt16();
msg->readInt16(); // target type
msg->readInt16(); // unknown
- Sint16 level = msg->readInt16();
- Sint16 sp = msg->readInt16();
+ int level = msg->readInt16();
+ int sp = msg->readInt16();
msg->readInt16(); // range
std::string skillName = msg->readString(24);
- Sint8 up = msg->readInt8();
+ int up = msg->readInt8();
if (level != 0 || up != 0)
{
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index c5465835..ab2eba31 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -140,8 +140,8 @@ void TradeHandler::handleMessage(MessageIn *msg)
case SMSG_TRADE_ITEM_ADD:
{
- Sint32 amount = msg->readInt32();
- Sint16 type = msg->readInt16();
+ int amount = msg->readInt32();
+ int type = msg->readInt16();
msg->readInt8(); // identified flag
msg->readInt8(); // attribute
msg->readInt8(); // refine
@@ -166,7 +166,7 @@ void TradeHandler::handleMessage(MessageIn *msg)
tradeWindow->receivedOk(true);
return;
}
- Sint16 quantity = msg->readInt16();
+ int quantity = msg->readInt16();
switch (msg->readInt8())
{