]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/items/items.qc
Revert "Use correct pickup item bboxes on clients"
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / items / items.qc
index ede9cbbaf0f3b5903b4384ddcdd59b2eba485d6d..57720ef9aff2e29fe8912ba276d50bb379e58600 100644 (file)
@@ -36,26 +36,6 @@ bool ItemSend(entity this, entity to, int sf)
        else
                sf &= ~ISF_DROP;
 
-       // if the client must set the bbox or model,
-       // reuse ISF_SIZE and ISF_SIZE2 to also tell it which bbox
-       if(sf & ISF_SIZE || sf & ISF_MODEL)
-       {
-               if(this.maxs == ITEM_S_MAXS) // Small
-               {
-                       sf |= ISF_SIZE;
-                       sf &= ~ISF_SIZE2;
-               }
-               else if(this.maxs == ITEM_L_MAXS) // Large
-               {
-                       sf &= ~ISF_SIZE;
-                       sf |= ISF_SIZE2;
-               }
-               else // Default
-                       sf |= ISF_SIZE | ISF_SIZE2;
-       }
-       else // don't set the bbox
-               sf &= ~ISF_SIZE & ~ISF_SIZE2;
-
        WriteHeader(MSG_ENTITY, ENT_CLIENT_ITEM);
        WriteByte(MSG_ENTITY, sf);
 
@@ -70,6 +50,9 @@ bool ItemSend(entity this, entity to, int sf)
                WriteAngleVector(MSG_ENTITY, this.angles);
        }
 
+       // sets size on the client, unused on server
+       //if(sf & ISF_SIZE)
+
        if(sf & ISF_STATUS)
                WriteByte(MSG_ENTITY, this.ItemStatus);