r3494 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun Mar 9 13:01:35 EDT 2008


Author: lordhavoc
Date: 2008-03-09 13:01:32 -0400 (Sun, 09 Mar 2008)
New Revision: 3494

Modified:
   trunk/data/qcsrc/server/t_items.qc
   trunk/data/qcsrc/server/t_quake.qc
Log:
clarified item_armor2 and item_armorInv to use item_armor_large calls
added a comment about the conflict on item_armor1


Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2008-03-09 16:45:31 UTC (rev 3493)
+++ trunk/data/qcsrc/server/t_items.qc	2008-03-09 17:01:32 UTC (rev 3494)
@@ -738,7 +738,7 @@
 }
 
 // support old misnamed entities
-void item_armor1() { item_armor_small(); }
+void item_armor1() { item_armor_small(); }  // FIXME: in Quake this is green armor, in Nexuiz maps it is an armor shard
 void item_armor25() { item_armor_large(); }
 void item_health1() { item_health_small(); }
 void item_health25() { item_health_medium(); }

Modified: trunk/data/qcsrc/server/t_quake.qc
===================================================================
--- trunk/data/qcsrc/server/t_quake.qc	2008-03-09 16:45:31 UTC (rev 3493)
+++ trunk/data/qcsrc/server/t_quake.qc	2008-03-09 17:01:32 UTC (rev 3494)
@@ -6,8 +6,9 @@
 void weapon_supershotgun (void) {weapon_uzi();}
 
 void item_spikes (void) {item_bullets();}
-void item_armor2 (void) {item_armor25();}
-void item_armorInv (void) {item_armor25();}
+//void item_armor1 (void) {item_armor_medium;}  // FIXME: in Quake this is green armor, in Nexuiz maps it is an armor shard
+void item_armor2 (void) {item_armor_large();}
+void item_armorInv (void) {item_armor_large();}
 void item_health (void) {if (self.spawnflags & 2) item_health_mega();else item_health_medium();}
 
 //item_spikes




More information about the nexuiz-commits mailing list