X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_playersetup.c;h=751c5559180c592e5ac2b350dea2ad1b00afb0d6;hb=73aacea5ecd160c845d8fdc15cacf443eddc79ca;hp=2cfb27262445168c557281580ae10e7bc92d08cf;hpb=b23a94cbbcf014fdecbce2cc0a02f50e1bae5efe;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index 2cfb27262..751c55591 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -23,15 +23,15 @@ entity makeXonoticPlayerSettingsTab()
 	me.configureDialog(me);
 	return me;
 }
-void drawXonoticPlayerSettingsTab(entity me)
+void XonoticPlayerSettingsTab_draw(entity me)
 {
 	if(cvar_string("_cl_name") == "Player")
 		me.playerNameLabel.alpha = ((mod(time * 2, 2) < 1) ? 1 : 0);
 	else
 		me.playerNameLabel.alpha = me.playerNameLabelAlpha;
-	drawContainer(me);
+	SUPER(XonoticPlayerSettingsTab).draw(me);
 }
-void fillXonoticPlayerSettingsTab(entity me)
+void XonoticPlayerSettingsTab_fill(entity me)
 {
 	entity e, pms, sl, label, e0, box;
 	float i, r, m, n;
@@ -84,7 +84,7 @@ void fillXonoticPlayerSettingsTab(entity me)
 		}
 
 	me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Field of View:"));
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Field of view:"));
 		me.TD(me, 1, 2, e = makeXonoticSlider(60, 130, 1, "fov"));
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Damage kick:"));
@@ -92,11 +92,9 @@ void fillXonoticPlayerSettingsTab(entity me)
 	me.TR(me);
 		sl = makeXonoticSlider(0.45, 0.75, 0.01, "cl_bobcycle");
 		me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(0, 1, sl, "View bobbing:"));
-		me.TD(me, 1, 2, sl);
-	
-	me.TR(me);
+		me.TD(me, 1, 2, sl);	
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Zoom Factor:"));
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Zoom factor:"));
 		me.TD(me, 1, 2, e = makeXonoticSlider(2, 16, 0.5, "cl_zoomfactor"));
 	me.TR(me);
 		sl = makeXonoticSlider(1, 8, 0.5, "cl_zoomspeed");
@@ -110,40 +108,55 @@ void fillXonoticPlayerSettingsTab(entity me)
 			e0.textEntity = main.weaponsDialog;
 			e0.allowCut = 1;
 	me.TR(me);
-	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "crosshair_per_weapon", "Per weapon crosshairs"));
-		me.TD(me, 1, 1.3, e = makeXonoticCheckBox(1, "crosshair_color_override", "& crosshair colors"));
+		me.TD(me, 1, 0.75, e = makeXonoticTextLabel(0, "Crosshair:"));
+		me.TD(me, 1, 1.00, e = makeXonoticCheckBox(0, "crosshair_per_weapon", "Per weapon"));
+		me.TD(me, 1, 1.25, e = makeXonoticCheckBox(1, "crosshair_color_override", "& Per weapon colors"));
 		setDependent(e, "crosshair_per_weapon", 1, 1);
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair:"));
+		me.TDempty(me, 0.5);
 		for(i = 1; i <= 10; ++i) {
 			me.TDNoMargin(me, 1, 2 / 10, e = makeXonoticCrosshairButton(3, i), '1 1 0');
 			setDependent(e, "crosshair_per_weapon", 0, 0);
 		}
 	me.TR(me);
-		me.TDempty(me, 1);
+		me.TDempty(me, 0.5);
 		for(i = 11; i <= 20; ++i) {
 			me.TDNoMargin(me, 1, 2 / 10, e = makeXonoticCrosshairButton(3, i), '1 1 0');
 			setDependent(e, "crosshair_per_weapon", 0, 0);
 		}
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair Size:"));
-		me.TD(me, 1, 2, e = makeXonoticSlider(0.40, 2, 0.05, "crosshair_size"));
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair size:"));
+		me.TD(me, 1, 1.8, e = makeXonoticSlider(0.10, 1.5, 0.05, "crosshair_size"));
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair Alpha:"));
-		me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "crosshair_color_alpha"));
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair alpha:"));
+		me.TD(me, 1, 1.8, e = makeXonoticSlider(0, 1, 0.1, "crosshair_color_alpha"));
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair Red:"));
-		me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "crosshair_color_red"));
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair red:"));
+		me.TD(me, 1, 1.8, e = makeXonoticSlider(0, 1, 0.01, "crosshair_color_red"));
 		setDependentOR(e, "crosshair_per_weapon", 0, 0, "crosshair_color_override", 1, 1);
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair Green:"));
-		me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "crosshair_color_green"));
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair green:"));
+		me.TD(me, 1, 1.8, e = makeXonoticSlider(0, 1, 0.01, "crosshair_color_green"));
 		setDependentOR(e, "crosshair_per_weapon", 0, 0, "crosshair_color_override", 1, 1);
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair Blue:"));
-		me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "crosshair_color_blue"));
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair blue:"));
+		me.TD(me, 1, 1.8, e = makeXonoticSlider(0, 1, 0.01, "crosshair_color_blue"));
 		setDependentOR(e, "crosshair_per_weapon", 0, 0, "crosshair_color_override", 1, 1);
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "crosshair_dot", "Enable centered dot"));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.5, e = makeXonoticTextLabel(0, "Size:"));
+		me.TD(me, 1, 0.9, e = makeXonoticSlider(0.2, 2, 0.1, "crosshair_dot_size"));
+			setDependent(e, "crosshair_dot", 1, 1);
+		me.TD(me, 1, 0.5, e = makeXonoticTextLabel(0, "Alpha:"));
+		me.TD(me, 1, 0.9, e = makeXonoticSlider(0.10, 1, 0.1, "crosshair_dot_alpha"));
+			setDependent(e, "crosshair_dot", 1, 1);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Hit test:"));
 		me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "crosshair_hittest", "0",    "None"));
@@ -151,24 +164,23 @@ void fillXonoticPlayerSettingsTab(entity me)
 		me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "crosshair_hittest", "1.25", "Enemies"));
 	me.TR(me);
 		me.TDempty(me, 0.4);
-		me.TD(me, 1, 2.2, e = makeXonoticButton("Waypoints Setup", '0 0 0'));
+		me.TD(me, 1, 2.2, e = makeXonoticButton("Waypoints setup...", '0 0 0'));
 			e.onClick = DialogOpenButton_Click;
 			e.onClickEntity = main.waypointDialog;
 		me.TDempty(me, 0.5);
 	me.TR(me);
 		me.TDempty(me, 0.4);
-		me.TD(me, 1, 2.2, e = makeXonoticButton("HUD Setup", '0 0 0'));
+		me.TD(me, 1, 2.2, e = makeXonoticButton("Enter HUD editor", '0 0 0'));
 			e.onClick = HUDSetup_Join_Click;
 			e.onClickEntity = me;
 		me.TDempty(me, 0.5);
 	me.TR(me);
 	#ifdef ALLOW_FORCEMODELS
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Force Models:"));
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Force models:"));
 		me.TD(me, 1, 2/3, e = makeXonoticRadioButton(2, string_null, string_null, "None"));
 		me.TD(me, 1, 2/3, e = makeXonoticRadioButton(2, "cl_forceplayermodelsfromxonotic", string_null, "Custom"));
 		me.TD(me, 1, 2/3, e = makeXonoticRadioButton(2, "cl_forceplayermodels", string_null, "All"));
 	#endif
-	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_gentle", "Disable gore effects"));
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Gibs:"));
@@ -179,7 +191,6 @@ void fillXonoticPlayerSettingsTab(entity me)
 			e.addValue(e, "Lots", "0");
 			e.configureXonoticTextSliderValues(e);
 			setDependent(e, "cl_gentle", 0, 0);
-	me.TR(me);
 
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, makeXonoticCommandButton("Apply immediately", '0 0 0', "color -1 -1;name \"$_cl_name\";cl_cmd sendcvar cl_weaponpriority;sendcvar cl_zoomfactor;sendcvar cl_zoomspeed;sendcvar cl_autoswitch;sendcvar cl_shownames;sendcvar cl_forceplayermodelsfromxonotic;sendcvar cl_forceplayermodels;playermodel $_cl_playermodel;playerskin $_cl_playerskin", COMMANDBUTTON_APPLY));
@@ -188,42 +199,10 @@ void HUDSetup_Join_Click(entity me, entity btn)
 {
 	if(! (gamestatus & (GAME_CONNECTED | GAME_ISSERVER)))
 	{
-		localcmd("map hudsetup", "\n");
-		/*float glob, i, n, fh;
-		string s;
-		glob = search_begin("maps/*.instantaction", TRUE, TRUE);
-		if(glob < 0)
-			return;
-		i = ceil(random() * search_getsize(glob)) - 1;
-		fh = fopen(search_getfilename(glob, i), FILE_READ);
-		search_end(glob);
-		if(fh < 0)
-			return;
-		while((s = fgets(fh)))
-		{
-			if(substring(s, 0, 4) == "set ")
-				s = substring(s, 4, strlen(s) - 4);
-			n = tokenize_console(s);
-			if(argv(0) == "bot_number")
-				cvar_set("bot_number", argv(1));
-			else if(argv(0) == "skill")
-				cvar_set("skill", argv(1));
-			else if(argv(0) == "timelimit")
-				cvar_set("timelimit_override", argv(1));
-			else if(argv(0) == "fraglimit")
-				cvar_set("fraglimit_override", argv(1));
-			else if(argv(0) == "changelevel")
-			{
-				fclose(fh);
-				localcmd("\nmenu_loadmap_prepare\n");
-				MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH);
-				MapInfo_LoadMap(argv(1));
-				cvar_set("lastlevel", "1");
-				return;
-			}
-		}
-		fclose(fh);*/
+		localcmd("map hudsetup/hudsetup", "\n");
 	}
+	else
+		localcmd("togglemenu 0\n");
 	localcmd("_hud_configure 1", "\n");
 }
 #endif