kill nottargeted field

diff --git a/qcsrc/common/triggers/trigger/heal.qc b/qcsrc/common/triggers/trigger/heal.qc
index f2345e8f59397aba32c0802dd24e6b218a3c255a..0f5c69c777f65c0540a41de281622f4af56feb08 100644 (file)
--- a/qcsrc/common/triggers/trigger/heal.qc
+++ b/qcsrc/common/triggers/trigger/heal.qc
@@ -13,7 +13,7 @@ void trigger_heal_touch(entity this, entity toucher)
                if (!IS_DEAD(toucher))
                if (toucher.triggerhealtime < time)
                {
-                       bool is_trigger = !boolean(!this.nottargeted && this.targetname != "");
+                       bool is_trigger = this.targetname == "";
                        if(is_trigger)
                                EXACTTRIGGER_TOUCH(this, toucher);
                        if(this.delay > 0)

diff --git a/qcsrc/common/triggers/triggers.qh b/qcsrc/common/triggers/triggers.qh
index 2b8274f4b890aa473b5432de2415bb1719e925a1..49e3cb5efde4b76fbc46399f814115a74da85325 100644 (file)
--- a/qcsrc/common/triggers/triggers.qh
+++ b/qcsrc/common/triggers/triggers.qh
@@ -14,8 +14,7 @@ const float   SPAWNFLAG_NOTOUCH = 1;
 
 .float height;
 
-.float nottargeted;
-#define IFTARGETED if(!this.nottargeted && this.targetname != "")
+#define IFTARGETED if(this.targetname != "")
 
 .float lip;
 

diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh
index 8a32b9b5bddf8c9ff71e031f6857fecbc86cb812..5538a574428cb4b8cbc5dbbe01dec2aa0f5264c8 100644 (file)
--- a/qcsrc/server/miscfunctions.qh
+++ b/qcsrc/server/miscfunctions.qh
@@ -29,7 +29,6 @@ float cvar_normal(string n)
 #define cvar_set_normal builtin_cvar_set
 
 .vector dropped_origin;
-.float nottargeted;
 
 entity eliminatedPlayers;
 void EliminatedPlayers_Init(float(entity) isEliminated_func);

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index 7f7f19b518912d5b56db30c60e2fcb447c347074..8804063dc6e5c918cb64e1b2912c2a27e99b8771 100644 (file)
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -995,7 +995,7 @@ spawnfunc(target_checkpoint) // defrag entity
        defrag_ents = 1;
 
        // if this is targeted, then it probably isn't a trigger
-       bool is_trigger = !boolean(!this.nottargeted && this.targetname != "");
+       bool is_trigger = this.targetname == "";
 
        if(is_trigger)
                EXACTTRIGGER_INIT;