Merge remote branch 'refs/remotes/origin/fruitiex/viewoffsfix'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_multiplayer_create_mutators.c

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
index 1a411d0fdaf4fc8d329106a9feb0956b3a5c811f..c0d16a959727cb2c7bf3de5b980153b7eba124ea 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
@@ -14,7 +14,7 @@ ENDCLASS(XonoticMutatorsDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void showNotifyXonoticMutatorsDialog(entity me)
+void XonoticMutatorsDialog_showNotify(entity me)
 {
        loadAllCvars(me);
 }
@@ -60,14 +60,16 @@ string WeaponArenaString()
        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");
+       if(cvar("g_nix"))
+               s = strcat(s, ", NIX");
        if(cvar_string("g_weaponarena") != "0")
                s = strcat(s, ", ", WeaponArenaString());
        if(cvar("g_start_weapon_laser") == 0)
@@ -155,13 +157,16 @@ 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.TR(me);
+               me.TDempty(me, 0.2);
+               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_cloaked", "Cloaked"));
@@ -250,11 +255,11 @@ void fillXonoticMutatorsDialog(entity me)
                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"));
@@ -263,7 +268,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'));
@@ -271,10 +276,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