]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix schrödinger's IS_ONGROUND bug
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 14 Dec 2014 11:38:29 +0000 (22:38 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 14 Dec 2014 11:38:29 +0000 (22:38 +1100)
It was possible for the client to report being on the ground, and the server to report being in the air

qcsrc/common/physics.qc
qcsrc/server/t_jumppads.qc

index ff1aa4a21b15d9413006a8f0b0351b39a9ce5164..a97d69fb939c60b9e71e432cd757364d89b51d29 100644 (file)
@@ -1513,8 +1513,8 @@ void PM_Main()
        if (!(PHYS_INPUT_BUTTON_JUMP(self))) // !jump
                UNSET_JUMP_HELD(self); // canjump = true
        pmove_waterjumptime -= PHYS_INPUT_TIMELENGTH;
-       PM_ClientMovement_UpdateStatus();
 #endif
+       PM_ClientMovement_UpdateStatus();
 
 #ifdef SVQC
        WarpZone_PlayerPhysics_FixVAngle();
index 44d7e3ed6e5e34f2d376c2337125a2f4cbcbb15a..2e6f476d80b3a786450b1e49691a25a6d4e0eb9f 100644 (file)
@@ -270,8 +270,10 @@ void trigger_push_touch()
 }
 
 .vector dest;
+#ifdef SVQC
 void trigger_push_link();
 void trigger_push_updatelink();
+#endif
 void trigger_push_findtarget()
 {
        entity t;