Merge branch 'drjaska/damagetext' into 'master'

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

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 08bd71298b6e70e2fa2f638d8ad8270fe1c6f5f4..df54e3536b10acdf149037ddacc8b6c4c133da12 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -1677,21 +1677,6 @@ void Skeleton_SetBones(entity e)
 string to_execute_next_frame;
 void execute_next_frame()
 {
-#ifdef SVQC
-       IL_EACH(g_moveables, it.last_pushed,
-       {
-               if(!WarpZoneLib_ExactTrigger_Touch(it.last_pushed, it, false))
-               {
-                       it.last_pushed = NULL;
-               }
-       });
-#elif defined(CSQC)
-       if(csqcplayer.last_pushed && !WarpZoneLib_ExactTrigger_Touch(csqcplayer.last_pushed, csqcplayer, false))
-       {
-               csqcplayer.last_pushed = NULL;
-       }
-#endif
-
        if(to_execute_next_frame)
        {
                localcmd("\n", to_execute_next_frame, "\n");