X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_create_mutators.c;h=c908d82d3ffd6b55f513eaf0b30863688bee04f4;hb=77477d386d12b458eaa8dabb23853ef2e391a71a;hp=d0a8f6bc76a199ca49e1091fd1a4351b0f38f2e2;hpb=ab18855f2de6204798b29f9a7f2adc6382d39d1b;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 d0a8f6bc7..c908d82d3 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c @@ -80,7 +80,7 @@ string XonoticMutatorsDialog_toString(entity me) s = strcat(s, ", ", WeaponArenaString()); if(cvar("g_start_weapon_laser") == 0) s = strcat(s, ", ", _("No start weapons")); - if(cvar("sv_gravity") < 800) + if(cvar("sv_gravity") < stof(cvar_defstring("sv_gravity"))) s = strcat(s, ", ", _("Low gravity")); if(cvar("g_cloaked")) s = strcat(s, ", ", _("Cloaked")); @@ -98,6 +98,8 @@ string XonoticMutatorsDialog_toString(entity me) s = strcat(s, ", ", _("Blood loss")); if(cvar("g_jetpack")) s = strcat(s, ", ", _("Jet pack")); + if(cvar("g_overkill")) + s = strcat(s, ", ", _("Overkill")); if(cvar("g_powerups") == 0) s = strcat(s, ", ", _("No powerups")); if(cvar("g_powerups") > 0) @@ -232,7 +234,7 @@ void XonoticMutatorsDialog_fill(entity me) w = get_weaponinfo(i); if(w.spawnflags & WEP_FLAG_HIDDEN) continue; - if(j & 1 == 0) + if((j & 1) == 0) me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.8, e = makeXonoticWeaponarenaCheckBox(strzone(w.netname), strzone(w.message))); @@ -253,6 +255,9 @@ void XonoticMutatorsDialog_fill(entity me) me.TDempty(me, 0.2); me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_minstagib", "1", _("MinstaGib"))); e.cvarOffValue = "0"; + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "g_overkill", "1", _("Overkill"))); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_nix", "1", _("NIX"))); @@ -265,7 +270,7 @@ void XonoticMutatorsDialog_fill(entity me) me.TDempty(me, 0.2); me.TD(me, 1, 1.8, 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_minelayer g_start_weapon_electro g_start_weapon_crylink g_start_weapon_nex g_start_weapon_hagar g_start_weapon_rocketlauncher g_start_weapon_porto g_start_weapon_minstanex g_start_weapon_hook g_start_weapon_hlac g_start_weapon_rifle g_start_weapon_fireball g_start_weapon_seeker 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_porto g_start_weapon_minstanex g_start_weapon_hook g_start_weapon_hlac g_start_weapon_rifle g_start_weapon_fireball g_start_weapon_seeker g_start_weapon_tuba g_overkill"); me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));