r5468 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Jan 9 08:47:13 EST 2009
Author: div0
Date: 2009-01-09 08:47:12 -0500 (Fri, 09 Jan 2009)
New Revision: 5468
Modified:
trunk/data/qcsrc/server/t_plats.qc
Log:
make func_train
Modified: trunk/data/qcsrc/server/t_plats.qc
===================================================================
--- trunk/data/qcsrc/server/t_plats.qc 2009-01-09 13:45:02 UTC (rev 5467)
+++ trunk/data/qcsrc/server/t_plats.qc 2009-01-09 13:47:12 UTC (rev 5468)
@@ -1,12 +1,25 @@
+.float dmgtime2;
+void generic_plat_blocked()
+{
+ if(self.dmg && other.takedamage != DAMAGE_NO) {
+ if(self.dmgtime2 < time) {
+ Damage (other, self, self, self.dmg, DEATH_HURTTRIGGER, other.origin, '0 0 0');
+ self.dmgtime2 = time + self.dmgtime;
+ }
+ // Gib dead/dying stuff
+ if(other.deadflag != DEAD_NO)
+ Damage (other, self, self, 10000, DEATH_HURTTRIGGER, other.origin, '0 0 0');
+ }
+}
+
+
float STATE_TOP = 0;
float STATE_BOTTOM = 1;
float STATE_UP = 2;
float STATE_DOWN = 3;
.entity trigger_field;
-//.float dmgtime;
-.float dmgtime2;
void() plat_center_touch;
void() plat_outside_touch;
@@ -298,27 +311,17 @@
// wait for targets to spawn
InitializeEntity(self, func_train_find, INITPRIO_SETLOCATION);
+
+ self.blocked = generic_plat_blocked;
+ if(self.dmg & (!self.message))
+ self.message = " was squished";
+ if(self.dmg && (!self.message2))
+ self.message2 = "was squished by";
+ if(self.dmg && (!self.dmgtime))
+ self.dmgtime = 0.25;
+ self.dmgtime2 = time;
};
-
-
-void rotating_blocked()
-{
-
- if(self.dmg && other.takedamage != DAMAGE_NO) {
- if(self.dmgtime2 < time) {
- Damage (other, self, self, self.dmg, DEATH_HURTTRIGGER, other.origin, '0 0 0');
- self.dmgtime2 = time + self.dmgtime;
- }
-
- // Gib dead/dying stuff
- if(other.deadflag != DEAD_NO)
- Damage (other, self, self, 10000, DEATH_HURTTRIGGER, other.origin, '0 0 0');
- }
-
-
-}
-
/*QUAKED spawnfunc_func_rotating (0 .5 .8) ? - - X_AXIS Y_AXIS
Brush model that spins in place on one axis (default Z).
speed : speed to rotate (in degrees per second)
@@ -361,7 +364,7 @@
return;
// no EF_LOWPRECISION here, as rounding angles is bad
- self.blocked = rotating_blocked;
+ self.blocked = generic_plat_blocked;
// wait for targets to spawn
self.nextthink = self.ltime + 999999999;
@@ -383,7 +386,7 @@
void bobbing_blocked()
{
// no need to duplicate code
- rotating_blocked();
+ generic_plat_blocked();
}
/*QUAKED spawnfunc_func_bobbing (0 .5 .8) ? X_AXIS Y_AXIS
@@ -883,7 +886,7 @@
};
-void door_rotating_blocked()
+void door_generic_plat_blocked()
{
if((self.spawnflags & 8) && (other.takedamage != DAMAGE_NO)) { // KIll Kill Kill!!
@@ -1607,7 +1610,7 @@
self.destvec = self.origin;
self.cnt = 360 / self.speed;
- self.blocked = rotating_blocked;
+ self.blocked = generic_plat_blocked;
if(self.dmg & (!self.message))
self.message = " was squished";
if(self.dmg && (!self.message2))
@@ -1735,7 +1738,7 @@
if(!self.target4factor)
self.target4factor = 1;
- self.blocked = rotating_blocked;
+ self.blocked = generic_plat_blocked;
if(self.dmg & (!self.message))
self.message = " was squished";
if(self.dmg && (!self.message2))
More information about the nexuiz-commits
mailing list