From: Rudolf Polzer Date: Wed, 16 Oct 2013 20:59:14 +0000 (+0200) Subject: Revert "Oh right, these cvars are backwards in the engine." X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=05aeb0c4462918b8a5db53f2975b405004ab6990;p=xonotic%2Fxonotic-data.pk3dir.git Revert "Oh right, these cvars are backwards in the engine." This reverts commit f12c3f4d76a7b5270926cd26fb2f5d08d108f4c6. --- diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc index 775eed4a1..cd38e35f3 100644 --- a/qcsrc/warpzonelib/client.qc +++ b/qcsrc/warpzonelib/client.qc @@ -157,7 +157,7 @@ void WarpZone_Teleported_Read(float isnew) if(!isnew) return; self.warpzone_transform = v; - setproperty(VF_CL_VIEWANGLES, WarpZone_TransformVAngles(self, getpropertyvec(VF_CL_VIEWANGLES), -autocvar_in_pitch_max, -autocvar_in_pitch_min)); + setproperty(VF_CL_VIEWANGLES, WarpZone_TransformVAngles(self, getpropertyvec(VF_CL_VIEWANGLES), autocvar_in_pitch_min, autocvar_in_pitch_max)); if(checkextension("DP_CSQC_ROTATEMOVES")) CL_RotateMoves(v); //CL_RotateMoves('0 90 0'); @@ -228,7 +228,7 @@ void WarpZone_FixPMove() if(e) { pmove_org = WarpZone_TransformOrigin(e, pmove_org); - input_angles = WarpZone_TransformVAngles(e, input_angles, -autocvar_in_pitch_max, -autocvar_in_pitch_min); + input_angles = WarpZone_TransformVAngles(e, input_angles, autocvar_in_pitch_min, autocvar_in_pitch_max); } } @@ -252,7 +252,7 @@ void WarpZone_FixView() if(e) { org = WarpZone_TransformOrigin(e, org); - ang = WarpZone_TransformVAngles(e, ang, -autocvar_in_pitch_max, -autocvar_in_pitch_min); + ang = WarpZone_TransformVAngles(e, ang, autocvar_in_pitch_min, autocvar_in_pitch_max); #ifdef WORKAROUND_XON010 dirty = 1; #endif diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc index 53f0f15c4..055faf801 100644 --- a/qcsrc/warpzonelib/server.qc +++ b/qcsrc/warpzonelib/server.qc @@ -57,7 +57,7 @@ float WarpZone_Teleport(entity wz, entity player, float f0, float f1) o10 = o1 = WarpZone_TransformOrigin(wz, o0); v1 = WarpZone_TransformVelocity(wz, v0); if not(IS_NOT_A_CLIENT(player)) - a1 = WarpZone_TransformVAngles(wz, player.v_angle, -player.cvar_in_pitch_max, -player.cvar_in_pitch_min); + a1 = WarpZone_TransformVAngles(wz, player.v_angle, player.cvar_in_pitch_min, player.cvar_in_pitch_max); else a1 = WarpZone_TransformAngles(wz, a0); @@ -897,7 +897,7 @@ void WarpZone_PlayerPhysics_FixVAngle(void) if(self.v_angle_z <= 360) // if not already adjusted if(time - self.ping * 0.001 < self.warpzone_teleport_time) { - self.v_angle = WarpZone_TransformVAngles(self.warpzone_teleport_zone, self.v_angle, -self.cvar_in_pitch_max, -self.cvar_in_pitch_min); + self.v_angle = WarpZone_TransformVAngles(self.warpzone_teleport_zone, self.v_angle, self.cvar_in_pitch_min, self.cvar_in_pitch_max); self.v_angle_z += 720; // mark as adjusted } #endif