summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-11-23 16:45:46 +0300
committerAndrei Karas <akaras@inbox.ru>2014-11-23 16:45:46 +0300
commitd20744c0ff83572dc209389df900826b7d088546 (patch)
treeb6a91790f6c52d016e57cfdba687251c1f01409f /src/net/ea
parenta22d7bce703101ba3ae15cb5b8545381dfe863c4 (diff)
downloadmv-d20744c0ff83572dc209389df900826b7d088546.tar.gz
mv-d20744c0ff83572dc209389df900826b7d088546.tar.bz2
mv-d20744c0ff83572dc209389df900826b7d088546.tar.xz
mv-d20744c0ff83572dc209389df900826b7d088546.zip
Add support for additional slots in net code.
Now projectile slot depend on server.
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/eaprotocol.h7
-rw-r--r--src/net/ea/inventoryhandler.cpp4
2 files changed, 9 insertions, 2 deletions
diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h
index 46677f25a..89d8dd791 100644
--- a/src/net/ea/eaprotocol.h
+++ b/src/net/ea/eaprotocol.h
@@ -92,6 +92,13 @@ enum
EA_SPRITE_EVOL3,
EA_SPRITE_EVOL4,
EA_SPRITE_EVOL5,
+ EA_SPRITE_EVOL6,
+ EA_SPRITE_EVOL7,
+ EA_SPRITE_EVOL8,
+ EA_SPRITE_EVOL9,
+ EA_SPRITE_EVOL10,
+ EA_SPRITE_EVOL11,
+ EA_SPRITE_EVOL12,
EA_SPRITE_VECTOREND
};
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 074459841..1f6d0e2a2 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -147,7 +147,7 @@ int InventoryHandler::getSlot(const int eAthenaSlot)
return Equipment::EQUIP_VECTOREND;
if (eAthenaSlot & 0x8000)
- return Equipment::EQUIP_PROJECTILE_SLOT;
+ return inventoryHandler->getProjectileSlot();
unsigned int mask = 1;
int position = 0;
@@ -327,7 +327,7 @@ void InventoryHandler::processPlayerArrowEquip(Net::MessageIn &msg)
return;
index -= INVENTORY_OFFSET;
- mEquips.setEquipment(Equipment::EQUIP_PROJECTILE_SLOT, index);
+ mEquips.setEquipment(inventoryHandler->getProjectileSlot(), index);
ArrowsListener::distributeEvent();
BLOCK_END("InventoryHandler::processPlayerArrowEquip")
}