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);
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;