From: terencehill <piuntn@gmail.com>
Date: Thu, 4 Aug 2016 13:27:00 +0000 (+0200)
Subject: More namespace fixing
X-Git-Tag: xonotic-v0.8.2~716^2~29
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ee7c610671151d87500ad2a8be0d57b68e2b69f7;p=xonotic%2Fxonotic-data.pk3dir.git

More namespace fixing
---

diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc
index 100bebf5f..9b8f58f94 100644
--- a/qcsrc/client/commands/cl_cmd.qc
+++ b/qcsrc/client/commands/cl_cmd.qc
@@ -307,13 +307,13 @@ void LocalCommand_hud(int request, int argc)
 
 				case "scoreboard_columns_set":
 				{
-					Cmd_HUD_SetFields(argc);
+					Cmd_Scoreboard_SetFields(argc);
 					return;
 				}
 
 				case "scoreboard_columns_help":
 				{
-					Cmd_HUD_Help();
+					Cmd_Scoreboard_Help();
 					return;
 				}
 
diff --git a/qcsrc/client/commands/cl_cmd.qh b/qcsrc/client/commands/cl_cmd.qh
index 65a723389..f1be4315f 100644
--- a/qcsrc/client/commands/cl_cmd.qh
+++ b/qcsrc/client/commands/cl_cmd.qh
@@ -1,7 +1,7 @@
 #pragma once
 
-void Cmd_HUD_SetFields(int);
-void Cmd_HUD_Help();
+void Cmd_Scoreboard_SetFields(int);
+void Cmd_Scoreboard_Help();
 
 // used by common/command/generic.qc:GenericCommand_dumpcommands to list all commands into a .txt file
 void LocalCommand_macro_write_aliases(int fh);
diff --git a/qcsrc/client/hud/panel/score.qc b/qcsrc/client/hud/panel/score.qc
index c7128b1eb..5f1a525fd 100644
--- a/qcsrc/client/hud/panel/score.qc
+++ b/qcsrc/client/hud/panel/score.qc
@@ -6,7 +6,7 @@
 
 // Score (#7)
 
-void HUD_UpdatePlayerTeams();
+void Scoreboard_UpdatePlayerTeams();
 void HUD_Score_Rankings(vector pos, vector mySize, entity me)
 {
 	float score;
@@ -71,8 +71,8 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me)
 		return;
 	}
 
-	if (!scoreboard_fade_alpha) // the scoreboard too calls HUD_UpdatePlayerTeams
-		HUD_UpdatePlayerTeams();
+	if (!scoreboard_fade_alpha) // the scoreboard too calls Scoreboard_UpdatePlayerTeams
+		Scoreboard_UpdatePlayerTeams();
 	if (team_count)
 	{
 		// show team scores in the first line
diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index 2679fa2cd..4ca9843c8 100644
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -98,12 +98,12 @@ void HUD_InitScores()
 	if(ts_secondary == -1)
 		ts_secondary = ts_primary;
 
-	Cmd_HUD_SetFields(0);
+	Cmd_Scoreboard_SetFields(0);
 }
 
 float SetTeam(entity pl, float Team);
 //float lastpnum;
-void HUD_UpdatePlayerTeams()
+void Scoreboard_UpdatePlayerTeams()
 {
 	float Team;
 	entity pl, tmp;
@@ -251,7 +251,7 @@ void HUD_UpdateTeamPos(entity Team)
 	}
 }
 
-void Cmd_HUD_Help()
+void Cmd_Scoreboard_Help()
 {
 	LOG_INFO(_("You can modify the scoreboard using the ^2scoreboard_columns_set command.\n"));
 	LOG_INFO(_("^3|---------------------------------------------------------------|\n"));
@@ -327,7 +327,7 @@ void Cmd_HUD_Help()
 " +ka/pickups +ka/bckills +ka/bctime +ft/revivals" \
 " -lms,rc,cts,inv,nb/score"
 
-void Cmd_HUD_SetFields(int argc)
+void Cmd_Scoreboard_SetFields(int argc)
 {
     TC(int, argc);
 	int i, j, slash;
@@ -1302,7 +1302,7 @@ void HUD_DrawScoreboard()
 	if(!autocvar__hud_configure)
 		panel_pos.y = max((autocvar_con_notify * autocvar_con_notifysize), panel_pos.y);
 
-	HUD_UpdatePlayerTeams();
+	Scoreboard_UpdatePlayerTeams();
 
 	vector pos, tmp;
 	entity pl, tm;
diff --git a/qcsrc/client/hud/panel/scoreboard.qh b/qcsrc/client/hud/panel/scoreboard.qh
index c2d928f5e..d65c44823 100644
--- a/qcsrc/client/hud/panel/scoreboard.qh
+++ b/qcsrc/client/hud/panel/scoreboard.qh
@@ -4,7 +4,7 @@
 float scoreboard_active;
 float scoreboard_fade_alpha;
 
-void Cmd_HUD_SetFields(float argc);
+void Cmd_Scoreboard_SetFields(float argc);
 void HUD_DrawScoreboard();
 void HUD_InitScores();
 void HUD_UpdatePlayerPos(entity pl);
diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 2ca67871c..02aa2490b 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -137,7 +137,7 @@ void CSQC_Init()
 	for(int i = 0; i < MAX_SBT_FIELDS; ++i)
 		sbt_field_title[i] = strzone("(null)");
 
-	Cmd_HUD_SetFields(0);
+	Cmd_Scoreboard_SetFields(0);
 
 	postinit = false;
 
@@ -323,7 +323,7 @@ void Playerchecker_Think(entity this)
 				e.ping_movementloss = 0;
 				//e.gotscores = 0; // we might already have the scores...
 				int t = entcs_GetScoreTeam(i);
-				if (t) SetTeam(e, t); // will not hurt; later updates come with HUD_UpdatePlayerTeams
+				if (t) SetTeam(e, t); // will not hurt; later updates come with Scoreboard_UpdatePlayerTeams
 				RegisterPlayer(e);
 				HUD_UpdatePlayerPos(e);
 			}