提交: 26ed63eab2c281a96b8b0f8498344d843380409f - zatspg-beta (hg)

This is a fork of Zandronum Beta for TSPG.

Commit MetaInfo

• 修訂: 26ed63eab2c281a96b8b0f8498344d843380409f (tree)
• 時間: 2021-10-26 23:39:07
• 作者: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Merged CLC_VOTEYES and CLC_VOTENO into a single client command: CLC_VOTE.

Change Summary

• modified: src/callvote.cpp
• modified: src/cl_commands.cpp
• modified: src/cl_commands.h
• modified: src/network_enums.h
• modified: src/sv_main.cpp

差異

diff -r af0204bb60af -r 26ed63eab2c2 src/callvote.cpp
--- a/src/callvote.cpp	Tue Oct 26 15:51:11 2021 +1100
+++ b/src/callvote.cpp	Tue Oct 26 10:39:07 2021 -0400
@@ -1236,7 +1236,7 @@
 	if ( g_VoteState != VOTESTATE_INVOTE )
 		return;
 
-	CLIENTCOMMANDS_VoteYes( );
+	CLIENTCOMMANDS_Vote( true );
 /*
 	g_lBytesSent += g_LocalBuffer.cursize;
 	if ( g_lBytesSent > g_lMaxBytesSent )
@@ -1259,7 +1259,7 @@
 	if ( g_VoteState != VOTESTATE_INVOTE )
 		return;
 
-	CLIENTCOMMANDS_VoteNo( );
+	CLIENTCOMMANDS_Vote( false );
 /*
 	g_lBytesSent += g_LocalBuffer.cursize;
 	if ( g_lBytesSent > g_lMaxBytesSent )
@@ -1288,7 +1288,7 @@
 		// Just vote no; we're the original caller, so it will be cancelled.
 		if ( CLIENT_GetConnectionState( ) == CTS_ACTIVE )
 		{
-			CLIENTCOMMANDS_VoteNo( );
+			CLIENTCOMMANDS_Vote( false );
 			NETWORK_LaunchPacket( CLIENT_GetLocalBuffer( ), CLIENT_GetServerAddress( ));
 			CLIENT_GetLocalBuffer( )->Clear();
 		}

diff -r af0204bb60af -r 26ed63eab2c2 src/cl_commands.cpp
--- a/src/cl_commands.cpp	Tue Oct 26 15:51:11 2021 +1100
+++ b/src/cl_commands.cpp	Tue Oct 26 10:39:07 2021 -0400
@@ -710,16 +710,10 @@
 
 //*****************************************************************************
 //
-void CLIENTCOMMANDS_VoteYes( void )
+void CLIENTCOMMANDS_Vote( bool bVotedYes )
 {
-	CLIENT_GetLocalBuffer( )->ByteStream.WriteByte( CLC_VOTEYES );
-}
-
-//*****************************************************************************
-//
-void CLIENTCOMMANDS_VoteNo( void )
-{
-	CLIENT_GetLocalBuffer( )->ByteStream.WriteByte( CLC_VOTENO );
+	CLIENT_GetLocalBuffer( )->ByteStream.WriteByte( CLC_VOTE );
+	CLIENT_GetLocalBuffer( )->ByteStream.WriteByte( bVotedYes );
 }
 
 //*****************************************************************************

diff -r af0204bb60af -r 26ed63eab2c2 src/cl_commands.h
--- a/src/cl_commands.h	Tue Oct 26 15:51:11 2021 +1100
+++ b/src/cl_commands.h	Tue Oct 26 10:39:07 2021 -0400
@@ -101,8 +101,7 @@
 void	CLIENTCOMMANDS_ChangeDisplayPlayer( LONG lDisplayPlayer );
 void	CLIENTCOMMANDS_AuthenticateLevel( void );
 void	CLIENTCOMMANDS_CallVote( LONG lVoteCommand, const char *pszArgument, const char *pszReason );
-void	CLIENTCOMMANDS_VoteYes( void );
-void	CLIENTCOMMANDS_VoteNo( void );
+void	CLIENTCOMMANDS_Vote( bool bVotedYes );
 void	CLIENTCOMMANDS_RequestInventoryUseAll( void );
 void	CLIENTCOMMANDS_RequestInventoryUse( AInventory *item );
 void	CLIENTCOMMANDS_RequestInventoryDrop( AInventory *pItem );

diff -r af0204bb60af -r 26ed63eab2c2 src/network_enums.h
--- a/src/network_enums.h	Tue Oct 26 15:51:11 2021 +1100
+++ b/src/network_enums.h	Tue Oct 26 10:39:07 2021 -0400
@@ -428,8 +428,7 @@
 	ENUM_ELEMENT( CLC_CHANGEDISPLAYPLAYER ),
 	ENUM_ELEMENT( CLC_AUTHENTICATELEVEL ),
 	ENUM_ELEMENT( CLC_CALLVOTE ),
-	ENUM_ELEMENT( CLC_VOTEYES ),
-	ENUM_ELEMENT( CLC_VOTENO ),
+	ENUM_ELEMENT( CLC_VOTE ),
 	ENUM_ELEMENT( CLC_INVENTORYUSEALL ),
 	ENUM_ELEMENT( CLC_INVENTORYUSE ),
 	ENUM_ELEMENT( CLC_INVENTORYDROP ),

diff -r af0204bb60af -r 26ed63eab2c2 src/sv_main.cpp
--- a/src/sv_main.cpp	Tue Oct 26 15:51:11 2021 +1100
+++ b/src/sv_main.cpp	Tue Oct 26 10:39:07 2021 -0400
@@ -4945,15 +4945,13 @@
 
 		// Client wishes to call a vote.
 		return ( server_CallVote( pByteStream ));
-	case CLC_VOTEYES:
-
-		// Client wishes to vote "yes" on the current vote.
-		CALLVOTE_VoteYes( g_lCurrentClient );
-		return ( false );
-	case CLC_VOTENO:
-
-		// Client wishes to vote "no" on the current vote.
-		CALLVOTE_VoteNo( g_lCurrentClient );
+	case CLC_VOTE:
+
+		// [AK] Check if the client wishes to vote "yes" or "no" on the current vote.
+		if ( !!pByteStream->ReadByte( ) == true )
+			CALLVOTE_VoteYes( g_lCurrentClient );
+		else
+			CALLVOTE_VoteNo( g_lCurrentClient );
 		return ( false );
 	case CLC_INVENTORYUSEALL: