Fix CTF flags secretly spamming squashed messages, and fix a potential crash in clien...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / triggers.qc

diff --git a/qcsrc/common/triggers/triggers.qc b/qcsrc/common/triggers/triggers.qc
index d9c6a08126a90672e85be1966b31144faeba8ef2..2a76d80c41a7a7f41675d9a06826b2e236683d28 100644 (file)
--- a/qcsrc/common/triggers/triggers.qc
+++ b/qcsrc/common/triggers/triggers.qc
@@ -1,3 +1,4 @@
+#include "triggers.qh"

 void SUB_DontUseTargets(entity this, entity actor, entity trigger) { }
 
 void SUB_UseTargets(entity this, entity actor, entity trigger);
 void SUB_DontUseTargets(entity this, entity actor, entity trigger) { }
 
 void SUB_UseTargets(entity this, entity actor, entity trigger);


@@ -5,7 +6,7 @@ void SUB_UseTargets(entity this, entity actor, entity trigger);
 void DelayThink(entity this)
 {
        SUB_UseTargets (this, this.enemy, NULL);
 void DelayThink(entity this)
 {
        SUB_UseTargets (this, this.enemy, NULL);

-       remove(this);
+       delete(this);

 }
 
 void FixSize(entity e)
 }
 
 void FixSize(entity e)


@@ -21,28 +22,33 @@ void FixSize(entity e)
 
 #ifdef SVQC
 
 
 #ifdef SVQC
 

+bool autocvar_g_triggers_debug = true;
+

 void trigger_init(entity this)
 {
        string m = this.model;
        EXACTTRIGGER_INIT;
 void trigger_init(entity this)
 {
        string m = this.model;
        EXACTTRIGGER_INIT;

-       if(m != "")
-       {
-               precache_model(m);
-               _setmodel(this, m); // no precision needed
+       if(autocvar_g_triggers_debug)
+       {
+               if(m != "")
+               {
+                       precache_model(m);
+                       _setmodel(this, m); // no precision needed
+               }
+               setorigin(this, this.origin);
+               if(this.scale)
+                       setsize(this, this.mins * this.scale, this.maxs * this.scale);
+               else
+                       setsize(this, this.mins, this.maxs);

        }
        }

-       setorigin(this, this.origin);
-       if(this.scale)
-               setsize(this, this.mins * this.scale, this.maxs * this.scale);
-       else
-               setsize(this, this.mins, this.maxs);

 
 

-       BITSET_ASSIGN(this.effects, EF_NODEPTHTEST);
+       if(autocvar_g_triggers_debug)
+               BITSET_ASSIGN(this.effects, EF_NODEPTHTEST);

 }
 
 void trigger_link(entity this, bool(entity this, entity to, int sendflags) sendfunc)
 {
 }
 
 void trigger_link(entity this, bool(entity this, entity to, int sendflags) sendfunc)
 {

-       this.SendEntity = SendEntity_self;
-       this.SendEntity3 = sendfunc;
+       setSendEntity(this, sendfunc);

        this.SendFlags = 0xFFFFFF;
 }
 
        this.SendFlags = 0xFFFFFF;
 }
 


@@ -164,26 +170,28 @@ void trigger_remove_generic(entity this)
 }
 #endif
 
 }
 #endif
 

+

 /*
 ==============================
 SUB_UseTargets
 
 the global "activator" should be set to the entity that initiated the firing.
 
 /*
 ==============================
 SUB_UseTargets
 
 the global "activator" should be set to the entity that initiated the firing.
 

-If self.delay is set, a DelayedUse entity will be created that will actually
+If this.delay is set, a DelayedUse entity will be created that will actually

 do the SUB_UseTargets after that many seconds have passed.
 
 do the SUB_UseTargets after that many seconds have passed.
 

-Centerprints any self.message to the activator.
+Centerprints any this.message to the activator.

 
 

-Removes all entities with a targetname that match self.killtarget,
+Removes all entities with a targetname that match this.killtarget,

 and removes them, so some events can remove other triggers.
 
 Search for (string)targetname in all entities that
 and removes them, so some events can remove other triggers.
 
 Search for (string)targetname in all entities that

-match (string)self.target and call their .use function
+match (string)this.target and call their .use function

 
 ==============================
 */
 
 ==============================
 */

-void SUB_UseTargets(entity this, entity actor, entity trigger)
+
+void SUB_UseTargets_Ex(entity this, entity actor, entity trigger, bool preventReuse)

 {
 //
 // check for a delay
 {
 //
 // check for a delay


@@ -201,6 +209,7 @@ void SUB_UseTargets(entity this, entity actor, entity trigger)
                t.target2 = this.target2;
                t.target3 = this.target3;
                t.target4 = this.target4;
                t.target2 = this.target2;
                t.target3 = this.target3;
                t.target4 = this.target4;

+               t.antiwall_flag = this.antiwall_flag;

                return;
        }
 
                return;
        }
 


@@ -225,8 +234,8 @@ void SUB_UseTargets(entity this, entity actor, entity trigger)
        s = this.killtarget;
        if (s != "")
        {
        s = this.killtarget;
        if (s != "")
        {

-               for(entity t = world; (t = find(t, targetname, s)); )
-                       remove(t);
+               for(entity t = NULL; (t = find(t, targetname, s)); )
+                       delete(t);

        }
 #endif
 
        }
 #endif
 


@@ -252,13 +261,13 @@ void SUB_UseTargets(entity this, entity actor, entity trigger)
                        // Flag to set func_clientwall state
                        // 1 == deactivate, 2 == activate, 0 == do nothing
                        int aw_flag = this.antiwall_flag;
                        // Flag to set func_clientwall state
                        // 1 == deactivate, 2 == activate, 0 == do nothing
                        int aw_flag = this.antiwall_flag;

-                       for(entity t = world; (t = find(t, targetname, s)); )
+                       for(entity t = NULL; (t = find(t, targetname, s)); )

                        {
                        {

-                               if(t.use)
+                               if(t.use && (t.sub_target_used != time || !preventReuse))

                                {
                                        if(this.target_random)
                                        {
                                {
                                        if(this.target_random)
                                        {

-                                               RandomSelection_Add(t, 0, string_null, 1, 0);
+                                               RandomSelection_AddEnt(t, 1, 0);

                                        }
                                        else
                                        {
                                        }
                                        else
                                        {


@@ -266,6 +275,8 @@ void SUB_UseTargets(entity this, entity actor, entity trigger)
                                                        t.antiwall_flag = aw_flag;
 
                                                t.use(t, actor, this);
                                                        t.antiwall_flag = aw_flag;
 
                                                t.use(t, actor, this);

+                                               if(preventReuse)
+                                                       t.sub_target_used = time;

                                        }
                                }
                        }
                                        }
                                }
                        }


@@ -273,9 +284,16 @@ void SUB_UseTargets(entity this, entity actor, entity trigger)
        }
 
        if(this.target_random && RandomSelection_chosen_ent)
        }
 
        if(this.target_random && RandomSelection_chosen_ent)

+       {

                RandomSelection_chosen_ent.use(RandomSelection_chosen_ent, actor, this);
                RandomSelection_chosen_ent.use(RandomSelection_chosen_ent, actor, this);

+               if(preventReuse)
+                       RandomSelection_chosen_ent.sub_target_used = time;
+       }

 }
 
 }
 

+void SUB_UseTargets(entity this, entity actor, entity trigger) { SUB_UseTargets_Ex(this, actor, trigger, false); }
+void SUB_UseTargets_PreventReuse(entity this, entity actor, entity trigger) { SUB_UseTargets_Ex(this, actor, trigger, true); }
+

 void SUB_UseTargets_self(entity this)
 {
        SUB_UseTargets(this, NULL, NULL);
 void SUB_UseTargets_self(entity this)
 {
        SUB_UseTargets(this, NULL, NULL);