Commit: a1d1b474742fc07769043ce2a916605952492bf0 - zandrodev (hg)

Commit MetaInfo

• Revisión: a1d1b474742fc07769043ce2a916605952492bf0 (tree)
• Tiempo: 2021-10-25 08:30:58
• Autor: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Fixed backup weapon select commands being parsed incorrectly.

Cambiar Resumen

• modified: src/cl_commands.cpp
• modified: src/sv_main.cpp

Diferencia incremental

diff -r 6d4eb272d493 -r a1d1b474742f src/cl_commands.cpp
--- a/src/cl_commands.cpp	Sun Oct 24 08:17:35 2021 -0400
+++ b/src/cl_commands.cpp	Sun Oct 24 19:30:58 2021 -0400
@@ -540,8 +540,8 @@
 	// also send the gametic so the server knows exactly where this command should go
 	// in the client's tic buffer, or can ignore it if it's already been received.
 	CLIENT_GetLocalBuffer( )->ByteStream.WriteByte( CLC_WEAPONSELECTBACKUP );
+	CLIENT_GetLocalBuffer( )->ByteStream.WriteShort( g_pLastWeaponClass->getActorNetworkIndex( ));
 	CLIENT_GetLocalBuffer( )->ByteStream.WriteLong( g_ulLastWeaponSelectTime );
-	CLIENT_GetLocalBuffer( )->ByteStream.WriteShort( g_pLastWeaponClass->getActorNetworkIndex( ));
 }
 
 //*****************************************************************************

diff -r 6d4eb272d493 -r a1d1b474742f src/sv_main.cpp
--- a/src/sv_main.cpp	Sun Oct 24 08:17:35 2021 -0400
+++ b/src/sv_main.cpp	Sun Oct 24 19:30:58 2021 -0400
@@ -6089,7 +6089,7 @@
 
 ClientBackupWeaponSelectCommand::ClientBackupWeaponSelectCommand ( BYTESTREAM_s *pByteStream )
 	// [AK] Read in the gametic the client sent us.
-	: ulGametic ( pByteStream->ReadLong() ), ClientWeaponSelectCommand( pByteStream ) { }
+	: ClientWeaponSelectCommand( pByteStream ), ulGametic ( pByteStream->ReadLong() ) { }
 
 
 bool ClientWeaponSelectCommand::process( const ULONG ulClient ) const