X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=9aa81be98e0ccf5b555705bfaf10d1761a0a18bd;hb=68eeed9d509bed4b50e81f5995065322e23634fa;hp=0b0faa31084dd773ae2336727e5dd21a5fa833ec;hpb=128c68b3e475d812ab3aa81a1aab0648a7d80505;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 0b0faa310..9aa81be98 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -25,17 +25,17 @@ void cvar_clientsettemp_restore()
 			cvar_set(e.netname, e.message);
 }
 
-void() menu_show_error =
+void menu_show_error()
 {
 	drawstring('0 200 0', _("ERROR - MENU IS VISIBLE BUT NO MENU WAS DEFINED!"), '8 8 0', '1 0 0', 1, 0);
-};
+}
 
 // CSQC_Init : Called every time the CSQC code is initialized (essentially at map load)
 // Useful for precaching things
 
-void() menu_sub_null =
+void menu_sub_null()
 {
-};
+}
 
 #ifdef USE_FTE
 float __engine_check;
@@ -358,7 +358,7 @@ float CSQC_ConsoleCommand(string strMessage)
 	argc = tokenize_console(strMessage);
 
 	// Acquire Command
-	local string strCmd;
+	string strCmd;
 	strCmd = argv(0);
 
 	if(strCmd == "hud_configure") { // config hud
@@ -507,6 +507,13 @@ void GameCommand(string msg)
 	if(cmd == "mv_download") {
 		Cmd_MapVote_MapDownload(argc);
 	}
+	else if(cmd == "hud_panel_radar_maximized")
+	{
+		if(argc == 1)
+			hud_panel_radar_maximized = !hud_panel_radar_maximized;
+		else
+			hud_panel_radar_maximized = (stof(argv(1)) != 0);
+	}
 	else if(cmd == "settemp") {
 		cvar_clientsettemp(argv(1), argv(2));
 	}
@@ -595,7 +602,7 @@ void GameCommand(string msg)
         {
             vote_active = 0; // force the panel to disappear right as we have selected the value (to prevent it from fading out in the normal vote panel pos)
             vote_prev = 0;
-            cvar_set("cl_allow_uid2name", "1");
+            localcmd("setreport cl_allow_uid2name 1\n");
             vote_change = -9999;
 			uid2name_dialog = 0;
         }
@@ -610,7 +617,7 @@ void GameCommand(string msg)
         {
             vote_active = 0;
             vote_prev = 0;
-            cvar_set("cl_allow_uid2name", "0");
+            localcmd("setreport cl_allow_uid2name 0\n");
             vote_change = -9999;
 			uid2name_dialog = 0;
         }
@@ -636,7 +643,7 @@ void GameCommand(string msg)
 // In the case of mouse input, nPrimary is xdelta, nSecondary is ydelta.
 float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
 {
-	local float bSkipKey;
+	float bSkipKey;
 	bSkipKey = false;
 
 	if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary))
@@ -937,7 +944,7 @@ void Ent_ReadAccuracy(void)
 void Ent_RadarLink();
 void Ent_Init();
 void Ent_ScoresInfo();
-void(float bIsNewEntity) CSQC_Ent_Update =
+void CSQC_Ent_Update(float bIsNewEntity)
 {
 	float t;
 	float savetime;
@@ -1007,7 +1014,7 @@ void(float bIsNewEntity) CSQC_Ent_Update =
 	}
 
 	time = savetime;
-};
+}
 // Destructor, but does NOT deallocate the entity by calling remove(). Also
 // used when an entity changes its type. For an entity that someone interacts
 // with others, make sure it can no longer do so.
@@ -1313,20 +1320,6 @@ void Net_ReadPingPLReport()
 	playerslots[e].ping_movementloss = ml / 255.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());
-	}
-}
-
 void Net_WeaponComplain() {
 	complain_weapon = ReadByte();
 
@@ -1345,10 +1338,10 @@ void Net_WeaponComplain() {
 // Return value should be 1 if CSQC handled the temporary entity, otherwise return 0 to have the engine process the event.
 float CSQC_Parse_TempEntity()
 {
-	local float bHandled;
+	float bHandled;
 		bHandled  = true;
 	// Acquire TE ID
-	local float nTEID;
+	float nTEID;
 		nTEID = ReadByte();
 
 		// NOTE: Could just do return instead of break...
@@ -1394,8 +1387,23 @@ float CSQC_Parse_TempEntity()
 			announce_snd = strzone(ReadString());
 			bHandled = true;
 			break;
-		case TE_CSQC_NOTIFY:
-			Net_Notify();
+		case TE_CSQC_KILLNOTIFY:
+			HUD_KillNotify(ReadString(), ReadString(), ReadString(), ReadShort(), ReadByte());
+			bHandled = true;
+			break;
+		case TE_CSQC_KILLCENTERPRINT:
+			HUD_KillCenterprint(ReadString(), ReadString(), ReadShort(), ReadByte());
+			bHandled = true;
+			break;
+		case TE_CSQC_CENTERPRINT_GENERIC:
+			float id;
+			string s;
+			id = ReadByte();
+			s = ReadString();
+			if (id != 0 && s != "")
+				centerprint_generic(id, s, ReadByte(), ReadByte());
+			else
+				centerprint_generic(id, s, 0, 0);
 			bHandled = true;
 			break;
 		case TE_CSQC_WEAPONCOMPLAIN: