X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fhud_config.qc;h=56a79364d49bbef3142efd7021ce3ea634885463;hb=a4bcbda7a1eb2367fae1c2514d474d426803a673;hp=07166105e5f6f043d99d65ccb57e95da60275e35;hpb=9a502b2b9be023833212363c9ce74a3471d4b9dc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/hud_config.qc b/qcsrc/client/hud/hud_config.qc
index 07166105e..56a79364d 100644
--- a/qcsrc/client/hud/hud_config.qc
+++ b/qcsrc/client/hud/hud_config.qc
@@ -60,7 +60,6 @@ void HUD_Panel_ExportCfg(string cfgname)
 		{
 			panel = hud_panels_from(i);
 
-			HUD_Write_PanelCvar("");
 			HUD_Write_PanelCvar("_pos");
 			HUD_Write_PanelCvar("_size");
 			HUD_Write_PanelCvar("_bg");
@@ -120,6 +119,7 @@ void HUD_Panel_ExportCfg(string cfgname)
 					HUD_Write_PanelCvar("_progressbar_armor");
 					HUD_Write_PanelCvar("_progressbar_gfx");
 					HUD_Write_PanelCvar("_progressbar_gfx_smooth");
+					HUD_Write_PanelCvar("_combined");
 					HUD_Write_PanelCvar("_text");
 					break;
 				case HUD_PANEL_NOTIFY:
@@ -642,7 +642,7 @@ void HUD_Panel_FirstInDrawQ(float id);
 void reset_tab_panels()
 {
 	for (int i = 0; i < hud_panels_COUNT; ++i)
-		tab_panels[i] = world;
+		tab_panels[i] = NULL;
 }
 float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
 {
@@ -671,10 +671,8 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
 	}
 
 	// allow console bind to work
-	string con_keys;
-	float keys;
-	con_keys = findkeysforcommand("toggleconsole", 0);
-	keys = tokenize(con_keys); // findkeysforcommand returns data for this
+	string con_keys = findkeysforcommand("toggleconsole", 0);
+	int keys = tokenize(con_keys); // findkeysforcommand returns data for this
 
 	bool hit_con_bind = false;
 	int i;
@@ -706,7 +704,7 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
 				highlightedAction = 0;
 				HUD_Panel_FirstInDrawQ(highlightedPanel.panel_id);
 			}
-			tab_panel = world;
+			tab_panel = NULL;
 			reset_tab_panels();
 		}
 	}
@@ -778,7 +776,7 @@ LABEL(find_tab_panel)
 		level = floor(tab_panel_pos.y / level_height) * level_height; //starting level
 		candidate_pos.x = (!tab_backward) ? vid_conwidth : 0;
 		start_posX = tab_panel_pos.x;
-		tab_panel = world;
+		tab_panel = NULL;
 		k=0;
 		while(++k)
 		{
@@ -805,11 +803,11 @@ LABEL(find_tab_panel)
 				reset_tab_panels();
 				if (!old_tab_panel)
 				{
-					tab_panel = world;
+					tab_panel = NULL;
 					return true;
 				}
 				starting_panel = old_tab_panel;
-				old_tab_panel = world;
+				old_tab_panel = NULL;
 				goto find_tab_panel; //u must find tab_panel!
 			}
 			if (!tab_backward)
@@ -890,7 +888,7 @@ LABEL(find_tab_panel)
 			cvar_set(strcat("hud_panel_", highlightedPanel_backup.panel_name, "_pos"), s);
 			s = strcat(ftos(panel_size_backup.x/vid_conwidth), " ", ftos(panel_size_backup.y/vid_conheight));
 			cvar_set(strcat("hud_panel_", highlightedPanel_backup.panel_name, "_size"), s);
-			highlightedPanel_backup = world;
+			highlightedPanel_backup = NULL;
 		}
 	}
 	else if(nPrimary == 's' && hudShiftState & S_CTRL) // save config
@@ -1078,7 +1076,7 @@ void HUD_Panel_Highlight(float allow_move)
 			return;
 		}
 	}
-	highlightedPanel = world;
+	highlightedPanel = NULL;
 	highlightedAction = 0;
 }
 
@@ -1108,7 +1106,7 @@ void HUD_Panel_Mouse()
 			if (tab_panel)
 			{
 				//stop ctrl-tab selection
-				tab_panel = world;
+				tab_panel = NULL;
 				reset_tab_panels();
 			}
 			HUD_Panel_Highlight(mouseClicked & S_MOUSE1); // sets highlightedPanel, highlightedAction, panel_click_distance, panel_click_resizeorigin
@@ -1262,6 +1260,7 @@ void HUD_Configure_Frame()
 			menu_enabled = 0;
 		if(autocvar_hud_cursormode)
 			setcursormode(0);
+		hud_dynamic_shake_factor = -1;
 	}
 }