summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2013-01-09 13:23:43 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2013-01-09 13:23:43 +0100
commit16074a7c2c8197a061281a6880ddbc3967d8ea0c (patch)
treebd0cc650944aaeb38e87d43b94e43c1ab94bb2c7 /src/common
parent562b403a66a6a96d883620b27455564d50e3d49b (diff)
downloadmanaserv-16074a7c2c8197a061281a6880ddbc3967d8ea0c.tar.gz
manaserv-16074a7c2c8197a061281a6880ddbc3967d8ea0c.tar.xz
manaserv-16074a7c2c8197a061281a6880ddbc3967d8ea0c.zip
Replaced 'unsigned int' with 'unsigned'
Same thing, but shorter.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/inventorydata.h14
-rw-r--r--src/common/transaction.h4
2 files changed, 9 insertions, 9 deletions
diff --git a/src/common/inventorydata.h b/src/common/inventorydata.h
index 490abff..b410b3f 100644
--- a/src/common/inventorydata.h
+++ b/src/common/inventorydata.h
@@ -39,8 +39,8 @@ struct InventoryItem
itemId(0), amount(0)
{}
- unsigned int itemId;
- unsigned int amount;
+ unsigned itemId;
+ unsigned amount;
};
struct EquipmentItem
@@ -49,25 +49,25 @@ struct EquipmentItem
itemId(0), itemInstance(0)
{}
- EquipmentItem(unsigned int itemId, unsigned int itemInstance)
+ EquipmentItem(unsigned itemId, unsigned itemInstance)
{
this->itemId = itemId;
this->itemInstance = itemInstance;
}
// The item id taken from the item db.
- unsigned int itemId;
+ unsigned itemId;
// A unique instance number used to separate items when equipping the same
// item id multiple times on possible multiple slots.
- unsigned int itemInstance;
+ unsigned itemInstance;
};
// inventory slot id -> { item }
-typedef std::map< unsigned int, InventoryItem > InventoryData;
+typedef std::map< unsigned, InventoryItem > InventoryData;
// equip slot id -> { item id, item instance }
// Equipment taking up multiple equip slot ids will be referenced multiple times
-typedef std::multimap< unsigned int, EquipmentItem > EquipData;
+typedef std::multimap< unsigned, EquipmentItem > EquipData;
/**
* Structure storing the equipment and inventory of a Player.
diff --git a/src/common/transaction.h b/src/common/transaction.h
index fdd0b8f..51c373e 100644
--- a/src/common/transaction.h
+++ b/src/common/transaction.h
@@ -23,8 +23,8 @@
struct Transaction
{
- unsigned int mAction;
- unsigned int mCharacterId;
+ unsigned mAction;
+ unsigned mCharacterId;
std::string mMessage;
};