r2057 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Dec 20 17:54:05 EST 2006
Author: div0
Date: 2006-12-20 17:54:04 -0500 (Wed, 20 Dec 2006)
New Revision: 2057
Modified:
trunk/data/qcsrc/server/t_plats.qc
Log:
fix boolean logic for crushers
Modified: trunk/data/qcsrc/server/t_plats.qc
===================================================================
--- trunk/data/qcsrc/server/t_plats.qc 2006-12-18 09:19:33 UTC (rev 2056)
+++ trunk/data/qcsrc/server/t_plats.qc 2006-12-20 22:54:04 UTC (rev 2057)
@@ -113,7 +113,7 @@
void() plat_crush =
{
- if((self.spawnflags == 4) && (other.takedamage != DAMAGE_NO)) { // KIll Kill Kill!!
+ if((self.spawnflags & 4) && (other.takedamage != DAMAGE_NO)) { // KIll Kill Kill!!
Damage (other, self, self, 10000, DEATH_HURTTRIGGER, other.origin, '0 0 0');
} else {
if((self.dmg) && (other.takedamage != DAMAGE_NO)) { // Shall we bite?
@@ -153,7 +153,7 @@
if (self.sounds == 0)
self.sounds = 2;
- if(self.spawnflags == 4)
+ if(self.spawnflags & 4)
self.dmg = 10000;
if(self.dmg && (!self.message))
@@ -689,7 +689,7 @@
void() door_blocked =
{
- if((self.spawnflags | 4) && (other.takedamage != DAMAGE_NO)) { // KIll Kill Kill!!
+ if((self.spawnflags & 4) && (other.takedamage != DAMAGE_NO)) { // KIll Kill Kill!!
Damage (other, self, self, 10000, DEATH_HURTTRIGGER, other.origin, '0 0 0');
} else {
@@ -1076,7 +1076,7 @@
self.dmg = 0;
}
- if(self.spawnflags == 4)
+ if(self.spawnflags & 4)
self.dmg = 10000;
if(self.dmg & (!self.message))
More information about the nexuiz-commits
mailing list