Objectify buffs

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / items / inventory.qh

diff --git a/qcsrc/common/items/inventory.qh b/qcsrc/common/items/inventory.qh
index 89abc97cff2a82f252cca4730061a367b741c354..25590ea43cd45713a44bd1e6095e716bb22575b5 100644 (file)
--- a/qcsrc/common/items/inventory.qh
+++ b/qcsrc/common/items/inventory.qh
@@ -15,7 +15,7 @@ class(Inventory) .int inv_items[MAX_ITEMS];
 void Inventory_Read(Inventory data)
 {
     const int bits = ReadInt24_t();
-    ITEMS_FOREACH(bits & BIT(i), LAMBDA({
+    FOREACH(ITEMS, 0, ITEM_COUNT, bits & BIT(i), LAMBDA({
         .int fld = inv_items[i];
         int prev = data.(fld);
         int next = data.(fld) = ReadByte();
@@ -28,12 +28,12 @@ void Inventory_Read(Inventory data)
 void Inventory_Write(Inventory data)
 {
     int bits = 0;
-    ITEMS_FOREACH(true, LAMBDA({
+    FOREACH(ITEMS, 0, ITEM_COUNT, true, LAMBDA({
         .int fld = inv_items[i];
         bits = BITSET(bits, BIT(i), data.inventory.(fld) != (data.inventory.(fld) = data.(fld)));
     }));
     WriteInt24_t(MSG_ENTITY, bits);
-    ITEMS_FOREACH(bits & BIT(i), LAMBDA({
+    FOREACH(ITEMS, 0, ITEM_COUNT, bits & BIT(i), LAMBDA({
         WriteByte(MSG_ENTITY, data.inv_items[i]);
     }));
 }