Scoreboard fix for Spearhead and Breakthrough

code/cgame/cg_scoreboard.cpp

@@ -54,6 +54,29 @@ int CG_GetScoreBoardDrawHeader()
     return 0;
 }
 
+void CG_PrepScoreBoardInfo()
+{
+	switch (cgs.gametype) {
+	case GT_TEAM_ROUNDS:
+		strcpy(cg.scoresMenuName, "DM_Round_Scoreboard");
+		break;
+    case GT_OBJECTIVE:
+        strcpy(cg.scoresMenuName, "Obj_Scoreboard");
+		break;
+	case GT_TOW:
+		strcpy(cg.scoresMenuName, "Tow_Scoreboard");
+		break;
+	case GT_LIBERATION:
+		strcpy(cg.scoresMenuName, "Lib_Scoreboard");
+		break;
+    default:
+        strcpy(cg.scoresMenuName, "DM_Scoreboard");
+        break;
+    }
+}
+
+#if TARGET_GAME_PROTOCOL >= 15
+
 const char* CG_GetColumnName(int iColumnNum, int* iColumnWidth)
 {
 	int iReturnWidth;
@@ -61,25 +84,29 @@ const char* CG_GetColumnName(int iColumnNum, int* iColumnWidth)
 
 	switch (iColumnNum) {
 	case 0:
+		iReturnWidth = 24;
+		pszReturnString = "#";
+		break;
+	case 1:
 		iReturnWidth = 128;
 		pszReturnString = "Name";
 		break;
-    case 1:
+	case 2:
 		iReturnWidth = 64;
 		pszReturnString = "Kills";
 		break;
-    case 2:
+	case 3:
 		iReturnWidth = 64;
 		pszReturnString = "Deaths";
 		if (cgs.gametype > GT_TEAM) {
 			pszReturnString = "Total";
 		}
 		break;
-    case 3:
+	case 4:
 		iReturnWidth = 64;
 		pszReturnString = "Time";
 		break;
-    case 4:
+	case 5:
 		iReturnWidth = 64;
 		pszReturnString = "Ping";
 		break;
@@ -96,21 +123,6 @@ const char* CG_GetColumnName(int iColumnNum, int* iColumnWidth)
 	return pszReturnString;
 }
 
-void CG_PrepScoreBoardInfo()
-{
-    switch (cgs.gametype) {
-    case GT_OBJECTIVE:
-        strcpy(cg.scoresMenuName, "Obj_Scoreboard");
-        break;
-    case GT_TEAM_ROUNDS:
-        strcpy(cg.scoresMenuName, "DM_Round_Scoreboard");
-        break;
-    default:
-        strcpy(cg.scoresMenuName, "DM_Scoreboard");
-        break;
-    }
-}
-
 void CG_ParseScores()
 {
 	int i;
@@ -118,13 +130,14 @@ void CG_ParseScores()
 	int iClientTeam, iClientNum;
 	int iDatumCount;
 	int iMatchTeam;
+	int iCurrentEntry;
 	qboolean bIsDead, bIsHeader;
 	char szString2[MAX_STRING_TOKENS];
 	char szString3[MAX_STRING_TOKENS];
 	char szString4[MAX_STRING_TOKENS];
 	char szString5[MAX_STRING_TOKENS];
 	char szString6[MAX_STRING_TOKENS];
-    const char* pszClientInfo;
+	char szString7[MAX_STRING_TOKENS];
 	float vSameTeamTextColor[4];
 	float vSameTeamBackColor[4];
 	float vOtherTeamTextColor[4];
@@ -187,6 +200,7 @@ void CG_ParseScores()
 
 	vThisClientBackColor[3] = 0.8f;
 
+	iCurrentEntry = 1;
 	if (cgs.gametype > GT_FFA)
 	{
 		iDatumCount = 6;
@@ -208,18 +222,38 @@ void CG_ParseScores()
 		iDatumCount = 5;
 	}
 
-    iEntryCount = atoi(cgi.Argv(1));
+	iEntryCount = atoi(cgi.Argv(iCurrentEntry++));
 	if (iEntryCount > MAX_CLIENTS) {
 		iEntryCount = MAX_CLIENTS;
 	}
 
+	if (cgs.gametype == GT_TOW)
+	{
+		cgi.Cvar_Set("tow_allied_obj1", va("%i", cgi.Argv(iCurrentEntry++)));
+		cgi.Cvar_Set("tow_allied_obj2", va("%i", cgi.Argv(iCurrentEntry++)));
+		cgi.Cvar_Set("tow_allied_obj3", va("%i", cgi.Argv(iCurrentEntry++)));
+		cgi.Cvar_Set("tow_allied_obj4", va("%i", cgi.Argv(iCurrentEntry++)));
+		cgi.Cvar_Set("tow_allied_obj5", va("%i", cgi.Argv(iCurrentEntry++)));
+		cgi.Cvar_Set("tow_axis_obj1", va("%i", cgi.Argv(iCurrentEntry++)));
+		cgi.Cvar_Set("tow_axis_obj2", va("%i", cgi.Argv(iCurrentEntry++)));
+		cgi.Cvar_Set("tow_axis_obj3", va("%i", cgi.Argv(iCurrentEntry++)));
+		cgi.Cvar_Set("tow_axis_obj4", va("%i", cgi.Argv(iCurrentEntry++)));
+		cgi.Cvar_Set("tow_axis_obj5", va("%i", cgi.Argv(iCurrentEntry++)));
+	}
+
+	if (cgs.gametype == GT_LIBERATION)
+	{
+		cgi.Cvar_Set("scoreboard_toggle1", va("%i", cgi.Argv(iCurrentEntry++)));
+		cgi.Cvar_Set("scoreboard_toggle2", va("%i", cgi.Argv(iCurrentEntry++)));
+	}
+
 	for (i = 0; i < iEntryCount; ++i)
 	{
 		bIsHeader = qfalse;
 		if (cgs.gametype > GT_FFA)
 		{
-            iClientNum = atoi(cgi.Argv(2 + iDatumCount * i));
+			iClientNum = atoi(cgi.Argv(iCurrentEntry + iDatumCount * i));
-            iClientTeam = atoi(cgi.Argv(3 + iDatumCount * i));
+			iClientTeam = atoi(cgi.Argv(1 + iCurrentEntry + iDatumCount * i));
 			if (iClientTeam >= 0) {
 				bIsDead = qfalse;
 			}
@@ -230,24 +264,39 @@ void CG_ParseScores()
 
 			if (iClientNum == -1)
 			{
+				szString2[0] = 0;
 				bIsHeader = qtrue;
 
 				switch (iClientTeam)
 				{
 				case 1:
-                    strcpy(szString2, "Spectators");
+					strcpy(szString3, cgi.LV_ConvertString("Spectators"));
 					break;
 				case 2:
-                    strcpy(szString2, "Free-For-Allers");
+					strcpy(szString3, cgi.LV_ConvertString("Free-For-Allers"));
 					break;
 				case 3:
-                    strcpy(szString2, "Allies");
+                    sprintf(
+                        szString3,
+                        "%s - %d %s",
+						cgi.LV_ConvertString("Allies"),
+						atoi(cgi.Argv(2 + iCurrentEntry + iDatumCount * i)),
+                        cgi.LV_ConvertString("Players")
+                    );
+                    iCurrentEntry++;
 					break;
 				case 4:
-                    strcpy(szString2, "Axis");
+					sprintf(
+                        szString3,
+                        "%s - %d %s",
+						cgi.LV_ConvertString("Axis"),
+						atoi(cgi.Argv(2 + iCurrentEntry + iDatumCount * i)),
+                        cgi.LV_ConvertString("Players")
+					);
+					iCurrentEntry++;
 					break;
 				default:
-                    strcpy(szString2, "No Team");
+					strcpy(szString3, cgi.LV_ConvertString("No Team"));
 					break;
 				}
 			}
@@ -255,17 +304,24 @@ void CG_ParseScores()
 			{
 				// spectating
 				szString2[0] = 0;
+				szString3[0] = 0;
 			}
 			else
 			{
-                pszClientInfo = CG_ConfigString(CS_PLAYERS + iClientNum);
+				strcpy(szString2, va("%i", iClientNum));
-                strcpy(szString2, Info_ValueForKey(pszClientInfo, "name"));
+				strcpy(szString3, cg.clientinfo[iClientNum].name);
 			}
 
-            strcpy(szString3, cgi.Argv(4 + iDatumCount * i));
+			strcpy(szString4, cgi.Argv(2 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString4, cgi.Argv(5 + iDatumCount * i));
+			strcpy(szString5, cgi.Argv(3 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString5, cgi.Argv(6 + iDatumCount * i));
+			strcpy(szString6, cgi.Argv(4 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString6, cgi.Argv(7 + iDatumCount * i));
+			strcpy(szString7, cgi.Argv(5 + iCurrentEntry + iDatumCount * i));
+
+			if (cgs.gametype >= GT_TEAM_ROUNDS && iClientNum == -1 && iClientTeam == TEAM_ALLIES || iClientTeam == TEAM_AXIS)
+			{
+				strcat(szString4, va(" %s", cgi.LV_ConvertString("Wins")));
+				szString5[0] = 0;
+			}
 
 			if (iClientNum == cg.snap->ps.clientNum)
 			{
@@ -302,26 +358,325 @@ void CG_ParseScores()
 		}
 		else
 		{
-            iClientNum = atoi(cgi.Argv(2 + iDatumCount * i));
+			iClientNum = atoi(cgi.Argv(iDatumCount * i));
 			if (iClientNum >= 0)
 			{
-                pszClientInfo = CG_ConfigString(CS_PLAYERS + iClientNum);
+                strcpy(szString2, va("%i", iClientNum));
-                strcpy(szString2, Info_ValueForKey(pszClientInfo, "name"));
+				strcpy(szString3, cg.clientinfo[iClientNum].name);
-                strcpy(szString3, cgi.Argv(3 + iDatumCount * i));
+				strcpy(szString4, cgi.Argv(1 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString4, cgi.Argv(4 + iDatumCount * i));
+				strcpy(szString5, cgi.Argv(2 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString5, cgi.Argv(5 + iDatumCount * i));
+				strcpy(szString6, cgi.Argv(3 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString6, cgi.Argv(6 + iDatumCount * i));
+				strcpy(szString7, cgi.Argv(4 + iCurrentEntry + iDatumCount * i));
+			}
+			else
+			{
+				szString2[0] = 0;
+				if (iClientNum == -3)
+				{
+					strcpy(szString2, cgi.LV_ConvertString("Players"));
+					bIsHeader = qtrue;
+				}
+				else if (iClientNum == -2)
+				{
+					strcpy(szString2, cgi.LV_ConvertString("Spectators"));
+					bIsHeader = qtrue;
+				}
+				else
+				{
+					// unknown
+					szString3[0] = 0;
+				}
+				szString4[0] = 0;
+				szString5[0] = 0;
+				szString6[0] = 0;
+				szString7[0] = 0;
+			}
+
+			if (iClientNum == cg.snap->ps.clientNum)
+			{
+				pItemTextColor = vThisClientTextColor;
+				pItemBackColor = vThisClientBackColor;
+			}
+			else
+			{
+				pItemTextColor = vNoTeamTextColor;
+				pItemBackColor = vNoTeamBackColor;
+			}
+		}
+
+		cgi.UI_SetScoreBoardItem(
+			i,
+			szString2,
+			szString3,
+			szString4,
+			szString5,
+			szString6,
+			szString7,
+			NULL,
+			NULL,
+			pItemTextColor,
+			pItemBackColor,
+			bIsHeader
+		);
+	}
+
+	cgi.UI_DeleteScoreBoardItems(iEntryCount);
+}
+
+#else
+
+const char* CG_GetColumnName(int iColumnNum, int* iColumnWidth)
+{
+	int iReturnWidth;
+	const char* pszReturnString;
+
+	switch (iColumnNum) {
+	case 0:
+		iReturnWidth = 128;
+		pszReturnString = "Name";
+		break;
+	case 1:
+		iReturnWidth = 64;
+		pszReturnString = "Kills";
+		break;
+	case 2:
+		iReturnWidth = 64;
+		pszReturnString = "Deaths";
+		if (cgs.gametype > GT_TEAM) {
+			pszReturnString = "Total";
+		}
+		break;
+	case 3:
+		iReturnWidth = 64;
+		pszReturnString = "Time";
+		break;
+	case 4:
+		iReturnWidth = 64;
+		pszReturnString = "Ping";
+		break;
+	default:
+		iReturnWidth = 0;
+		pszReturnString = 0;
+		break;
+	}
+
+	if (iColumnWidth) {
+		*iColumnWidth = iReturnWidth;
+	}
+
+	return pszReturnString;
+}
+
+void CG_ParseScores()
+{
+    int i;
+    int iEntryCount;
+    int iClientTeam, iClientNum;
+    int iDatumCount;
+    int iMatchTeam;
+    int iCurrentEntry;
+    qboolean bIsDead, bIsHeader;
+    char szString2[MAX_STRING_TOKENS];
+    char szString3[MAX_STRING_TOKENS];
+    char szString4[MAX_STRING_TOKENS];
+    char szString5[MAX_STRING_TOKENS];
+    char szString6[MAX_STRING_TOKENS];
+    float vSameTeamTextColor[4];
+    float vSameTeamBackColor[4];
+    float vOtherTeamTextColor[4];
+    float vOtherTeamBackColor[4];
+    float vNoTeamTextColor[4];
+    float vNoTeamBackColor[4];
+    float vThisClientTextColor[4];
+    float vThisClientBackColor[4];
+    float vDeadTextColorDead[4];
+    float* pItemTextColor;
+    float* pItemBackColor;
+
+    iMatchTeam = -1;
+    vSameTeamTextColor[0] = 1.0f;
+    vSameTeamTextColor[1] = 1.0f;
+    vSameTeamTextColor[2] = 1.0f;
+    vSameTeamTextColor[3] = 1.0f;
+    vSameTeamBackColor[0] = 0.1f;
+    vSameTeamBackColor[1] = 0.5f;
+    vSameTeamBackColor[2] = 0.1f;
+    vSameTeamBackColor[3] = 0.4f;
+    vOtherTeamTextColor[0] = 1.0f;
+    vOtherTeamTextColor[1] = 1.0f;
+    vOtherTeamTextColor[2] = 1.0f;
+    vOtherTeamTextColor[3] = 1.0f;
+    vOtherTeamBackColor[0] = 0.5f;
+    vOtherTeamBackColor[1] = 0.1f;
+    vOtherTeamBackColor[2] = 0.1f;
+    vOtherTeamBackColor[3] = 0.4f;
+    vNoTeamTextColor[0] = 1.0f;
+    vNoTeamTextColor[1] = 1.0f;
+    vNoTeamTextColor[2] = 1.0f;
+    vNoTeamTextColor[3] = 1.0f;
+    vNoTeamBackColor[0] = 0.1f;
+    vNoTeamBackColor[1] = 0.1f;
+    vNoTeamBackColor[2] = 0.1f;
+    vNoTeamBackColor[3] = 0.4f;
+    vDeadTextColorDead[0] = 1.0f;
+    vDeadTextColorDead[1] = 0.1f;
+    vDeadTextColorDead[2] = 0.1f;
+    vDeadTextColorDead[3] = 1.0f;
+
+    vThisClientTextColor[0] = 0.0f;
+    vThisClientTextColor[1] = 0.0f;
+    vThisClientTextColor[2] = 0.0f;
+    vThisClientTextColor[3] = 1.0f;
+
+    if (cgs.gametype > GT_FFA)
+    {
+        vThisClientBackColor[0] = 0.5f;
+        vThisClientBackColor[1] = 0.75f;
+        vThisClientBackColor[2] = 0.5f;
+    }
+    else
+    {
+        vThisClientBackColor[0] = 0.75f;
+        vThisClientBackColor[1] = 0.75f;
+        vThisClientBackColor[2] = 0.75f;
+    }
+
+    vThisClientBackColor[3] = 0.8f;
+
+    iCurrentEntry = 1;
+    if (cgs.gametype > GT_FFA)
+    {
+        iDatumCount = 6;
+        iMatchTeam = cg.snap->ps.stats[STAT_TEAM];
+        if (iMatchTeam != TEAM_ALLIES && iMatchTeam != TEAM_AXIS)
+        {
+            iMatchTeam = TEAM_ALLIES;
+            vThisClientTextColor[0] = 0.0f;
+            vThisClientTextColor[1] = 0.0f;
+            vThisClientTextColor[2] = 0.0f;
+            vThisClientBackColor[0] = 0.75f;
+            vThisClientBackColor[1] = 0.75f;
+            vThisClientBackColor[2] = 0.75f;
+        }
+    }
+    else
+    {
+        // free-for-all
+        iDatumCount = 5;
+    }
+
+    iEntryCount = atoi(cgi.Argv(iCurrentEntry++));
+    if (iEntryCount > MAX_CLIENTS) {
+        iEntryCount = MAX_CLIENTS;
+    }
+
+    for (i = 0; i < iEntryCount; ++i)
+    {
+        bIsHeader = qfalse;
+        if (cgs.gametype > GT_FFA)
+        {
+            iClientNum = atoi(cgi.Argv(iCurrentEntry + iDatumCount * i));
+            iClientTeam = atoi(cgi.Argv(1 + iCurrentEntry + iDatumCount * i));
+            if (iClientTeam >= 0) {
+                bIsDead = qfalse;
+            }
+            else {
+                bIsDead = qtrue;
+                iClientTeam = -iClientTeam;
+            }
+
+            if (iClientNum == -1)
+            {
+                bIsHeader = qtrue;
+
+                switch (iClientTeam)
+                {
+                case 1:
+                    strcpy(szString2, cgi.LV_ConvertString("Spectators"));
+                    break;
+                case 2:
+                    strcpy(szString2, cgi.LV_ConvertString("Free-For-Allers"));
+                    break;
+                case 3:
+                    strcpy(szString2, cgi.LV_ConvertString("Allies"));
+                    break;
+                case 4:
+                    strcpy(szString2, cgi.LV_ConvertString("Axis"));
+                    break;
+                default:
+                    strcpy(szString2, cgi.LV_ConvertString("No Team"));
+                    break;
+                }
+            }
+            else if (iClientNum == -2)
+            {
+                // spectating
+                szString2[0] = 0;
+            }
+            else
+			{
+                strcpy(szString2, cg.clientinfo[iClientNum].name);
+            }
+
+            strcpy(szString3, cgi.Argv(2 + iCurrentEntry + iDatumCount * i));
+            strcpy(szString4, cgi.Argv(3 + iCurrentEntry + iDatumCount * i));
+            strcpy(szString5, cgi.Argv(4 + iCurrentEntry + iDatumCount * i));
+            strcpy(szString6, cgi.Argv(5 + iCurrentEntry + iDatumCount * i));
+
+            if (iClientNum == cg.snap->ps.clientNum)
+            {
+                pItemTextColor = vThisClientTextColor;
+                pItemBackColor = vThisClientBackColor;
+            }
+            else if (iClientNum == -2)
+            {
+                pItemTextColor = vNoTeamTextColor;
+                pItemBackColor = vNoTeamBackColor;
+            }
+            else if (iClientTeam == TEAM_ALLIES || iClientTeam == TEAM_AXIS)
+            {
+                if (iClientTeam == iMatchTeam)
+                {
+                    pItemTextColor = vSameTeamTextColor;
+                    pItemBackColor = vSameTeamBackColor;
+                }
+                else
+                {
+                    pItemTextColor = vOtherTeamTextColor;
+                    pItemBackColor = vOtherTeamBackColor;
+                }
+            }
+            else
+            {
+                pItemTextColor = vNoTeamTextColor;
+                pItemBackColor = vNoTeamBackColor;
+            }
+
+            if (bIsDead) {
+                pItemTextColor = vDeadTextColorDead;
+            }
+        }
+        else
+        {
+            iClientNum = atoi(cgi.Argv(iCurrentEntry + iDatumCount * i));
+            if (iClientNum >= 0)
+            {
+                strcpy(szString2, cg.clientinfo[iClientNum].name);
+                strcpy(szString3, cgi.Argv(1 + iCurrentEntry + iDatumCount * i));
+                strcpy(szString4, cgi.Argv(2 + iCurrentEntry + iDatumCount * i));
+                strcpy(szString5, cgi.Argv(3 + iCurrentEntry + iDatumCount * i));
+                strcpy(szString6, cgi.Argv(4 + iCurrentEntry + iDatumCount * i));
             }
             else
             {
                 if (iClientNum == -3)
                 {
-                    strcpy(szString2, "Players");
+                    strcpy(szString2, cgi.LV_ConvertString("Players"));
                     bIsHeader = qtrue;
                 }
                 else if (iClientNum == -2)
                 {
-                    strcpy(szString2, "Spectators");
+                    strcpy(szString2, cgi.LV_ConvertString("Spectators"));
                     bIsHeader = qtrue;
                 }
                 else
@@ -365,3 +720,4 @@ void CG_ParseScores()
 
     cgi.UI_DeleteScoreBoardItems(iEntryCount);
 }
+#endif