X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=b34e843793311ddfc9a13b9dcd3450daf24409a7;hb=93b95054ba9b14741bc9f6cf44699660b25068db;hp=6609e018dd09e0e4829f5fec88cbc8e034519ea2;hpb=b66a5a64ce256767913d7f5d48b540e7e1faca0f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 6609e018d..b34e84379 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -113,7 +113,7 @@ void CSQC_Init(void)
 	}
 #endif
 	registercvar("hud_usecsqc", "1");
-	registercvar("hud_columns", "default", CVAR_SAVE);
+	registercvar("scoreboard_columns", "default", CVAR_SAVE);
 
 	gametype = 0;
 
@@ -130,8 +130,6 @@ void CSQC_Init(void)
 
 	GetTeam(COLOR_SPECTATOR, true); // add specs first
 
-	cvar_clientsettemp("_supports_weaponpriority", "1");
-
 	RegisterWeapons();
 
 	WaypointSprite_Load();
@@ -342,7 +340,7 @@ void TrueAim_Init();
 void PostInit(void)
 {
 	print(strcat("PostInit\n    maxclients = ", ftos(maxclients), "\n"));
-	localcmd(strcat("\nhud_columns_set ", cvar_string("hud_columns"), ";\n"));
+	localcmd(strcat("\nscoreboard_columns_set ", cvar_string("scoreboard_columns"), ";\n"));
 
 	entity playerchecker;
 	playerchecker = spawn();
@@ -523,8 +521,8 @@ void GameCommand(string msg)
 	{
 		print("Usage: cl_cmd COMMAND..., where possible commands are:\n");
 		print("  settemp cvar value\n");
-		print("  hud_columns_set ...\n");
-		print("  hud_columns_help\n");
+		print("  scoreboard_columns_set ...\n");
+		print("  scoreboard_columns_help\n");
 		GameCommand_Generic("help");
 		return;
 	}
@@ -540,10 +538,10 @@ void GameCommand(string msg)
 	else if(cmd == "settemp") {
 		cvar_clientsettemp(argv(1), argv(2));
 	}
-	else if(cmd == "hud_columns_set") {
+	else if(cmd == "scoreboard_columns_set") {
 		Cmd_HUD_SetFields(argc);
 	}
-	else if(cmd == "hud_columns_help") {
+	else if(cmd == "scoreboard_columns_help") {
 		Cmd_HUD_Help(argc);
 	}
 #ifdef BLURTEST
@@ -638,9 +636,8 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
 	local float bSkipKey;
 	bSkipKey = false;
 
-	if(hud_configure)
-		if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary))
-			return true;
+	if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary))
+		return true;
 
 	if (MapVote_InputEvent(bInputType, nPrimary, nSecondary))
 		return true;
@@ -1246,11 +1243,11 @@ void Net_Notify() {
 
 	if(type == CSQC_KILLNOTIFY)
 	{
-		HUD_KillNotify(ReadString(), ReadString(), ReadString(), ReadByte(), ReadByte());
+		HUD_KillNotify(ReadString(), ReadString(), ReadString(), ReadShort(), ReadByte());
 	}
 	else if(type == CSQC_CENTERPRINT)
 	{
-		HUD_Centerprint(ReadString(), ReadByte());
+		HUD_Centerprint(ReadString(), ReadString(), ReadShort(), ReadByte());
 	}
 }