Commit: 1e3c39092b60ea21d2f7c8d64d2e042184602b19 - zcc (hg)

Commit MetaInfo

• Revisión: 1e3c39092b60ea21d2f7c8d64d2e042184602b19 (tree)
• Tiempo: 2022-03-08 23:33:18
• Autor: Léonard <hobbax3@gmai...>
• Commiter: Léonard

Log Message

Removed some of the leftover delta from the 3.1 merge.

Cambiar Resumen

• modified: src/cl_main.cpp
• modified: src/g_game.cpp
• modified: src/g_shared/shared_sbar.cpp
• modified: src/p_map.cpp
• modified: src/p_pspr.cpp
• modified: src/p_user.cpp
• modified: src/wi_stuff.cpp

Diferencia incremental

diff -r 971c9fa0ecad -r 1e3c39092b60 src/cl_main.cpp
--- a/src/cl_main.cpp	Tue Mar 08 15:23:23 2022 +0100
+++ b/src/cl_main.cpp	Tue Mar 08 15:33:18 2022 +0100
@@ -1193,7 +1193,7 @@
 				if ( debugfile )
 					fprintf( debugfile, "Missing packet %d.\n", static_cast<int> (lIdx) );
 
-				g_LocalBuffer.ByteStream.WriteLong(lIdx);
+				g_LocalBuffer.ByteStream.WriteLong( lIdx );
 				CLIENTSTATISTICS_AddToMissingPacketsRequested ( 1 );
 
 				// [Leo] Print how many packets we missed.
@@ -5542,10 +5542,6 @@
 	actor->velx = momx;
 	actor->vely = momy;
 	actor->velz = momz;
-	
-	actor->PrevX = x;
-	actor->PrevY = y;
-	actor->PrevZ = z;
 
 	// Also, if this is a player, set his bobbing appropriately.
 	if ( actor->player )

diff -r 971c9fa0ecad -r 1e3c39092b60 src/g_game.cpp
--- a/src/g_game.cpp	Tue Mar 08 15:23:23 2022 +0100
+++ b/src/g_game.cpp	Tue Mar 08 15:33:18 2022 +0100
@@ -1096,8 +1096,6 @@
 		int step = (( changespy == SPY_NEXT ) || ( changespy == SPY_CARRIER )) ? 1 : -1;
 		int originalplayer = player - players;
 
-		bool valid = false;
-
 		// [SP] Let's ignore special LMS settigns if we're playing a demo. Otherwise, we need to enforce
 		// LMS rules for spectators using spy.
 		if (( CLIENTDEMO_IsPlaying( ) == false ) && (( lmsspectatorsettings & LMS_SPF_VIEW ) == false ))

diff -r 971c9fa0ecad -r 1e3c39092b60 src/g_shared/shared_sbar.cpp
--- a/src/g_shared/shared_sbar.cpp	Tue Mar 08 15:23:23 2022 +0100
+++ b/src/g_shared/shared_sbar.cpp	Tue Mar 08 15:33:18 2022 +0100
@@ -85,7 +85,6 @@
 EXTERN_CVAR (Bool, am_showtotaltime)
 EXTERN_CVAR (Bool, noisedebug)
 EXTERN_CVAR (Bool, con_scaletext)
-EXTERN_CVAR (Int, vid_defheight)
 
 DBaseStatusBar *StatusBar;
 
@@ -1800,7 +1799,7 @@
 		return;
 
 	// Look for players directly in front of the player.
-	if( camera )
+	if ( camera )
 	{
 		player_t			*pTargetPlayer;
 		ULONG				ulTextColor;

diff -r 971c9fa0ecad -r 1e3c39092b60 src/p_map.cpp
--- a/src/p_map.cpp	Tue Mar 08 15:23:23 2022 +0100
+++ b/src/p_map.cpp	Tue Mar 08 15:33:18 2022 +0100
@@ -5486,7 +5486,7 @@
 		if ( trace.Actor->player == NULL )
 			return ( NULL );
 
-		// Return the actor we found.
+		// Return the player we found.
 		return ( trace.Actor->player );
 	}
 }

diff -r 971c9fa0ecad -r 1e3c39092b60 src/p_pspr.cpp
--- a/src/p_pspr.cpp	Tue Mar 08 15:23:23 2022 +0100
+++ b/src/p_pspr.cpp	Tue Mar 08 15:33:18 2022 +0100
@@ -543,7 +543,6 @@
 		switch (bobstyle)
 		{
 		case AWeapon::BobNormal:
-		default:
 			*x = FixedMul(bobx, finecosine[angle]);
 			*y = FixedMul(boby, finesine[angle & (FINEANGLES/2-1)]);
 			break;

diff -r 971c9fa0ecad -r 1e3c39092b60 src/p_user.cpp
--- a/src/p_user.cpp	Tue Mar 08 15:23:23 2022 +0100
+++ b/src/p_user.cpp	Tue Mar 08 15:33:18 2022 +0100
@@ -3557,6 +3557,7 @@
 		player->mo->flags5 &= ~MF5_NOINTERACTION;
 
 	cmd = &player->cmd;
+
 	// Make unmodified copies for ACS's GetPlayerInput.
 	player->original_oldbuttons = player->original_cmd.buttons;
 	player->original_cmd = cmd->ucmd;

diff -r 971c9fa0ecad -r 1e3c39092b60 src/wi_stuff.cpp
--- a/src/wi_stuff.cpp	Tue Mar 08 15:23:23 2022 +0100
+++ b/src/wi_stuff.cpp	Tue Mar 08 15:33:18 2022 +0100
@@ -2554,7 +2554,7 @@
 {
 	// counter for general background animation
 	bcnt++;  
-
+	
 	if (bcnt == 1)
 	{
 		// [BB]