summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/net/tmwa/inventoryhandler.cpp4
-rw-r--r--src/resources/iteminfo.h8
2 files changed, 7 insertions, 5 deletions
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index dcbc06e07..3e8e89703 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -200,8 +200,8 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
for (int i = 0; i < 4; i++)
cards[i] = msg.readInt16();
- index -= (msg.getId() == SMSG_PLAYER_INVENTORY) ?
- INVENTORY_OFFSET : STORAGE_OFFSET;
+ index -= ((msg.getId() == SMSG_PLAYER_INVENTORY) ?
+ INVENTORY_OFFSET : STORAGE_OFFSET);
if (debugInventory)
{
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 01a4b5b9e..d0a577f6d 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -114,7 +114,9 @@ class ItemInfo
mAttackAction(SpriteAction::INVALID),
mAttackRange(0),
mColors(0),
- mColorList("")
+ mColorList(""),
+ mHitEffectId(0),
+ mCriticalHitEffectId(0)
{
}
@@ -268,8 +270,6 @@ class ItemInfo
const std::string replaceColors(std::string str,
unsigned char color) const;
- int mHitEffectId;
- int mCriticalHitEffectId;
protected:
SpriteDisplay mDisplay; /**< Display info (like icon) */
@@ -307,6 +307,8 @@ class ItemInfo
std::map <int, int> mTags;
std::map <int, ColorDB::ItemColor> *mColors;
std::string mColorList;
+ int mHitEffectId;
+ int mCriticalHitEffectId;
};
#endif