# HG changeset patch # User Adam Kaminski # Date 1624190880 14400 # Sun Jun 20 08:08:00 2021 -0400 # Node ID ac117eb0464e1feec19386ea24be7c3660abc75e # Parent e29cfbf26d2566047e423b969d59fe1f3b2c66eb Renamed SCOREBOARD_RenderInVote and SCOREBOARD_RenderInVoteClassic to CALLVOTE_Render and CALLVOTE_RenderClassic respectively. diff -r e29cfbf26d25 -r ac117eb0464e src/callvote.h --- a/src/callvote.h Sat Jun 12 23:33:37 2021 -0400 +++ b/src/callvote.h Sun Jun 20 08:08:00 2021 -0400 @@ -121,7 +121,8 @@ void CALLVOTE_Construct( void ); void CALLVOTE_Tick( void ); -//void CALLVOTE_Render( void ); +void CALLVOTE_Render( void ); +void CALLVOTE_RenderClassic( void ); void CALLVOTE_BeginVote( FString Command, FString Parameters, FString Reason, ULONG ulPlayer ); void CALLVOTE_ClearVote( void ); bool CALLVOTE_VoteYes( ULONG ulPlayer ); diff -r e29cfbf26d25 -r ac117eb0464e src/g_shared/st_hud.cpp --- a/src/g_shared/st_hud.cpp Sat Jun 12 23:33:37 2021 -0400 +++ b/src/g_shared/st_hud.cpp Sun Jun 20 08:08:00 2021 -0400 @@ -219,9 +219,9 @@ { // [RC] Display either the fullscreen or minimized vote screen. if ( cl_showfullscreenvote ) - SCOREBOARD_RenderInVoteClassic( ); + CALLVOTE_RenderClassic( ); else - SCOREBOARD_RenderInVote( ); + CALLVOTE_Render( ); } // [AK] Render the countdown screen when we're in the countdown. diff -r e29cfbf26d25 -r ac117eb0464e src/scoreboard.cpp --- a/src/scoreboard.cpp Sat Jun 12 23:33:37 2021 -0400 +++ b/src/scoreboard.cpp Sun Jun 20 08:08:00 2021 -0400 @@ -202,7 +202,7 @@ //***************************************************************************** // -void SCOREBOARD_RenderInVoteClassic( void ) +void CALLVOTE_RenderClassic( void ) { ULONG *pulPlayersWhoVotedYes = CALLVOTE_GetPlayersWhoVotedYes( ); ULONG *pulPlayersWhoVotedNo = CALLVOTE_GetPlayersWhoVotedNo( ); @@ -275,7 +275,7 @@ // // [RC] New compact version; RenderInVoteClassic is the fullscreen version // -void SCOREBOARD_RenderInVote( void ) +void CALLVOTE_Render( void ) { ULONG ulVoteChoice = CALLVOTE_GetPlayerVoteChoice( consoleplayer ); FString text; diff -r e29cfbf26d25 -r ac117eb0464e src/scoreboard.h --- a/src/scoreboard.h Sat Jun 12 23:33:37 2021 -0400 +++ b/src/scoreboard.h Sun Jun 20 08:08:00 2021 -0400 @@ -91,8 +91,6 @@ void SCOREBOARD_Render( ULONG ulDisplayPlayer ); void SCOREBOARD_BuildLimitStrings( std::list &lines, bool bAcceptColors ); -void SCOREBOARD_RenderInVote( void ); -void SCOREBOARD_RenderInVoteClassic( void ); bool SCOREBOARD_ShouldDrawBoard( ULONG ulDisplayPlayer ); LONG SCOREBOARD_GetLeftToLimit( void ); void SCOREBOARD_SetNextLevel( const char *pszMapName );