Move an assault constant into the assault file

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

diff --git a/qcsrc/common/triggers/target/voicescript.qc b/qcsrc/common/triggers/target/voicescript.qc
index bfce684c4a461bfabb1361f418c9bb35487d763c..6dfb568a8b5bbddfbfc1d3c5f7e8f93e68de2a4b 100644 (file)
--- a/qcsrc/common/triggers/target/voicescript.qc
+++ b/qcsrc/common/triggers/target/voicescript.qc
@@ -1,3 +1,4 @@
+#include "voicescript.qh"
 #ifdef SVQC
 .entity voicescript; // attached voice script
 .float voicescript_index; // index of next voice, or -1 to use the randomized ones
@@ -6,7 +7,7 @@
 
 void target_voicescript_clear(entity pl)
 {
-       pl.voicescript = world;
+       pl.voicescript = NULL;
 }
 
 void target_voicescript_use(entity this, entity actor, entity trigger)
@@ -31,7 +32,7 @@ void target_voicescript_next(entity pl)
                return;
        if (!IS_PLAYER(pl))
                return;
-       if(gameover)
+       if(game_stopped)
                return;
 
        if(time >= pl.voicescript_voiceend)
@@ -67,7 +68,7 @@ void target_voicescript_next(entity pl)
                        }
                        else
                        {
-                               pl.voicescript = world; // stop trying then
+                               pl.voicescript = NULL; // stop trying then
                        }
                }
        }