#if defined(CSQC)
#include "constants.qh"
- #include "../client/mutators/events.qh"
+ #include <client/mutators/_mod.qh>
#include "mapinfo.qh"
#include "notifications/all.qh"
#include "scores.qh"
#elif defined(MENUQC)
#elif defined(SVQC)
#include "constants.qh"
- #include "../server/mutators/events.qh"
+ #include <server/mutators/_mod.qh>
#include "notifications/all.qh"
#include <common/deathtypes/all.qh>
#include "scores.qh"
#include "mapinfo.qh"
#endif
+#ifdef SVQC
+float tracebox_inverted (vector v1, vector mi, vector ma, vector v2, float nomonsters, entity forent, float stopatentity, entity ignorestopatentity) // returns the number of traces done, for benchmarking
+{
+ vector pos, dir, t;
+ float nudge;
+ entity stopentity;
+
+ //nudge = 2 * cvar("collision_impactnudge"); // why not?
+ nudge = 0.5;
+
+ dir = normalize(v2 - v1);
+
+ pos = v1 + dir * nudge;
+
+ float c;
+ c = 0;
+
+ for (;;)
+ {
+ if(pos * dir >= v2 * dir)
+ {
+ // went too far
+ trace_fraction = 1;
+ trace_endpos = v2;
+ return c;
+ }
+
+ tracebox(pos, mi, ma, v2, nomonsters, forent);
+ ++c;
+
+ if(c == 50)
+ {
+ LOG_TRACE("When tracing from ", vtos(v1), " to ", vtos(v2));
+ LOG_TRACE(" Nudging gets us nowhere at ", vtos(pos));
+ LOG_TRACE(" trace_endpos is ", vtos(trace_endpos));
+ LOG_TRACE(" trace distance is ", ftos(vlen(pos - trace_endpos)));
+ }
+
+ stopentity = trace_ent;
+
+ if(trace_startsolid)
+ {
+ // we started inside solid.
+ // then trace from endpos to pos
+ t = trace_endpos;
+ tracebox(t, mi, ma, pos, nomonsters, forent);
+ ++c;
+ if(trace_startsolid)
+ {
+ // t is still inside solid? bad
+ // force advance, then, and retry
+ pos = t + dir * nudge;
+
+ // but if we hit an entity, stop RIGHT before it
+ if(stopatentity && stopentity && stopentity != ignorestopatentity)
+ {
+ trace_ent = stopentity;
+ trace_endpos = t;
+ trace_fraction = ((trace_endpos - v1) * dir) / ((v2 - v1) * dir);
+ return c;
+ }
+ }
+ else
+ {
+ // we actually LEFT solid!
+ trace_fraction = ((trace_endpos - v1) * dir) / ((v2 - v1) * dir);
+ return c;
+ }
+ }
+ else
+ {
+ // pos is outside solid?!? but why?!? never mind, just return it.
+ trace_endpos = pos;
+ trace_fraction = ((trace_endpos - v1) * dir) / ((v2 - v1) * dir);
+ return c;
+ }
+ }
+}
+
+void traceline_inverted (vector v1, vector v2, float nomonsters, entity forent, float stopatentity, entity ignorestopatentity)
+{
+ tracebox_inverted(v1, '0 0 0', '0 0 0', v2, nomonsters, forent, stopatentity, ignorestopatentity);
+}
+#endif
+
#ifdef GAMEQC
+/*
+==================
+findbetterlocation
+
+Returns a point at least 12 units away from walls
+(useful for explosion animations, although the blast is performed where it really happened)
+Ripped from DPMod
+==================
+*/
+vector findbetterlocation (vector org, float mindist)
+{
+ vector vec = mindist * '1 0 0';
+ int c = 0;
+ while (c < 6)
+ {
+ traceline (org, org + vec, true, NULL);
+ vec = vec * -1;
+ if (trace_fraction < 1)
+ {
+ vector loc = trace_endpos;
+ traceline (loc, loc + vec, true, NULL);
+ if (trace_fraction >= 1)
+ org = loc + vec;
+ }
+ if (c & 1)
+ {
+ float h = vec.y;
+ vec.y = vec.x;
+ vec.x = vec.z;
+ vec.z = h;
+ }
+ c = c + 1;
+ }
+
+ return org;
+}
+
/*
* Get "real" origin, in worldspace, even if ent is attached to something else.
*/
s = strzone(s);
lleft = l;
- for (i = 0;i < strlen(s);++i)
+ int len = strlen(s);
+ for (i = 0; i < len; ++i)
{
if (substring(s, i, 2) == "\\n")
{
if (lleft > 0)
{
callback(" ");
- lleft = lleft - 1;
+ --lleft;
}
}
else
{
- for (j = i+1;j < strlen(s);++j)
+ for (j = i+1; j < len; ++j)
// ^^ this skips over the first character of a word, which
// is ALWAYS part of the word
// this is safe since if i+1 == strlen(s), i will become
lleft = l;
}
callback(substring(s, i, wlen));
- lleft = lleft - wlen;
+ lleft -= wlen;
i = j - 1;
}
}
if(cvar("developer"))
{
- LOG_INFO("Verifying vector compression table...");
+ LOG_TRACE("Verifying vector compression table...");
for(i = 0x0F00; i < 0xFFFF; ++i)
if(i != compressShortVector(decompressShortVector(i)))
{
- LOG_INFOF(
+ LOG_FATALF(
"BROKEN vector compression: %s -> %s -> %s",
ftos(i),
vtos(decompressShortVector(i)),
ftos(compressShortVector(decompressShortVector(i)))
);
- error("b0rk");
}
- LOG_INFO("Done.");
+ LOG_TRACE("Done.");
}
}
for(w = to; w >= from; --w)
{
int wflags = Weapons_from(w).spawnflags;
- if((wflags & WEP_FLAG_HIDDEN) && (wflags & WEP_FLAG_MUTATORBLOCKED) && !(wflags & WEP_FLAG_NORMAL))
+ if(wflags & WEP_FLAG_SPECIALATTACK)
continue;
for(i = 0; i < n; ++i)
if(stof(argv(i)) == w)
vector v;
if (DEATH_IS(deathtype, DEATH_DROWN)) // Why should armor help here...
armorblock = 0;
+ if (deathtype & HITTYPE_ARMORPIERCE)
+ armorblock = 0;
v.y = bound(0, damage * armorblock, a); // save
v.x = bound(0, damage - v.y, damage); // take
v.z = 0;
if(s == t)
{
r = d;
+ break; // if we found a killing case, apply it! other settings may be allowed in the future, but this one is caught
}
}
return r;
}
+ERASEABLE
+void write_String_To_File(int fh, string str, bool alsoprint)
+{
+ fputs(fh, str);
+ if (alsoprint) LOG_INFO(str);
+}
+
string get_model_datafilename(string m, float sk, string fil)
{
if(m)
case "reserved": get_model_parameters_species = SPECIES_RESERVED; break;
}
if(c == "sex")
+ {
+ if (s == "Male") s = _("Male");
+ else if (s == "Female") s = _("Female");
+ else if (s == "Undisclosed") s = _("Undisclosed");
get_model_parameters_sex = s;
+ }
if(c == "weight")
get_model_parameters_weight = stof(s);
if(c == "age")
{
if (prvm_language == "en") return key;
+ if (substring(key, 0, 1) == "<")
+ {
+ if (key == "<KEY NOT FOUND>") return _("<KEY NOT FOUND>");
+ if (key == "<UNKNOWN KEYNUM>") return _("<UNKNOWN KEYNUM>");
+ }
+
switch(key)
{
case "TAB": return _("TAB");
case "CTRL": return _("CTRL");
case "SHIFT": return _("SHIFT");
- case "F1": return _("F1");
- case "F2": return _("F2");
- case "F3": return _("F3");
- case "F4": return _("F4");
- case "F5": return _("F5");
- case "F6": return _("F6");
- case "F7": return _("F7");
- case "F8": return _("F8");
- case "F9": return _("F9");
- case "F10": return _("F10");
- case "F11": return _("F11");
- case "F12": return _("F12");
-
case "INS": return _("INS");
case "DEL": return _("DEL");
case "PGDN": return _("PGDN");
case "NUMLOCK": return _("NUMLOCK");
case "CAPSLOCK": return _("CAPSLOCK");
case "SCROLLOCK": return _("SCROLLOCK");
+
+ case "SEMICOLON": return _("SEMICOLON");
+ case "TILDE": return _("TILDE");
+ case "BACKQUOTE": return _("BACKQUOTE");
+ case "QUOTE": return _("QUOTE");
+ case "APOSTROPHE": return _("APOSTROPHE");
+ case "BACKSLASH": return _("BACKSLASH");
+ }
+
+ if (substring(key, 0, 1) == "F")
+ {
+ string subkey = substring(key, 1, -1);
+ if (IS_DIGIT(substring(key, 3, 1))) // check only first digit
+ {
+ return sprintf(_("F%d"), stof(subkey));
+ }
+ // continue in case there is another key name starting with F
}
if (substring(key, 0, 3) == "KP_")
projects / xonotic / xonotic-data.pk3dir.git / blobdiff