• R/O
  • SSH

zandronum-sandbox-stable: Commit


Commit MetaInfo

Revision98cb660c71b2f13a6f9aada53b2b642b3bb10849 (tree)
Time2022-02-11 02:24:32
AuthorAdam Kaminski <kaminskiadam9@gmai...>
CommiterAdam Kaminski

Log Message

Renamed TEAM_GetScore and TEAM_SetScore to TEAM_GetPointCount and TEAM_SetPointCount respectively.

Change Summary

Incremental Difference

diff -r fd95dad945d2 -r 98cb660c71b2 src/campaign.cpp
--- a/src/campaign.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/campaign.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -224,7 +224,7 @@
224224 {
225225 for ( ULONG i = 0; i < teams.Size( ); i++ )
226226 {
227- if ( TEAM_GetScore( players[consoleplayer].Team ) < TEAM_GetScore( i ))
227+ if ( TEAM_GetPointCount( players[consoleplayer].Team ) < TEAM_GetPointCount( i ))
228228 return ( false );
229229 }
230230 }
diff -r fd95dad945d2 -r 98cb660c71b2 src/cl_main.cpp
--- a/src/cl_main.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/cl_main.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -6204,7 +6204,7 @@
62046204 break;
62056205
62066206 case TEAMSCORE_POINTS:
6207- TEAM_SetScore( ulTeam, lScore, bAnnounce );
6207+ TEAM_SetPointCount( ulTeam, lScore, bAnnounce );
62086208 break;
62096209
62106210 case TEAMSCORE_WINS:
diff -r fd95dad945d2 -r 98cb660c71b2 src/domination.cpp
--- a/src/domination.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/domination.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -163,8 +163,8 @@
163163 {
164164 if(PointOwners[i] != 255)
165165 {
166- TEAM_SetScore(PointOwners[i], TEAM_GetScore(PointOwners[i]) + 1, false);
167- if( pointlimit && (TEAM_GetScore(PointOwners[i]) >= pointlimit) )
166+ TEAM_SetPointCount(PointOwners[i], TEAM_GetPointCount(PointOwners[i]) + 1, false);
167+ if( pointlimit && (TEAM_GetPointCount(PointOwners[i]) >= pointlimit) )
168168 {
169169 DOMINATION_WinSequence(0);
170170 break;
diff -r fd95dad945d2 -r 98cb660c71b2 src/g_doom/doom_sbar.cpp
--- a/src/g_doom/doom_sbar.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/g_doom/doom_sbar.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -780,7 +780,7 @@
780780 ulCurXPos + TexMan[szPatchName]->GetWidth( ) / 2,
781781 ulCurYPos );
782782
783- sprintf( szString, "%d", static_cast<int>( TEAM_GetScore( i )));
783+ sprintf( szString, "%d", static_cast<int>( TEAM_GetPointCount( i )));
784784 HUD_DrawText( ConFont, TEAM_GetTextColor( i ),
785785 ulCurXPos + TexMan[szPatchName]->GetWidth( ) + 16,
786786 ulCurYPos - ( TexMan[szPatchName]->GetHeight( ) / 2 ) - ( ConFont->GetHeight( ) / 2 ),
@@ -808,7 +808,7 @@
808808 else
809809 {
810810 for ( ULONG i = 0; i < teams.Size( ); i++ )
811- lPoints[i] = TEAM_GetScore( i );
811+ lPoints[i] = TEAM_GetPointCount( i );
812812 }
813813 ulCurXPos = 4;
814814 ulCurYPos = screenHeight - 4 - ( TexMan["MEDIA0"]->GetHeight( ) + 4 ) - ( TexMan["ARM1A0"]->GetHeight( ) + 4 ) - 14;
diff -r fd95dad945d2 -r 98cb660c71b2 src/g_level.cpp
--- a/src/g_level.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/g_level.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -1076,7 +1076,7 @@
10761076 TEAM_SetFragCount( i, 0, false );
10771077 TEAM_SetDeathCount( i, 0 );
10781078 TEAM_SetWinCount( i, 0, false );
1079- TEAM_SetScore( i, 0, false );
1079+ TEAM_SetPointCount( i, 0, false );
10801080 TEAM_SetAnnouncedLeadState( i, false );
10811081
10821082 // Also, reset the return ticks.
diff -r fd95dad945d2 -r 98cb660c71b2 src/g_shared/a_flags.cpp
--- a/src/g_shared/a_flags.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/g_shared/a_flags.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -435,7 +435,7 @@
435435 if (( TEAM_GetSimpleCTFSTMode( )) && ( NETWORK_InClientMode() == false ))
436436 {
437437 // Give his team a point.
438- TEAM_SetScore( Owner->player->Team, TEAM_GetScore( Owner->player->Team ) + 1, true );
438+ TEAM_SetPointCount( Owner->player->Team, TEAM_GetPointCount( Owner->player->Team ) + 1, true );
439439 PLAYER_SetPoints ( Owner->player, Owner->player->lPointCount + 1 );
440440
441441 // Award the scorer with a "Capture!" medal.
@@ -879,7 +879,7 @@
879879 if (( TEAM_GetSimpleCTFSTMode( )) && ( NETWORK_InClientMode() == false ))
880880 {
881881 // Give his team a point.
882- TEAM_SetScore( Owner->player->Team, TEAM_GetScore( Owner->player->Team ) + 1, true );
882+ TEAM_SetPointCount( Owner->player->Team, TEAM_GetPointCount( Owner->player->Team ) + 1, true );
883883 PLAYER_SetPoints ( Owner->player, Owner->player->lPointCount + 1 );
884884
885885 // Award the scorer with a "Capture!" medal.
diff -r fd95dad945d2 -r 98cb660c71b2 src/g_shared/sbarinfo_commands.cpp
--- a/src/g_shared/sbarinfo_commands.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/g_shared/sbarinfo_commands.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -1447,7 +1447,7 @@
14471447 break;
14481448 // [BB]
14491449 case TEAMSCORE:
1450- num = TEAM_GetScore(valueArgument);
1450+ num = TEAM_GetPointCount(valueArgument);
14511451 break;
14521452 case POWERUPTIME:
14531453 {
@@ -2859,7 +2859,7 @@
28592859 break;
28602860 // [BB]
28612861 case TEAMSCORE:
2862- value = TEAM_GetScore(typeArgument);
2862+ value = TEAM_GetPointCount(typeArgument);
28632863 max = pointlimit;
28642864 break;
28652865 case INVENTORY:
diff -r fd95dad945d2 -r 98cb660c71b2 src/g_shared/shared_hud.cpp
--- a/src/g_shared/shared_hud.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/g_shared/shared_hud.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -849,7 +849,7 @@
849849 else if ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSEARNWINS )
850850 return TEAM_GetWinCount( t );
851851
852- return TEAM_GetScore( t );
852+ return TEAM_GetPointCount( t );
853853 }
854854
855855 static bool TeamScoreSorter( const int& t1, const int& t2 )
diff -r fd95dad945d2 -r 98cb660c71b2 src/g_shared/shared_sbar.cpp
--- a/src/g_shared/shared_sbar.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/g_shared/shared_sbar.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -1544,7 +1544,7 @@
15441544 DTA_CenterBottomOffset, true,
15451545 TAG_DONE);
15461546
1547- DrBNumberOuter( MIN( (int)TEAM_GetScore( i ), 99 ), 28, lY - 29 );
1547+ DrBNumberOuter( MIN( (int)TEAM_GetPointCount( i ), 99 ), 28, lY - 29 );
15481548
15491549 lY -= 51;
15501550 }
@@ -1564,7 +1564,7 @@
15641564 DTA_CenterBottomOffset, true,
15651565 TAG_DONE);
15661566
1567- DrBNumberOuter( MIN( (int)TEAM_GetScore( i ), 99 ), 16, lY - 16 );
1567+ DrBNumberOuter( MIN( (int)TEAM_GetPointCount( i ), 99 ), 16, lY - 16 );
15681568
15691569 lY -= 24;
15701570 }
diff -r fd95dad945d2 -r 98cb660c71b2 src/g_shared/st_hud.cpp
--- a/src/g_shared/st_hud.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/g_shared/st_hud.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -721,7 +721,7 @@
721721 if ( ulFlags & GMF_PLAYERSEARNWINS )
722722 lTeamScore = TEAM_GetWinCount( ulTeam );
723723 else if ( ulFlags & GMF_PLAYERSEARNPOINTS )
724- lTeamScore = TEAM_GetScore( ulTeam );
724+ lTeamScore = TEAM_GetPointCount( ulTeam );
725725 else
726726 lTeamScore = TEAM_GetFragCount( ulTeam );
727727
@@ -1064,7 +1064,7 @@
10641064 else if ( ulFlags & GMF_PLAYERSEARNPOINTS )
10651065 {
10661066 scoreName = "point";
1067- scoreFunction = &TEAM_GetScore;
1067+ scoreFunction = &TEAM_GetPointCount;
10681068 }
10691069 else if ( ulFlags & GMF_PLAYERSEARNFRAGS )
10701070 {
diff -r fd95dad945d2 -r 98cb660c71b2 src/p_acs.cpp
--- a/src/p_acs.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/p_acs.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -1566,7 +1566,7 @@
15661566 return TEAM_GetFragCount( team );
15671567 else if ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSEARNWINS )
15681568 return TEAM_GetWinCount( team );
1569- return TEAM_GetScore( team );
1569+ return TEAM_GetPointCount( team );
15701570 }
15711571
15721572 //============================================================================
@@ -1611,7 +1611,7 @@
16111611 case TPROP_WinCount:
16121612 return TEAM_GetWinCount (team);
16131613 case TPROP_PointCount:
1614- return TEAM_GetScore (team);
1614+ return TEAM_GetPointCount (team);
16151615 case TPROP_ReturnTics:
16161616 return TEAM_GetReturnTicks (team);
16171617 case TPROP_NumPlayers:
@@ -9920,7 +9920,7 @@
99209920 else if ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSEARNWINS )
99219921 PushToStack( TEAM_GetWinCount( 0 ));
99229922 else
9923- PushToStack( TEAM_GetScore( 0 ));
9923+ PushToStack( TEAM_GetPointCount( 0 ));
99249924 break;
99259925 case PCD_REDTEAMSCORE:
99269926
@@ -9929,7 +9929,7 @@
99299929 else if ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSEARNWINS )
99309930 PushToStack( TEAM_GetWinCount( 1 ));
99319931 else
9932- PushToStack( TEAM_GetScore( 1 ));
9932+ PushToStack( TEAM_GetPointCount( 1 ));
99339933 break;
99349934 case PCD_ISONEFLAGCTF:
99359935
diff -r fd95dad945d2 -r 98cb660c71b2 src/p_lnspec.cpp
--- a/src/p_lnspec.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/p_lnspec.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -2116,7 +2116,7 @@
21162116 if ( !it || !it->player || it->player->bOnTeam == false )
21172117 return ( false );
21182118
2119- TEAM_SetScore( it->player->Team, TEAM_GetScore( it->player->Team ) + arg0, true );
2119+ TEAM_SetPointCount( it->player->Team, TEAM_GetPointCount( it->player->Team ) + arg0, true );
21202120 PLAYER_SetPoints ( it->player, it->player->lPointCount + arg0 );
21212121
21222122 return ( false );
@@ -2138,7 +2138,7 @@
21382138 return ( false );
21392139
21402140 // Give the point(s) to the team.
2141- TEAM_SetScore( arg0, TEAM_GetScore( arg0 ) + arg1, !!arg2 );
2141+ TEAM_SetPointCount( arg0, TEAM_GetPointCount( arg0 ) + arg1, !!arg2 );
21422142
21432143 if ( it && it->player && it->player->bOnTeam )
21442144 {
diff -r fd95dad945d2 -r 98cb660c71b2 src/possession.cpp
--- a/src/possession.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/possession.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -466,14 +466,14 @@
466466
467467 // If the player's on a team in team possession mode, give the player's point a team.
468468 if ( teampossession && pPlayer->bOnTeam )
469- TEAM_SetScore( pPlayer->Team, TEAM_GetScore( pPlayer->Team ) + 1, true );
469+ TEAM_SetPointCount( pPlayer->Team, TEAM_GetPointCount( pPlayer->Team ) + 1, true );
470470
471471 // Refresh the HUD since there's bound to be changes.
472472 HUD_Refresh( );
473473
474474 // Determine if the pointlimit has been reached.
475475 if (( teampossession ) && ( pPlayer->bOnTeam ))
476- bPointLimitReached = ( pointlimit && ( TEAM_GetScore( pPlayer->Team ) >= pointlimit ));
476+ bPointLimitReached = ( pointlimit && ( TEAM_GetPointCount( pPlayer->Team ) >= pointlimit ));
477477 else
478478 bPointLimitReached = ( pointlimit && ( pPlayer->lPointCount >= pointlimit ));
479479
@@ -639,7 +639,7 @@
639639
640640 // If the player's on a team in team possession mode, give the player's point a team.
641641 if ( teampossession && g_pPossessionArtifactCarrier->bOnTeam )
642- TEAM_SetScore( g_pPossessionArtifactCarrier->Team, TEAM_GetScore( g_pPossessionArtifactCarrier->Team ) + 1, true );
642+ TEAM_SetPointCount( g_pPossessionArtifactCarrier->Team, TEAM_GetPointCount( g_pPossessionArtifactCarrier->Team ) + 1, true );
643643
644644 NETWORK_Printf( "%s\n", GStrings( "TXT_TIMELIMIT" ));
645645 GAME_SetEndLevelDelay( 5 * TICRATE );
@@ -712,7 +712,7 @@
712712
713713 // First, determine if the pointlimit has been reached.
714714 if (( teampossession ) && ( players[ulPlayer].bOnTeam ))
715- bPointLimitReached = ( pointlimit && ( TEAM_GetScore( players[ulPlayer].Team ) >= pointlimit ));
715+ bPointLimitReached = ( pointlimit && ( TEAM_GetPointCount( players[ulPlayer].Team ) >= pointlimit ));
716716 else
717717 bPointLimitReached = ( pointlimit && ( players[ulPlayer].lPointCount >= pointlimit ));
718718
diff -r fd95dad945d2 -r 98cb660c71b2 src/sv_commands.cpp
--- a/src/sv_commands.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/sv_commands.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -2517,7 +2517,7 @@
25172517 break;
25182518
25192519 case TEAMSCORE_POINTS:
2520- lScore = TEAM_GetScore( ulTeam );
2520+ lScore = TEAM_GetPointCount( ulTeam );
25212521 break;
25222522
25232523 case TEAMSCORE_WINS:
diff -r fd95dad945d2 -r 98cb660c71b2 src/sv_main.cpp
--- a/src/sv_main.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/sv_main.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -3110,7 +3110,7 @@
31103110 {
31113111 for ( ULONG i = 0; i < teams.Size( ); i++ )
31123112 {
3113- TEAM_SetScore( i, 0, false );
3113+ TEAM_SetPointCount( i, 0, false );
31143114 TEAM_SetFragCount( i, 0, false );
31153115 TEAM_SetDeathCount( i, 0 );
31163116 TEAM_SetWinCount( i, 0, false );
diff -r fd95dad945d2 -r 98cb660c71b2 src/sv_master.cpp
--- a/src/sv_master.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/sv_master.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -490,7 +490,7 @@
490490 else if ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSEARNWINS )
491491 g_MasterServerBuffer.ByteStream.WriteShort( TEAM_GetWinCount( ulIdx ));
492492 else
493- g_MasterServerBuffer.ByteStream.WriteShort( TEAM_GetScore( ulIdx ));
493+ g_MasterServerBuffer.ByteStream.WriteShort( TEAM_GetPointCount( ulIdx ));
494494 }
495495 }
496496 }
@@ -553,7 +553,7 @@
553553 else if ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSEARNWINS )
554554 g_MasterServerBuffer.ByteStream.WriteShort( TEAM_GetWinCount( ulIdx ));
555555 else
556- g_MasterServerBuffer.ByteStream.WriteShort( TEAM_GetScore( ulIdx ));
556+ g_MasterServerBuffer.ByteStream.WriteShort( TEAM_GetPointCount( ulIdx ));
557557 }
558558 }
559559 }
diff -r fd95dad945d2 -r 98cb660c71b2 src/team.cpp
--- a/src/team.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/team.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -110,7 +110,7 @@
110110 {
111111 for ( ULONG i = 0; i < teams.Size( ); i++ )
112112 {
113- TEAM_SetScore( i, 0, false );
113+ TEAM_SetPointCount( i, 0, false );
114114 TEAM_SetReturnTicks( i, 0 );
115115 TEAM_SetFragCount( i, 0, false );
116116 TEAM_SetDeathCount( i, 0 );
@@ -174,7 +174,7 @@
174174 {
175175 for ( ULONG i = 0; i < teams.Size( ); i++ )
176176 {
177- TEAM_SetScore( i, 0, false );
177+ TEAM_SetPointCount( i, 0, false );
178178 TEAM_SetReturnTicks( i, 0 );
179179 TEAM_SetFragCount( i, 0, false );
180180 TEAM_SetDeathCount( i, 0 );
@@ -427,8 +427,8 @@
427427 }
428428 else
429429 {
430- if ( lLowestScoreCount > TEAM_GetScore( i ))
431- lLowestScoreCount = TEAM_GetScore( i );
430+ if ( lLowestScoreCount > TEAM_GetPointCount( i ))
431+ lLowestScoreCount = TEAM_GetPointCount( i );
432432 }
433433 }
434434
@@ -439,7 +439,7 @@
439439 else if ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSEARNWINS )
440440 lGotScore[i] = TEAM_GetWinCount( i );
441441 else
442- lGotScore[i] = TEAM_GetScore( i );
442+ lGotScore[i] = TEAM_GetPointCount( i );
443443 }
444444
445445 for ( ULONG i = 0; i < teams.Size( ); i++ )
@@ -594,7 +594,7 @@
594594 SERVERCOMMANDS_PrintHUDMessage( szString, 1.5f, TEAM_MESSAGE_Y_AXIS_SUB, 0, 0, HUDMESSAGETYPE_FADEOUT, CR_BLUE, 3.0f, 0.0f, 0.5f, "SmallFont", MAKE_ID( 'S', 'U', 'B', 'S' ) );
595595
596596 // Give his team a point.
597- TEAM_SetScore( pPlayer->Team, TEAM_GetScore( pPlayer->Team ) + ulNumPoints, true );
597+ TEAM_SetPointCount( pPlayer->Team, TEAM_GetPointCount( pPlayer->Team ) + ulNumPoints, true );
598598 PLAYER_SetPoints ( pPlayer, pPlayer->lPointCount + ulNumPoints );
599599
600600 // Take the skull away.
@@ -824,7 +824,7 @@
824824 {
825825 if ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSEARNPOINTS )
826826 {
827- if ( lHighestScore == static_cast<unsigned> (TEAM_GetScore( i )))
827+ if ( lHighestScore == static_cast<unsigned> (TEAM_GetPointCount( i )))
828828 {
829829 ulLeadingTeamsCount++;
830830 lWinner = i;
@@ -1020,26 +1020,26 @@
10201020
10211021 //*****************************************************************************
10221022 //
1023-LONG TEAM_GetScore( ULONG ulTeamIdx )
1023+LONG TEAM_GetPointCount( ULONG ulTeamIdx )
10241024 {
10251025 if ( TEAM_CheckIfValid( ulTeamIdx ))
1026- return ( teams[ulTeamIdx].lScore );
1026+ return ( teams[ulTeamIdx].lPointCount );
10271027 else
10281028 return ( 0 );
10291029 }
10301030
10311031 //*****************************************************************************
10321032 //
1033-void TEAM_SetScore( ULONG ulTeamIdx, LONG lScore, bool bAnnouncer )
1033+void TEAM_SetPointCount( ULONG ulTeamIdx, LONG lPointCount, bool bAnnouncer )
10341034 {
1035- LONG lOldScore;
1035+ LONG lOldPointCount;
10361036
10371037 if ( TEAM_CheckIfValid( ulTeamIdx ) == false )
10381038 return;
10391039
1040- lOldScore = TEAM_GetScore( ulTeamIdx );
1041- teams[ulTeamIdx].lScore = lScore;
1042- if ( bAnnouncer && ( TEAM_GetScore( ulTeamIdx ) > lOldScore ))
1040+ lOldPointCount = TEAM_GetPointCount( ulTeamIdx );
1041+ teams[ulTeamIdx].lPointCount = lPointCount;
1042+ if ( bAnnouncer && ( TEAM_GetPointCount( ulTeamIdx ) > lOldPointCount ))
10431043 {
10441044 // Build the message.
10451045 // Whatever the team's name is, is the first part of the message. For example:
@@ -1066,7 +1066,7 @@
10661066 if ( pointlimit <= 0 || NETWORK_InClientMode() )
10671067 return;
10681068
1069- if ( TEAM_GetScore( ulTeamIdx ) >= (LONG)pointlimit )
1069+ if ( TEAM_GetPointCount( ulTeamIdx ) >= (LONG)pointlimit )
10701070 {
10711071 NETWORK_Printf( "\034%s%s " TEXTCOLOR_NORMAL "has won the game!\n", TEAM_GetTextColorName( ulTeamIdx ), TEAM_GetName( ulTeamIdx ));
10721072
@@ -1596,8 +1596,8 @@
15961596 if ( teamgame == false && TEAM_CountPlayers( i ) < 1 )
15971597 continue;
15981598
1599- if ( lScoreCount < TEAM_GetScore( i ))
1600- lScoreCount = TEAM_GetScore( i );
1599+ if ( lScoreCount < TEAM_GetPointCount( i ))
1600+ lScoreCount = TEAM_GetPointCount( i );
16011601 }
16021602
16031603 return lScoreCount;
@@ -1655,7 +1655,7 @@
16551655 //
16561656 LONG TEAM_GetScoreCountSpread ( ULONG ulTeam )
16571657 {
1658- return TEAM_GetSpread ( ulTeam, &TEAM_GetScore );
1658+ return TEAM_GetSpread ( ulTeam, &TEAM_GetPointCount );
16591659 }
16601660
16611661 //*****************************************************************************
diff -r fd95dad945d2 -r 98cb660c71b2 src/team.h
--- a/src/team.h Sun Feb 13 09:29:03 2022 -0500
+++ b/src/team.h Thu Feb 10 12:24:32 2022 -0500
@@ -111,8 +111,8 @@
111111 LONG TEAM_GetRailgunColor( ULONG ulTeamIdx );
112112 void TEAM_SetRailgunColor( ULONG ulTeamIdx, LONG lColor );
113113
114-LONG TEAM_GetScore( ULONG ulTeamIdx );
115-void TEAM_SetScore( ULONG ulTeamIdx, LONG lScore, bool bAnnouncer );
114+LONG TEAM_GetPointCount( ULONG ulTeamIdx );
115+void TEAM_SetPointCount( ULONG ulTeamIdx, LONG lPointCount, bool bAnnouncer );
116116
117117 const char *TEAM_GetSmallHUDIcon( ULONG ulTeamIdx );
118118 void TEAM_SetSmallHUDIcon( ULONG ulTeamIdx, const char *pszName, bool bFlag );
diff -r fd95dad945d2 -r 98cb660c71b2 src/teaminfo.h
--- a/src/teaminfo.h Sun Feb 13 09:29:03 2022 -0500
+++ b/src/teaminfo.h Thu Feb 10 12:24:32 2022 -0500
@@ -78,7 +78,7 @@
7878 LONG lRailColor;
7979
8080 // Current amount of points this team has.
81- LONG lScore;
81+ LONG lPointCount;
8282
8383 // Icon that appears over a player that posseses this team's "flag".
8484 // statenum_t Icon;
diff -r fd95dad945d2 -r 98cb660c71b2 src/wi_stuff.cpp
--- a/src/wi_stuff.cpp Sun Feb 13 09:29:03 2022 -0500
+++ b/src/wi_stuff.cpp Thu Feb 10 12:24:32 2022 -0500
@@ -396,7 +396,7 @@
396396 if ( players[consoleplayer].bOnTeam == false )
397397 return ( 2 );
398398
399- if ( TEAM_GetScore( players[consoleplayer].Team ) == TEAM_GetHighestScoreCount( ))
399+ if ( TEAM_GetPointCount( players[consoleplayer].Team ) == TEAM_GetHighestScoreCount( ))
400400 return ( 1 );
401401 else
402402 return ( 2 );
@@ -1438,7 +1438,7 @@
14381438 }
14391439 else if (( teamgame || teampossession ) && ( players[consoleplayer].bOnTeam ))
14401440 {
1441- cnt_Frags = TEAM_GetScore( players[consoleplayer].Team );
1441+ cnt_Frags = TEAM_GetPointCount( players[consoleplayer].Team );
14421442 cnt_Deaths = TEAM_GetFragCount( players[consoleplayer].Team );
14431443 cnt_Rank = WI_CalcRank( );
14441444 cnt_NumPlayers = SERVER_CountPlayers( true );
@@ -1489,9 +1489,9 @@
14891489 }
14901490 else if (( teamgame || teampossession ) && ( players[consoleplayer].bOnTeam ))
14911491 {
1492- if ( cnt_Frags >= TEAM_GetScore( players[consoleplayer].Team ))
1492+ if ( cnt_Frags >= TEAM_GetPointCount( players[consoleplayer].Team ))
14931493 {
1494- cnt_Frags = TEAM_GetScore( players[consoleplayer].Team );
1494+ cnt_Frags = TEAM_GetPointCount( players[consoleplayer].Team );
14951495 S_Sound( CHAN_VOICE, "intermission/nextstage", 1, ATTN_NONE );
14961496 cp_state++;
14971497 }
Show on old repository browser