]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
get rid of the nextafter() hack now the engine has proper handling of this in setorigin()
authorRudolf Polzer <divverent@xonotic.org>
Wed, 2 Nov 2011 08:21:05 +0000 (09:21 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 2 Nov 2011 08:21:05 +0000 (09:21 +0100)
qcsrc/warpzonelib/server.qc

index 4f10aef4e8a3419851e35b70c720ac97bb80552a..3d4a750455a3e5947b073e3c62e698a9d347ea74 100644 (file)
@@ -21,7 +21,7 @@ void WarpZone_StoreProjectileData(entity e)
 
 void WarpZone_TeleportPlayer(entity teleporter, entity player, vector to, vector to_angles, vector to_velocity)
 {
-       setorigin (player, to);
+       setorigin (player, to); // NOTE: this also aborts the move, when this is called by touch
        player.oldorigin = to; // for DP's unsticking
        player.angles = to_angles;
        player.fixangle = TRUE;
@@ -82,9 +82,6 @@ float WarpZone_Teleport(entity wz, entity player, float f0, float f1)
                        o1 = o1 - v1 * (d / dv);
        }
 
-       if(o1 == o0)
-               o1_z = nextafter(o1_z, world.maxs_z);
-
        // put him out of solid
        tracebox(o1 - player.view_ofs, player.mins, player.maxs, o1 - player.view_ofs, MOVE_NOMONSTERS, player);
        if(trace_startsolid)