Merge branch 'terencehill/menu_fixes' into 'master'

[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 691aea5056cc09908feb67b6dafa84ea517814ee..4493138d08dca032f149aaba09a4f8e5f2817f53 100644 (file)
--- a/qcsrc/common/triggers/triggers.qc
+++ b/qcsrc/common/triggers/triggers.qc
@@ -254,7 +254,7 @@ void SUB_UseTargets(entity this, entity actor, entity trigger)
                        int aw_flag = this.antiwall_flag;
                        for(entity t = world; (t = find(t, targetname, s)); )
                        {
-                               if(t.use1)
+                               if(t.use)
                                {
                                        if(this.target_random)
                                        {
@@ -265,7 +265,7 @@ void SUB_UseTargets(entity this, entity actor, entity trigger)
                                                if (t.classname == "func_clientwall" || t.classname == "func_clientillusionary")
                                                        t.antiwall_flag = aw_flag;
 
-                                               t.use1(t, actor, this);
+                                               t.use(t, actor, this);
                                        }
                                }
                        }
@@ -273,7 +273,7 @@ void SUB_UseTargets(entity this, entity actor, entity trigger)
        }
 
        if(this.target_random && RandomSelection_chosen_ent)
-               RandomSelection_chosen_ent.use1(RandomSelection_chosen_ent, actor, this);
+               RandomSelection_chosen_ent.use(RandomSelection_chosen_ent, actor, this);
 }
 
 void SUB_UseTargets_self()