X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fclient%2FMain.qc;h=b34e843793311ddfc9a13b9dcd3450daf24409a7;hb=b6edb16e59f054767c597542f15df85360e5e544;hp=de74def1816f6f319e2f98f144c03b52280845ad;hpb=b1a6464ea70a32dc63e3970d6c5f34a1b2fc7c2c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index de74def18..b34e84379 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -94,6 +94,7 @@ void CSQC_Init(void)
 	registercmd("-button3");
 	registercmd("+button4");
 	registercmd("-button4");
+	registercmd("+showscores");registercmd("-showscores");
 	registercmd("+showaccuracy");registercmd("-showaccuracy");
 
 #ifndef CAMERATEST
@@ -112,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;
 
@@ -129,8 +130,6 @@ void CSQC_Init(void)
 
 	GetTeam(COLOR_SPECTATOR, true); // add specs first
 
-	cvar_clientsettemp("_supports_weaponpriority", "1");
-
 	RegisterWeapons();
 
 	WaypointSprite_Load();
@@ -341,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();
@@ -405,16 +404,16 @@ float CSQC_ConsoleCommand(string strMessage)
 		button_attack2 = 0;
 		return false;
 	} else if(strCmd == "+showscores") {
-		sb_showscores = true;
+		scoreboard_showscores = true;
 		return true;
 	} else if(strCmd == "-showscores") {
-		sb_showscores = false;
+		scoreboard_showscores = false;
 		return true;
 	} else if(strCmd == "+showaccuracy") {
-		sb_showaccuracy = true;
+		scoreboard_showaccuracy = true;
 		return true;
 	} else if(strCmd == "-showaccuracy") {
-		sb_showaccuracy = false;
+		scoreboard_showaccuracy = false;
 		return true;
 	}
 
@@ -522,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;
 	}
@@ -539,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
@@ -632,15 +631,13 @@ void GameCommand(string msg)
 // bInputType = 0 is key pressed, 1 is key released, 2 is mouse input.
 // In the case of keyboard input, nPrimary is the ascii code, and nSecondary is 0.
 // In the case of mouse input, nPrimary is xdelta, nSecondary is ydelta.
-float hudconf_active;
 float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
 {
 	local float bSkipKey;
 	bSkipKey = false;
 
-	if(hudconf_active)
-		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;
@@ -783,7 +780,7 @@ void Ent_ClientData()
 
 	f = ReadByte();
 
-	sb_showscores_force = (f & 1);
+	scoreboard_showscores_force = (f & 1);
 
 	if(f & 2)
 	{
@@ -963,9 +960,6 @@ void Gamemode_Init()
 		precache_pic("gfx/ons-cp-blue.tga");
 		precache_pic("gfx/ons-frame.tga");
 		precache_pic("gfx/ons-frame-team.tga");
-	} else if(gametype == GAME_KEYHUNT) {
-		precache_pic("gfx/sb_key_carrying");
-		precache_pic("gfx/sb_key_carrying_outline");
 	}
 
 	if not(isdemo())
@@ -1243,6 +1237,20 @@ void Net_VoteDialogReset() {
 	vote_active = 0;
 }
 
+void Net_Notify() {
+	float type;
+	type = ReadByte();
+
+	if(type == CSQC_KILLNOTIFY)
+	{
+		HUD_KillNotify(ReadString(), ReadString(), ReadString(), ReadShort(), ReadByte());
+	}
+	else if(type == CSQC_CENTERPRINT)
+	{
+		HUD_Centerprint(ReadString(), ReadString(), ReadShort(), ReadByte());
+	}
+}
+
 // CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer.
 // You must ALWAYS first acquire the temporary ID, which is sent as a byte.
 // Return value should be 1 if CSQC handled the temporary entity, otherwise return 0 to have the engine process the event.
@@ -1309,6 +1317,10 @@ float CSQC_Parse_TempEntity()
 			announce_snd = strzone(ReadString());
 			bHandled = true;
 			break;
+		case TE_CSQC_NOTIFY:
+			Net_Notify();
+			bHandled = true;
+			break;
 		default:
 			// No special logic for this temporary entity; return 0 so the engine can handle it
 			bHandled = false;