Changeset 207 for trunk/src/game/ItemHandler.cpp

Timestamp:

11/19/08 13:46:22 (17 years ago)

Author:

yumileroy

Message:

[svn] * Improve some arena team related DB access
* Cache GM tickets on server startup.
* Remove unused src/game/HateMatrix.h and references.
* Better check client inventory pos data received in some client packets to
skip invalid cases

Original author: KingPin?
Date: 2008-11-10 09:04:23-06:00

Files:

• trunk/src/game/ItemHandler.cpp (modified) (4 diffs)

trunk/src/game/ItemHandler.cpp

@@ -50 +50 @@
         return;                                             //check count - if zero it's fake packet
 
+    if(!_player->IsValidPos(srcbag,srcslot))
+    {
+        _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
+        return;
+    }
+
+    if(!_player->IsValidPos(dstbag,dstslot))
+    {
+        _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
+        return;
+    }
+
     _player->SplitItem( src, dst, count );
 }
@@ -66 +78 @@
     if(srcslot==dstslot)
         return;
+
+    if(!_player->IsValidPos(INVENTORY_SLOT_BAG_0,srcslot))
+    {
+        _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
+        return;
+    }
+
+    if(!_player->IsValidPos(INVENTORY_SLOT_BAG_0,dstslot))
+    {
+        _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
+        return;
+    }
 
     uint16 src = ( (INVENTORY_SLOT_BAG_0 << 8) | srcslot );
@@ -109 +133 @@
     if(src==dst)
         return;
+
+    if(!_player->IsValidPos(srcbag,srcslot))
+    {
+        _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
+        return;
+    }
+
+    if(!_player->IsValidPos(dstbag,dstslot))
+    {
+        _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
+        return;
+    }
 
     _player->SwapItem( src, dst );
@@ -747 +783 @@
         return;
 
+    if(!_player->IsValidPos(dstbag,NULL_SLOT))
+    {
+        _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
+        return;
+    }
+
     uint16 src = pItem->GetPos();