Merge branch 'master' into z411/bai-server

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

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index a91f8dfee39885a5fc8ebbd5354bf43e20e32cb4..5fc24e659952c5e82361f0f4d93ab24459bb8565 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -1677,6 +1677,21 @@ 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");