X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_create_mutators.c;h=6b14d1446de07fe5019b94f84aa7ac8591efd087;hp=1a411d0fdaf4fc8d329106a9feb0956b3a5c811f;hb=a36e826e580587d3ec8ae4e106cdf10620ad2af1;hpb=b49d3f3ffff847ec761e15fcc6285a736cddcba3

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
index 1a411d0fd..6b14d1446 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
@@ -4,17 +4,17 @@ CLASS(XonoticMutatorsDialog) EXTENDS(XonoticDialog)
 	METHOD(XonoticMutatorsDialog, fill, void(entity))
 	METHOD(XonoticMutatorsDialog, showNotify, void(entity))
 	METHOD(XonoticMutatorsDialog, close, void(entity))
-	ATTRIB(XonoticMutatorsDialog, title, string, "Mutators")
+	ATTRIB(XonoticMutatorsDialog, title, string, _("Mutators"))
 	ATTRIB(XonoticMutatorsDialog, color, vector, SKINCOLOR_DIALOG_MUTATORS)
 	ATTRIB(XonoticMutatorsDialog, intendedWidth, float, 0.9)
-	ATTRIB(XonoticMutatorsDialog, rows, float, 18)
+	ATTRIB(XonoticMutatorsDialog, rows, float, 17)
 	ATTRIB(XonoticMutatorsDialog, columns, float, 6)
 	ATTRIB(XonoticMutatorsDialog, refilterEntity, entity, NULL)
 ENDCLASS(XonoticMutatorsDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void showNotifyXonoticMutatorsDialog(entity me)
+void XonoticMutatorsDialog_showNotify(entity me)
 {
 	loadAllCvars(me);
 }
@@ -30,9 +30,9 @@ string WeaponArenaString()
 	if(s == "0")
 		return "";
 	if(s == "all")
-		return "All Weapons Arena";
+		return _("All Weapons Arena");
 	if(s == "most")
-		return "Most Weapons Arena";
+		return _("Most Weapons Arena");
 	if(s == weaponarenastring_cvar)
 		return weaponarenastring;
 	if(weaponarenastring)
@@ -53,49 +53,49 @@ string WeaponArenaString()
 				s = strcat(s, " & ", e.message);
 		}
 	}
-	s = strcat(substring(s, 3, strlen(s) - 3), " Arena");
+	s = sprintf(_("%s Arena"), substring(s, 3, strlen(s) - 3));
 	
 	weaponarenastring = strzone(s);
 
 	return weaponarenastring;
 }
 
-string toStringXonoticMutatorsDialog(entity me)
+string XonoticMutatorsDialog_toString(entity me)
 {
 	string s;
 	s = "";
+	if(cvar("g_dodging"))
+		s = strcat(s, ", ", _("Dodging"));
 	if(cvar("g_minstagib"))
-		s = strcat(s, ", MinstaGib");
-	if(cvar("g_nixnex"))
-		s = strcat(s, ", NixNex");
+		s = strcat(s, ", ", _("MinstaGib"));
+	if(cvar("g_nix"))
+		s = strcat(s, ", ", _("NIX"));
+	if(cvar("g_rocket_flying"))
+		s = strcat(s, ", ", _("Rocket Flying"));
 	if(cvar_string("g_weaponarena") != "0")
 		s = strcat(s, ", ", WeaponArenaString());
 	if(cvar("g_start_weapon_laser") == 0)
-		s = strcat(s, ", No start weapons");
+		s = strcat(s, ", ", _("No start weapons"));
 	if(cvar("sv_gravity") < 800)
-		s = strcat(s, ", Low gravity");
+		s = strcat(s, ", ", _("Low gravity"));
 	if(cvar("g_cloaked"))
-		s = strcat(s, ", Cloaked");
-	if(cvar("g_footsteps"))
-		s = strcat(s, ", Steps");
+		s = strcat(s, ", ", _("Cloaked"));
 	if(cvar("g_grappling_hook"))
-		s = strcat(s, ", Hook");
-	if(cvar("g_laserguided_missile"))
-		s = strcat(s, ", LG missiles");
+		s = strcat(s, ", ", _("Hook"));
 	if(cvar("g_midair"))
-		s = strcat(s, ", Midair");
+		s = strcat(s, ", ", _("Midair"));
 	if(cvar("g_vampire"))
-		s = strcat(s, ", Vampire");
+		s = strcat(s, ", ", _("Vampire"));
 	if(cvar("g_pinata"))
-		s = strcat(s, ", Pinata");
+		s = strcat(s, ", ", _("Piñata"));
 	if(cvar("g_weapon_stay"))
-		s = strcat(s, ", Weapons stay");
+		s = strcat(s, ", ", _("Weapons stay"));
 	if(cvar("g_bloodloss") > 0)
-		s = strcat(s, ", Bloodloss");
+		s = strcat(s, ", ", _("Blood loss"));
 	if(cvar("g_jetpack"))
-		s = strcat(s, ", Jet pack");
+		s = strcat(s, ", ", _("Jet pack"));
 	if(s == "")
-		return "None";
+		return ZCTX(_("MUT^None"));
 	else
 		return substring(s, 2, strlen(s) - 2);
 }
@@ -155,29 +155,29 @@ void preDrawLaserWeaponArenaLaserButton(entity me)
 
 
 
-void fillXonoticMutatorsDialog(entity me)
+void XonoticMutatorsDialog_fill(entity me)
 {
 	entity e, s, w;
 	float i, j;
 	string str, hstr;
 	me.TR(me);
-		me.TD(me, 1, 2, makeXonoticTextLabel(0, "Gameplay mutators:"));
+		me.TD(me, 1, 2, makeXonoticTextLabel(0, _("Gameplay mutators:")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_cloaked", "Cloaked"));
+		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_dodging", _("Dodging")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_footsteps", "Footsteps"));
+		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_cloaked", _("Cloaked")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_midair", "Midair"));
+		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_midair", _("Midair")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_vampire", "Vampire"));
+		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_vampire", _("Vampire")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticSlider(10, 50, 1, "g_bloodloss");
-		me.TD(me, 1, 2, e = makeXonoticSliderCheckBox(0, 1, s, "Blood loss"));
+		me.TD(me, 1, 2, e = makeXonoticSliderCheckBox(0, 1, s, _("Blood loss")));
 	me.TR(me);
 		me.TDempty(me, 0.4);
 		me.TD(me, 1, 1.8, s);
@@ -186,36 +186,36 @@ void fillXonoticMutatorsDialog(entity me)
 		s = makeXonoticSlider(80, 400, 8, "sv_gravity");
 			s.valueDigits = 0;
 			s.valueDisplayMultiplier = 0.125; // show gravity in percent
-		me.TD(me, 1, 2, e = makeXonoticSliderCheckBox(800, 1, s, "Low gravity"));
+		me.TD(me, 1, 2, e = makeXonoticSliderCheckBox(800, 1, s, _("Low gravity")));
 			e.savedValue = 200; // good on silvercity
 	me.TR(me);
 		me.TDempty(me, 0.4);
 		me.TD(me, 1, 1.8, s);
 	me.TR(me);
 	me.TR(me);
-		me.TD(me, 1, 2, makeXonoticTextLabel(0, "Weapon & item mutators:"));
+		me.TD(me, 1, 2, makeXonoticTextLabel(0, _("Weapon & item mutators:")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_grappling_hook", "Grappling hook"));
+		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_grappling_hook", _("Grappling hook")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_jetpack", "Jet pack"));
+		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_jetpack", _("Jet pack")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_laserguided_missile", "Laser guided missiles"));
+		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_rocket_flying", _("Rocket Flying")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_pinata", "Pinata"));
+		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_pinata", _("Piñata")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBoxEx(2, 0, "g_weapon_stay", "Weapons stay"));
+		me.TD(me, 1, 2, e = makeXonoticCheckBoxEx(2, 0, "g_weapon_stay", _("Weapons stay")));
 	me.TR(me);
 
 	me.gotoRC(me, 0, 2); me.setFirstColumn(me, me.currentColumn);
-		me.TD(me, 1, 4, makeXonoticTextLabel(0, "Weapon arenas:"));
+		me.TD(me, 1, 4, makeXonoticTextLabel(0, _("Weapon arenas:")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, string_null, string_null, "Regular (no arena)"));
+		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, string_null, string_null, _("Regular (no arena)")));
 	for(i = WEP_FIRST, j = 0; i <= WEP_LAST; ++i)
 	{
 		w = get_weaponinfo(i);
@@ -236,7 +236,7 @@ void fillXonoticMutatorsDialog(entity me)
 	}
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "menu_weaponarena_with_laser", "with laser"));
+		me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "menu_weaponarena_with_laser", _("with laser")));
 			// hook the draw function to gray it out
 			e.draw_weaponarena = e.draw;
 			e.draw = preDrawLaserWeaponArenaLaserButton;
@@ -244,37 +244,37 @@ void fillXonoticMutatorsDialog(entity me)
 			e.saveCvars_weaponarena = e.saveCvars;
 			e.saveCvars = saveCvarsLaserWeaponArenaLaserButton;
 	me.TR(me);
-		me.TD(me, 1, 4, makeXonoticTextLabel(0, "Special arenas:"));
+		me.TD(me, 1, 4, makeXonoticTextLabel(0, _("Special arenas:")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "g_minstagib", string_null, "MinstaGib"));
+		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "g_minstagib", string_null, _("MinstaGib")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "g_nixnex", string_null, "NixNex"));
+		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "g_nix", string_null, _("NIX")));
 	me.TR(me);
 		me.TDempty(me, 0.4);
-		me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "g_nixnex_with_laser", "with laser"));
-			setDependent(e, "g_nixnex", 1, 1);
+		me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "g_nix_with_laser", _("with laser")));
+			setDependent(e, "g_nix", 1, 1);
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "g_weaponarena", "most", "Most weapons"));
+		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "g_weaponarena", "most", _("Most weapons")));
 			e.cvarOffValue = "0";
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "g_start_weapon_laser", "0", "No start weapons"));
+		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "g_start_weapon_laser", "0", _("No start weapons")));
 			e.cvarOffValue = "-1";
-			makeMulti(e, "g_start_weapon_shotgun g_start_weapon_uzi g_start_weapon_grenadelauncher g_start_weapon_electro g_start_weapon_crylink g_start_weapon_nex g_start_weapon_hagar g_start_weapon_rocketlauncher g_start_weapon_campingrifle g_start_weapon_hlac g_start_weapon_seeker g_start_weapon_minstanex g_start_weapon_hook g_start_weapon_porto g_start_weapon_tuba");
+			makeMulti(e, "g_start_weapon_shotgun g_start_weapon_uzi g_start_weapon_grenadelauncher g_start_weapon_minelayer g_start_weapon_electro g_start_weapon_crylink g_start_weapon_nex g_start_weapon_hagar g_start_weapon_rocketlauncher g_start_weapon_rifle g_start_weapon_hlac g_start_weapon_seeker g_start_weapon_minstanex g_start_weapon_hook g_start_weapon_porto g_start_weapon_tuba g_start_weapon_minelayer");
 
 	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, me.columns, e = makeXonoticButton("OK", '0 0 0'));
+		me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));
 			e.onClick = Dialog_Close;
 			e.onClickEntity = me;
 }
 
-void closeXonoticMutatorsDialog(entity me)
+void XonoticMutatorsDialog_close(entity me)
 {
 	if(me.refilterEntity)
 		me.refilterEntity.refilter(me.refilterEntity);
-	closeDialog(me);
+	SUPER(XonoticMutatorsDialog).close(me);
 }
 #endif