Commit: 86fe5297016e7eaeeaac2dd31d05ec87987f2c70 - zatspg-release (hg)

This is a fork of Zandronum for TSPG.

Commit MetaInfo

• Revisão: 86fe5297016e7eaeeaac2dd31d05ec87987f2c70 (tree)
• Hora: 2017-01-16 01:16:42
• Autor: Benjamin Berkels <torr.samaho@quan...>
• Commiter: Benjamin Berkels

Mensagem de Log

- renamed g_lSavedTurnTicks to g_SavedTurnTicks and change its type to BYTE to match player_t::turnticks
- fixed VC++ warnings in cl_pred.cpp

Mudança Sumário

• modified: src/cl_pred.cpp

Diff

diff -r 7708ea215fbb -r 86fe5297016e src/cl_pred.cpp
--- a/src/cl_pred.cpp	Sun Jan 15 17:14:12 2017 +0100
+++ b/src/cl_pred.cpp	Sun Jan 15 17:16:42 2017 +0100
@@ -84,7 +84,7 @@
 static	fixed_t		g_SavedPitch[CLIENT_PREDICTION_TICS];
 static	fixed_t		g_SavedCrouchfactor[CLIENT_PREDICTION_TICS];
 static	LONG		g_lSavedJumpTicks[CLIENT_PREDICTION_TICS];
-static	LONG		g_lSavedTurnTicks[CLIENT_PREDICTION_TICS];
+static	BYTE		g_SavedTurnTicks[CLIENT_PREDICTION_TICS];
 static	LONG		g_lSavedReactionTime[CLIENT_PREDICTION_TICS];
 static	LONG		g_lSavedWaterLevel[CLIENT_PREDICTION_TICS];
 static	bool		g_bSavedOnFloor[CLIENT_PREDICTION_TICS];
@@ -314,7 +314,7 @@
 	}
 
 	// [BB] Remember whether the player was standing on another actor.
-	g_bSavedOnMobj[Tick % CLIENT_PREDICTION_TICS] = (pPlayer->mo->flags2 & MF2_ONMOBJ);
+	g_bSavedOnMobj[Tick % CLIENT_PREDICTION_TICS] = !!(pPlayer->mo->flags2 & MF2_ONMOBJ);
 }
 
 //*****************************************************************************
@@ -325,7 +325,7 @@
 	g_SavedPitch[g_ulGameTick % CLIENT_PREDICTION_TICS] = pPlayer->mo->pitch;
 	g_SavedCrouchfactor[g_ulGameTick % CLIENT_PREDICTION_TICS] = pPlayer->crouchfactor;
 	g_lSavedJumpTicks[g_ulGameTick % CLIENT_PREDICTION_TICS] = pPlayer->jumpTics;
-	g_lSavedTurnTicks[g_ulGameTick % CLIENT_PREDICTION_TICS] = pPlayer->turnticks;
+	g_SavedTurnTicks[g_ulGameTick % CLIENT_PREDICTION_TICS] = pPlayer->turnticks;
 	g_lSavedReactionTime[g_ulGameTick % CLIENT_PREDICTION_TICS] = pPlayer->mo->reactiontime;
 	g_lSavedWaterLevel[g_ulGameTick % CLIENT_PREDICTION_TICS] = pPlayer->mo->waterlevel;
 	memcpy( &g_SavedTiccmd[g_ulGameTick % CLIENT_PREDICTION_TICS], &pPlayer->cmd, sizeof( ticcmd_t ));
@@ -374,7 +374,7 @@
 		// crouchfactor, but just use the value we already calculated before.
 		pPlayer->crouchfactor = g_SavedCrouchfactor[( lTick + 1 )% CLIENT_PREDICTION_TICS];
 		pPlayer->jumpTics = g_lSavedJumpTicks[lTick % CLIENT_PREDICTION_TICS];
-		pPlayer->turnticks = g_lSavedTurnTicks[lTick % CLIENT_PREDICTION_TICS];
+		pPlayer->turnticks = g_SavedTurnTicks[lTick % CLIENT_PREDICTION_TICS];
 		pPlayer->mo->reactiontime = g_lSavedReactionTime[lTick % CLIENT_PREDICTION_TICS];
 		pPlayer->mo->waterlevel = g_lSavedWaterLevel[lTick % CLIENT_PREDICTION_TICS];
 
@@ -405,7 +405,7 @@
 	pPlayer->mo->pitch = g_SavedPitch[g_ulGameTick % CLIENT_PREDICTION_TICS];
 	pPlayer->crouchfactor = g_SavedCrouchfactor[g_ulGameTick % CLIENT_PREDICTION_TICS];
 	pPlayer->jumpTics = g_lSavedJumpTicks[g_ulGameTick % CLIENT_PREDICTION_TICS];
-	pPlayer->turnticks = g_lSavedTurnTicks[g_ulGameTick % CLIENT_PREDICTION_TICS];
+	pPlayer->turnticks = g_SavedTurnTicks[g_ulGameTick % CLIENT_PREDICTION_TICS];
 	pPlayer->mo->reactiontime = g_lSavedReactionTime[g_ulGameTick % CLIENT_PREDICTION_TICS];
 	pPlayer->mo->waterlevel = g_lSavedWaterLevel[g_ulGameTick % CLIENT_PREDICTION_TICS];
 }