summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog6
-rw-r--r--src/defines.h1
-rw-r--r--src/game-server/gamehandler.cpp9
-rw-r--r--src/game-server/inventory.cpp73
-rw-r--r--src/game-server/inventory.hpp7
5 files changed, 73 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ea10462..80ceee8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-31 Guillaume Melquiond <guillaume.melquiond@gmail.com>
+
+ * src/defines.h, src/game-server/inventory.hpp,
+ src/game-server/gamehandler.cpp, src/game-server/inventory.cpp: Added
+ protocol for removing equipment. Compressed inventory message a bit.
+
2007-07-29 Guillaume Melquiond <guillaume.melquiond@gmail.com>
* src/game-server/mapreader.cpp, src/game-server/map.cpp,
diff --git a/src/defines.h b/src/defines.h
index 41bf12a3..2fe6efba 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -145,6 +145,7 @@ enum {
PGMSG_PICKUP = 0x0110, // W*2 position
PGMSG_DROP = 0x0111, // B slot, B amount
PGMSG_EQUIP = 0x0112, // B slot
+ PGMSG_UNEQUIP = 0x0113, // B slot
GPMSG_INVENTORY = 0x0120, // { B slot, W item id [, B amount] }*
GPMSG_INVENTORY_FULL = 0x0121, // { B slot, W item id [, B amount] }*
GPMSG_PLAYER_ATTRIBUTE_UPDATE = 0x0130, // { W attribute, W value }*
diff --git a/src/game-server/gamehandler.cpp b/src/game-server/gamehandler.cpp
index 34988edc..e01c4a9d 100644
--- a/src/game-server/gamehandler.cpp
+++ b/src/game-server/gamehandler.cpp
@@ -250,6 +250,15 @@ void GameHandler::processMessage(NetComputer *comp, MessageIn &message)
Inventory(computer.character).equip(slot);
} break;
+ case PGMSG_UNEQUIP:
+ {
+ int slot = message.readByte();
+ if (slot >= 0 && slot < EQUIP_PROJECTILE_SLOT)
+ {
+ Inventory(computer.character).unequip(slot);
+ }
+ } break;
+
case PGMSG_ATTACK:
{
LOG_DEBUG("Character " << computer.character->getPublicID()
diff --git a/src/game-server/inventory.cpp b/src/game-server/inventory.cpp
index 2d3a66c6..a431b284 100644
--- a/src/game-server/inventory.cpp
+++ b/src/game-server/inventory.cpp
@@ -230,13 +230,17 @@ int Inventory::insert(int itemId, int amount)
{
prepare();
- int slot = 0;
int maxPerSlot = ItemManager::getItem(itemId)->getMaxPerSlot();
+ if (maxPerSlot == 1)
+ {
+ return fillFreeSlot(itemId, amount, maxPerSlot);
+ }
+ int slot = 0;
for (std::vector< InventoryItem >::iterator i = mPoss->inventory.begin(),
i_end = mPoss->inventory.end(); i != i_end; ++i)
{
- if (i->itemId == itemId)
+ if (i->itemId == itemId && i->amount < maxPerSlot)
{
int nb = std::min(maxPerSlot - i->amount, amount);
i->amount += nb;
@@ -258,7 +262,7 @@ int Inventory::insert(int itemId, int amount)
}
}
- return amount > 0 ? fillFreeSlot(itemId, amount, maxPerSlot) : 0;
+ return fillFreeSlot(itemId, amount, maxPerSlot);
}
int Inventory::count(int itemId) const
@@ -319,14 +323,16 @@ int Inventory::remove(int itemId, int amount)
amount -= nb;
msg.writeByte(getSlot(i) + EQUIP_CLIENT_INVENTORY);
- msg.writeShort(itemId);
- msg.writeByte(it.amount);
-
- // If the slot is empty, compress the inventory.
if (it.amount == 0)
{
+ msg.writeShort(0);
freeIndex(i);
}
+ else
+ {
+ msg.writeShort(itemId);
+ msg.writeByte(it.amount);
+ }
if (amount == 0)
{
@@ -354,24 +360,26 @@ int Inventory::removeFromSlot(int slot, int amount)
amount -= nb;
msg.writeByte(slot + EQUIP_CLIENT_INVENTORY);
- msg.writeShort(it.itemId);
- msg.writeByte(it.amount);
-
- // If the slot is empty, compress the inventory.
if (it.amount == 0)
{
+ msg.writeShort(0);
freeIndex(i);
}
+ else
+ {
+ msg.writeShort(it.itemId);
+ msg.writeByte(it.amount);
+ }
return amount;
}
-bool Inventory::equip(int slot)
+void Inventory::equip(int slot)
{
int itemId = getItem(slot);
if (!itemId)
{
- return false;
+ return;
}
prepare();
@@ -387,13 +395,13 @@ bool Inventory::equip(int slot)
int id = mPoss->equipment[EQUIP_FIGHT1_SLOT];
if (id && !insert(id, 1))
{
- return false;
+ return;
}
id = mPoss->equipment[EQUIP_FIGHT2_SLOT];
if (id && !insert(id, 1))
{
- return false;
+ return;
}
msg.writeByte(EQUIP_FIGHT1_SLOT);
@@ -403,14 +411,14 @@ bool Inventory::equip(int slot)
mPoss->equipment[EQUIP_FIGHT1_SLOT] = itemId;
mPoss->equipment[EQUIP_FIGHT2_SLOT] = 0;
removeFromSlot(slot, 1);
- return true;
+ return;
}
case ITEM_EQUIPMENT_PROJECTILE:
msg.writeByte(EQUIP_PROJECTILE_SLOT);
msg.writeShort(itemId);
mPoss->equipment[EQUIP_PROJECTILE_SLOT] = itemId;
- return true;
+ return;
case ITEM_EQUIPMENT_ONE_HAND_WEAPON:
case ITEM_EQUIPMENT_SHIELD:
@@ -451,7 +459,7 @@ bool Inventory::equip(int slot)
case ITEM_UNUSABLE:
case ITEM_USABLE:
default:
- return false;
+ return;
}
int id = mPoss->equipment[firstSlot];
@@ -468,22 +476,43 @@ bool Inventory::equip(int slot)
msg.writeShort(itemId);
mPoss->equipment[secondSlot] = itemId;
removeFromSlot(slot, 1);
- return true;
+ return;
}
// no break!
case 1:
if (id && !insert(id, 1))
{
- return false;
+ return;
}
msg.writeByte(firstSlot);
msg.writeShort(itemId);
mPoss->equipment[firstSlot] = itemId;
removeFromSlot(slot, 1);
- return true;
+ return;
default:
- return false;
+ return;
+ }
+}
+
+void Inventory::unequip(int slot)
+{
+ int itemId = mPoss->equipment[slot];
+ if (!itemId)
+ {
+ return;
+ }
+
+ prepare();
+ msg.writeByte(slot);
+ msg.writeShort(0);
+ if (insert(itemId, 1))
+ {
+ cancel();
+ }
+ else
+ {
+ mPoss->equipment[slot] = 0;
}
}
diff --git a/src/game-server/inventory.hpp b/src/game-server/inventory.hpp
index a05f166b..e3a76561 100644
--- a/src/game-server/inventory.hpp
+++ b/src/game-server/inventory.hpp
@@ -97,7 +97,12 @@ class Inventory
/**
* Equips item from given inventory slot.
*/
- bool equip(int slot);
+ void equip(int slot);
+
+ /**
+ * Unequips item from given equipment slot.
+ */
+ void unequip(int slot);
/**
* Gets the ID of projectiles. Removes one of these projectiles from
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-04-25 08:11:48 +0000