- don't give the powerups in "give all", they're annoying
authordiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Mon, 25 Jan 2010 17:09:49 +0000 (17:09 +0000)
committerdiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Mon, 25 Jan 2010 17:09:49 +0000 (17:09 +0000)
- handle rot/regen correctly in give

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8564 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

data/qcsrc/server/cheats.qc
data/qcsrc/server/t_items.qc

index 36d7165..69c713f 100644 (file)
@@ -616,7 +616,7 @@ float CheatCommand(float argc)
                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);
index 9bfabce..0cf8503 100644 (file)
@@ -1572,9 +1572,9 @@ float GiveValueRot(entity e, .float fld, .float rotfield, float rottime, .float
        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);
 }