for (string arg = ""; i < n; i++)
{
if (i >= 0) arg = argv(i);
+ // cond is the condition for showing the mutator enabled in the menu
#define X(name, translated_name, mut, cond) \
if(arg == name || (!n && (cond))) { s2 = cons_mid(s2, ", ", translated_name); mut_set_active(mut); }
X("Dodging" , _("Dodging") , MUT_DODGING , cvar("g_dodging"))
X("Cloaked" , _("Cloaked") , MUT_CLOAKED , cvar("g_cloaked"))
X("Hook" , _("Hook") , MUT_GRAPPLING_HOOK , cvar("g_grappling_hook"))
X("Midair" , _("Midair") , MUT_MIDAIR , cvar("g_midair"))
- X("Melee only" , _("Melee only") , MUT_MELEE_ONLY , cvar("g_melee_only"))
+ X("Melee only Arena" , _("Melee only Arena") , MUT_MELEE_ONLY , cvar("g_melee_only"))
X("Vampire" , _("Vampire") , MUT_VAMPIRE , cvar("g_vampire"))
X("Piñata" , _("Piñata") , MUT_PINATA , cvar("g_pinata"))
X("Weapons stay" , _("Weapons stay") , MUT_WEAPON_STAY , cvar("g_weapon_stay"))
X("Powerups" , _("Powerups") , MUT_POWERUPS , cvar("g_powerups") > 0)
X("Touch explode" , _("Touch explode") , MUT_TOUCHEXPLODE , cvar("g_touchexplode") > 0)
X("Wall jumping" , _("Wall jumping") , MUT_WALLJUMP , cvar("g_walljump"))
- X("No start weapons" , _("No start weapons") , MUT_WEAPONARENA , cvar_string("g_weaponarena") == "0" && cvar("g_balance_blaster_weaponstartoverride") == 0)
+ X("No start weapons" , _("No start weapons") , MUT_NO_START_WEAPONS , cvar_string("g_weaponarena") == "0" && cvar("g_balance_blaster_weaponstartoverride") == 0)
X("Nades" , _("Nades") , MUT_NADES , cvar("g_nades"))
X("Offhand blaster" , _("Offhand blaster") , MUT_OFFHAND_BLASTER , cvar("g_offhand_blaster"))
#undef X
else if(pFlags & SFL_RANK)
valstr = (pValue < 256 ? count_ordinal(pValue) : _("N/A"));
else if(pFlags & SFL_TIME)
- valstr = TIME_ENCODED_TOSTRING(pValue);
+ valstr = TIME_ENCODED_TOSTRING(pValue, true);
else
valstr = ftos(pValue);
float q = (data & 0x0F80) / 0x80;
int len = (data & 0x007F);
- //print("\ndecompress: p ", ftos(p)); print("q ", ftos(q)); print("len ", ftos(len), "\n");
+ //print("\ndecompress: p:", ftos(p)); print(" q:", ftos(q)); print(" len:", ftos(len), "\n");
if(p == 0)
{
}
else
{
- q = .19634954084936207740 * q;
+ q = .19634954084936207740 * q;
p = .19634954084936207740 * p - 1.57079632679489661922;
out.x = cos(q) * cos(p);
out.y = sin(q) * cos(p);
y = 30;
}
else
- y = floor(0.5 + ang.y * 32 / 360) & 31; // 0..360 to 0..32
+ y = floor(0.5 + ang.y * 32 / 360) & 31; // 0..360 to 0..32
len = invertLengthLog(vlen(vec));
- //print("compressed: p ", ftos(p)); print("y ", ftos(y)); print("len ", ftos(len), "\n");
+ //print("compressed: p:", ftos(p)); print(" y:", ftos(y)); print(" len:", ftos(len), "\n");
return (p * 0x1000) + (y * 0x80) + len;
}
return left;
}
-float textLengthUpToLength(string theText, float maxWidth, textLengthUpToLength_lenFunction_t w)
+float textLengthUpToLength(string theText, int maxLength, textLengthUpToLength_lenFunction_t w)
{
// STOP.
// The following function is SLOW.
// For your safety and for the protection of those around you...
// DO NOT CALL THIS AT HOME.
// No really, don't.
- if(w(theText) <= maxWidth)
+ if(w(theText) <= maxLength)
return strlen(theText); // yeah!
bool colors = (w("^7") == 0);
ofs = (!res.x) ? 0 : res.x - res.y;
}
- if(w(substring(theText, 0, middle + ofs)) <= maxWidth)
+ if(w(substring(theText, 0, middle + ofs)) <= maxLength)
left = middle + ofs;
else
right = middle;
return "";
}
-string getWrappedLine(float w, vector theFontSize, textLengthUpToWidth_widthFunction_t tw)
+string getWrappedLine(float maxWidth, vector theFontSize, textLengthUpToWidth_widthFunction_t tw)
{
string s = getWrappedLine_remaining;
- if(w <= 0)
+ if(maxWidth <= 0)
{
getWrappedLine_remaining = string_null;
return s; // the line has no size ANYWAY, nothing would be displayed.
}
- int take_until = textLengthUpToWidth(s, w, theFontSize, tw);
+ int take_until = textLengthUpToWidth(s, maxWidth, theFontSize, tw);
if(take_until > 0 && take_until < strlen(s))
{
int last_word = take_until - 1;
}
}
-string getWrappedLineLen(float w, textLengthUpToLength_lenFunction_t tw)
+string getWrappedLineLen(int maxLength, textLengthUpToLength_lenFunction_t tw)
{
string s = getWrappedLine_remaining;
- if(w <= 0)
+ if(maxLength <= 0)
{
getWrappedLine_remaining = string_null;
return s; // the line has no size ANYWAY, nothing would be displayed.
}
- int take_until = textLengthUpToLength(s, w, tw);
+ int take_until = textLengthUpToLength(s, maxLength, tw);
if(take_until > 0 && take_until < strlen(s))
{
int last_word = take_until - 1;
.float aiment_deadflag;
void SetMovetypeFollow(entity ent, entity e)
{
- // FIXME this may not be warpzone aware
set_movetype(ent, MOVETYPE_FOLLOW); // make the hole follow
ent.solid = SOLID_NOT; // MOVETYPE_FOLLOW is always non-solid - this means this cannot be teleported by warpzones any more! Instead, we must notice when our owner gets teleported.
ent.aiment = e; // make the hole follow bmodel
ent.punchangle = e.angles; // the original angles of bmodel
ent.view_ofs = ent.origin - e.origin; // relative origin
ent.v_angle = ent.angles - e.angles; // relative angles
- ent.aiment_classname = strzone(e.classname);
+ ent.aiment_classname = e.classname;
ent.aiment_deadflag = e.deadflag;
if(IS_PLAYER(ent.aiment))
{
set_movetype(ent, MOVETYPE_FLY);
PROJECTILE_MAKETRIGGER(ent);
- if (ent.aiment_classname)
- strunzone(ent.classname);
+ ent.aiment_classname = string_null;
// FIXME: engine bug?
// resetting aiment the engine will set orb's origin close to world's origin
//ent.aiment = NULL;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff