diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-01-11 01:34:11 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-01-11 01:34:11 +0200 |
| commit | fcced13d9972ac70f0f01f19583b7868e255b6a7 (patch) | |
| tree | 9b01df102c5f9ba032ea0f9bc413dd707e99d88b /src/net/tmwa/inventoryhandler.cpp | |
| parent | 311783bebbe2bed366dca5097697ce34c690292d (diff) | |
| parent | ef1b9856c86512fe73154c17da3ea98a7cd5f896 (diff) | |
| download | plus-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.gz plus-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.bz2 plus-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.xz plus-fcced13d9972ac70f0f01f19583b7868e255b6a7.zip | |
Merge branch 'master' into invfiler
Diffstat (limited to 'src/net/tmwa/inventoryhandler.cpp')
| -rw-r--r-- | src/net/tmwa/inventoryhandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index b4b38e623..3cc0e9ce0 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -77,8 +77,8 @@ const Equipment::Slot EQUIP_CONVERT[] = Equipment::EQUIP_GLOVES_SLOT, // SPRITE_GLOVES Equipment::EQUIP_FIGHT1_SLOT, // SPRITE_WEAPON Equipment::EQUIP_FIGHT2_SLOT, // SPRITE_SHIELD - Equipment::EQUIP_PROJECTILE_SLOT, // 0 - Equipment::EQUIP_PROJECTILE_SLOT, // 0 + Equipment::EQUIP_EVOL_RING1_SLOT, // SPRITE_EVOL1 + Equipment::EQUIP_EVOL_RING2_SLOT, // SPRITE_EVOL2 Equipment::EQUIP_PROJECTILE_SLOT, // 0 }; |