s = cvar_string("g_weaponarena");
if(s == "0")
return "";
- if(s == "all")
+ if(s == "all" || s == "1")
return _("All Weapons Arena");
if(s == "most")
return _("Most Weapons Arena");
s = "";
if(cvar("g_dodging"))
s = strcat(s, ", ", _("Dodging"));
- if(cvar("g_minstagib"))
- s = strcat(s, ", ", _("MinstaGib"));
+ if(cvar("g_instagib"))
+ s = strcat(s, ", ", _("InstaGib"));
if(cvar("g_new_toys"))
s = strcat(s, ", ", _("New Toys"));
if(cvar("g_nix"))
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"));
float checkCompatibility_pinata(entity me)
{
- if(cvar("g_minstagib"))
+ if(cvar("g_instagib"))
return 0;
if(cvar("g_nix"))
return 0;
}
float checkCompatibility_newtoys(entity me)
{
- if(cvar("g_minstagib"))
+ if(cvar("g_instagib"))
return 0;
if(cvar_string("g_weaponarena") == "most")
return 1;
- if(cvar_string("g_weaponarena") == "all")
+ if(cvar_string("g_weaponarena") == "all" || cvar_string("g_weaponarena") == "1")
return 1;
if(cvar_string("g_weaponarena") != "0")
return 0;
}
float checkCompatibility_weaponarena_weapon(entity me)
{
- if(cvar("g_minstagib"))
+ if(cvar("g_instagib"))
return 0;
if(cvar_string("g_weaponarena") == "most")
return 0;
- if(cvar_string("g_weaponarena") == "all")
+ if(cvar_string("g_weaponarena") == "all" || cvar_string("g_weaponarena") == "1")
return 0;
if(cvar_string("g_weaponarena") == "0")
return 0;
me.TR(me);
me.TDempty(me, 0.2);
me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_vampire", _("Vampire")));
- setDependent(e, "g_minstagib", 0, 0);
+ setDependent(e, "g_instagib", 0, 0);
me.TR(me);
me.TDempty(me, 0.2);
s = makeXonoticSlider(10, 50, 1, "g_bloodloss");
me.TD(me, 1, 1.8, e = makeXonoticSliderCheckBox(0, 1, s, _("Blood loss")));
- setDependent(e, "g_minstagib", 0, 0);
+ setDependent(e, "g_instagib", 0, 0);
me.TR(me);
me.TDempty(me, 0.4);
me.TD(me, 1, 1.6, s);
me.TR(me);
me.TDempty(me, 0.2);
me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_invincible_projectiles", _("Invincible Projectiles")));
- setDependent(e, "g_minstagib", 0, 0);
+ setDependent(e, "g_instagib", 0, 0);
me.TR(me);
me.TDempty(me, 0.2);
me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_new_toys", _("New Toys")));
me.TR(me);
me.TDempty(me, 0.2);
me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_rocket_flying", _("Rocket Flying")));
- setDependent(e, "g_minstagib", 0, 0);
+ setDependent(e, "g_instagib", 0, 0);
me.TR(me);
me.TDempty(me, 0.2);
me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_pinata", _("PiƱata")));
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)));
me.TD(me, 1, 4, makeXonoticTextLabel(0, _("Special arenas:")));
me.TR(me);
me.TDempty(me, 0.2);
- me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_minstagib", "1", _("MinstaGib")));
+ me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_instagib", "1", _("InstaGib")));
e.cvarOffValue = "0";
me.TR(me);
me.TDempty(me, 0.2);