X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_create_mutators.c;h=984ae9b2655538c6f3be917f3560dec175143047;hb=70e0121c311b23e870c263ef672e9778cb519c3e;hp=12d7e4fccb980ce15b539d6a80ae9662faa55bb1;hpb=9234623b4dd531411d15df21f4b9fd0eda0c3bcc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
index 12d7e4fcc..984ae9b26 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
@@ -7,14 +7,14 @@ CLASS(XonoticMutatorsDialog) EXTENDS(XonoticDialog)
 	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);
 }
@@ -60,7 +60,7 @@ string WeaponArenaString()
 	return weaponarenastring;
 }
 
-string toStringXonoticMutatorsDialog(entity me)
+string XonoticMutatorsDialog_toString(entity me)
 {
 	string s;
 	s = "";
@@ -70,6 +70,8 @@ string toStringXonoticMutatorsDialog(entity me)
 		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)
@@ -78,12 +80,8 @@ string toStringXonoticMutatorsDialog(entity me)
 		s = strcat(s, ", Low gravity");
 	if(cvar("g_cloaked"))
 		s = strcat(s, ", Cloaked");
-	if(cvar("g_footsteps"))
-		s = strcat(s, ", Steps");
 	if(cvar("g_grappling_hook"))
 		s = strcat(s, ", Hook");
-	if(cvar("g_laserguided_missile"))
-		s = strcat(s, ", LG missiles");
 	if(cvar("g_midair"))
 		s = strcat(s, ", Midair");
 	if(cvar("g_vampire"))
@@ -157,7 +155,7 @@ void preDrawLaserWeaponArenaLaserButton(entity me)
 
 
 
-void fillXonoticMutatorsDialog(entity me)
+void XonoticMutatorsDialog_fill(entity me)
 {
 	entity e, s, w;
 	float i, j;
@@ -170,9 +168,6 @@ void fillXonoticMutatorsDialog(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		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_footsteps", "Footsteps"));
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_midair", "Midair"));
@@ -207,7 +202,7 @@ void fillXonoticMutatorsDialog(entity me)
 		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"));
@@ -268,7 +263,7 @@ void fillXonoticMutatorsDialog(entity me)
 		me.TDempty(me, 0.2);
 		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_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");
 
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, e = makeXonoticButton("OK", '0 0 0'));
@@ -276,10 +271,10 @@ void fillXonoticMutatorsDialog(entity me)
 			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