[nexuiz-commits] r8564 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2010-01-25 12:09:49 -0500 (Mon, 25 Jan 2010)
New Revision: 8564

Modified:
   trunk/data/qcsrc/server/cheats.qc
   trunk/data/qcsrc/server/t_items.qc
Log:
- don't give the powerups in "give all", they're annoying
- handle rot/regen correctly in give

Modified: trunk/data/qcsrc/server/cheats.qc
===================================================================
--- trunk/data/qcsrc/server/cheats.qc	2010-01-25 17:09:26 UTC (rev 8563)
+++ trunk/data/qcsrc/server/cheats.qc	2010-01-25 17:09:49 UTC (rev 8564)
@@ -616,7 +616,7 @@
 		case "give":
 			if(argv(1) == "all")
 			{
-				s = "unlimited_ammo jetpack fuel_regen strength invinicible cells shells nails rockets health armor fuel";
+				s = "jetpack cells shells nails rockets health armor fuel";
 				for(j = WEP_FIRST; j <= WEP_LAST; ++j)
 				{
 					wi = get_weaponinfo(j);

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2010-01-25 17:09:26 UTC (rev 8563)
+++ trunk/data/qcsrc/server/t_items.qc	2010-01-25 17:09:49 UTC (rev 8564)
@@ -1572,9 +1572,9 @@
 	v0 = e.fld;
 	GiveValue(e, fld, op, val, snd_incr, snd_decr);
 	v1 = e.fld;
-	if(v0 > v1)
+	if(v0 < v1)
 		e.rotfield = max(e.rotfield, time + rottime);
-	else if(v0 < v1)
+	else if(v0 > v1)
 		e.regenfield = max(e.regenfield, time + regentime);
 	return (v0 != v1);
 }