r3212 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Jan 21 14:36:35 EST 2008
Author: div0
Date: 2008-01-21 14:36:35 -0500 (Mon, 21 Jan 2008)
New Revision: 3212
Modified:
trunk/data/qcsrc/server/miscfunctions.qc
trunk/data/qcsrc/server/mode_onslaught.qc
Log:
minor fixes in onslaught (like, destroyed control point should no longer provide spawns)
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2008-01-21 19:22:45 UTC (rev 3211)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2008-01-21 19:36:35 UTC (rev 3212)
@@ -186,7 +186,7 @@
setsize(self, PL_MIN, PL_MAX);
droptofloor();
}
- if (game == 10/*GAME_ONSLAUGHT*/ || cvar("g_onslaught")) // xavior: game modes should be defined in defs.. leaving this here temp
+ if (g_onslaught)
self.use = onslaught_spawnpoint_use;
}
Modified: trunk/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- trunk/data/qcsrc/server/mode_onslaught.qc 2008-01-21 19:22:45 UTC (rev 3211)
+++ trunk/data/qcsrc/server/mode_onslaught.qc 2008-01-21 19:36:35 UTC (rev 3212)
@@ -310,6 +310,7 @@
void(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) onslaught_controlpoint_icon_damage =
{
+ entity oself;
if (damage <= 0)
return;
if (self.owner.isshielded)
@@ -345,6 +346,13 @@
self.owner.team = 0;
self.owner.colormap = 1024;
onslaught_updatelinks();
+
+ // Use targets now (somebody make sure this is in the right place..)
+ self = self.owner;
+ activator = self.owner;
+ SUB_UseTargets ();
+ self = oself;
+
remove(self);
}
};
@@ -566,4 +574,4 @@
void() onslaught_spawnpoint_use =
{
self.team = activator.team;
-};
\ No newline at end of file
+};
More information about the nexuiz-commits
mailing list