X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=09837f20de5e6cc0816957de68a7713a20583647;hb=a07691e754aa071189c034693af3476777d86720;hp=ccefc4c1ee5222d57ed754f6d5cf3e4c45c0aa19;hpb=2ce2f533321210bef1f49b1245a8ea1fda15eea4;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index ccefc4c1e..09837f20d 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -4,16 +4,16 @@ #include "constants.qh" #include "g_hook.qh" #include "ipban.qh" -#include "mutators/mutators_include.qh" -#include "t_items.qh" +#include "mutators/all.qh" +#include "../common/t_items.qh" #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" #include "weapons/selection.qh" #include "../common/command/generic.qh" #include "../common/constants.qh" -#include "../common/deathtypes.qh" +#include "../common/deathtypes/all.qh" #include "../common/mapinfo.qh" -#include "../common/notifications.qh" +#include "../common/notifications/all.qh" #include "../common/playerstats.qh" #include "../common/teams.qh" #include "../common/triggers/subs.qh" @@ -23,9 +23,11 @@ #include "../common/vehicles/sv_vehicles.qh" #include "../common/vehicles/vehicle.qh" #include "../common/items/all.qc" -#include "../csqcmodellib/sv_model.qh" -#include "../warpzonelib/anglestransform.qh" -#include "../warpzonelib/server.qh" +#include "../common/state.qh" +#include "../common/effects/qc/globalsound.qh" +#include "../lib/csqcmodel/sv_model.qh" +#include "../lib/warpzone/anglestransform.qh" +#include "../lib/warpzone/server.qh" void crosshair_trace(entity pl) { @@ -52,7 +54,7 @@ void WarpZone_crosshair_trace(entity pl) } -string admin_name(void) +string admin_name() { if(autocvar_sv_adminnick != "") return autocvar_sv_adminnick; @@ -60,40 +62,6 @@ string admin_name(void) return "SERVER ADMIN"; } -void DistributeEvenly_Init(float amount, float totalweight) -{ - if (DistributeEvenly_amount) - { - LOG_TRACE("DistributeEvenly_Init: UNFINISHED DISTRIBUTION (", ftos(DistributeEvenly_amount), " for "); - LOG_TRACE(ftos(DistributeEvenly_totalweight), " left!)\n"); - } - if (totalweight == 0) - DistributeEvenly_amount = 0; - else - DistributeEvenly_amount = amount; - DistributeEvenly_totalweight = totalweight; -} -float DistributeEvenly_Get(float weight) -{ - float f; - if (weight <= 0) - return 0; - f = floor(0.5 + DistributeEvenly_amount * weight / DistributeEvenly_totalweight); - DistributeEvenly_totalweight -= weight; - DistributeEvenly_amount -= f; - return f; -} -float DistributeEvenly_GetRandomized(float weight) -{ - float f; - if (weight <= 0) - return 0; - f = floor(random() + DistributeEvenly_amount * weight / DistributeEvenly_totalweight); - DistributeEvenly_totalweight -= weight; - DistributeEvenly_amount -= f; - return f; -} - void GameLogEcho(string s) { @@ -269,8 +237,8 @@ string formatmessage(string msg) break; // too many replacements n = n - 1; - p1 = strstr(msg, "%", p); // NOTE: this destroys msg as it's a tempstring! - p2 = strstr(msg, "\\", p); // NOTE: this destroys msg as it's a tempstring! + p1 = strstrofs(msg, "%", p); // NOTE: this destroys msg as it's a tempstring! + p2 = strstrofs(msg, "\\", p); // NOTE: this destroys msg as it's a tempstring! if (p1 < 0) p1 = p2; @@ -296,7 +264,7 @@ string formatmessage(string msg) case "l": replacement = NearestLocation(self.origin); break; case "y": replacement = NearestLocation(cursor); break; case "d": replacement = NearestLocation(self.death_origin); break; - case "w": replacement = WEP_NAME((!self.weapon) ? (!self.switchweapon ? self.cnt : self.switchweapon) : self.weapon); break; + case "w": replacement = ((PS(self).m_weapon == WEP_Null) ? ((PS(self).m_switchweapon == WEP_Null) ? Weapons_from(self.cnt) : PS(self).m_switchweapon) : PS(self).m_weapon).m_name; break; case "W": replacement = ammoitems; break; case "x": replacement = ((cursor_ent.netname == "" || !cursor_ent) ? "nothing" : cursor_ent.netname); break; case "s": replacement = ftos(vlen(self.velocity - self.velocity_z * '0 0 1')); break; @@ -408,8 +376,42 @@ string W_FixWeaponOrder_ForceComplete_AndBuildImpulseList(string wo) self.weaponorder_byimpulse = strzone(W_FixWeaponOrder_BuildImpulseList(o)); return o; } -void GetCvars(float f) -{SELFPARAM(); + +REPLICATE(autoswitch, bool, "cl_autoswitch"); + +REPLICATE(cvar_cl_allow_uid2name, bool, "cl_allow_uid2name"); + +REPLICATE(cvar_cl_autoscreenshot, int, "cl_autoscreenshot"); + +REPLICATE(cvar_cl_autotaunt, float, "cl_autotaunt"); + +REPLICATE(cvar_cl_clippedspectating, bool, "cl_clippedspectating"); + +REPLICATE(cvar_cl_handicap, float, "cl_handicap"); + +REPLICATE(cvar_cl_jetpack_jump, bool, "cl_jetpack_jump"); + +REPLICATE(cvar_cl_movement_track_canjump, bool, "cl_movement_track_canjump"); + +REPLICATE(cvar_cl_newusekeysupported, bool, "cl_newusekeysupported"); + +REPLICATE(cvar_cl_noantilag, bool, "cl_noantilag"); + +REPLICATE(cvar_cl_physics, string, "cl_physics"); + +REPLICATE(cvar_cl_voice_directional, int, "cl_voice_directional"); + +REPLICATE(cvar_cl_voice_directional_taunt_attenuation, float, "cl_voice_directional_taunt_attenuation"); + +REPLICATE(cvar_cl_weaponimpulsemode, int, "cl_weaponimpulsemode"); + +REPLICATE(cvar_g_xonoticversion, string, "g_xonoticversion"); + +/** + * @param f -1: cleanup, 0: request, 1: receive + */ +void GetCvars(entity this, int f) +{ string s = string_null; if (f > 0) @@ -423,13 +425,6 @@ void GetCvars(float f) ReplicateVars(this, s, f); - GetCvars_handleFloat(s, f, autoswitch, "cl_autoswitch"); - GetCvars_handleFloat(s, f, cvar_cl_autoscreenshot, "cl_autoscreenshot"); - GetCvars_handleFloat(s, f, cvar_cl_jetpack_jump, "cl_jetpack_jump"); - GetCvars_handleString(s, f, cvar_g_xonoticversion, "g_xonoticversion"); - GetCvars_handleString(s, f, cvar_cl_physics, "cl_physics"); - GetCvars_handleFloat(s, f, cvar_cl_handicap, "cl_handicap"); - GetCvars_handleFloat(s, f, cvar_cl_clippedspectating, "cl_clippedspectating"); GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriority, "cl_weaponpriority", W_FixWeaponOrder_ForceComplete_AndBuildImpulseList); GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[0], "cl_weaponpriority0", W_FixWeaponOrder_AllowIncomplete); GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[1], "cl_weaponpriority1", W_FixWeaponOrder_AllowIncomplete); @@ -441,28 +436,14 @@ void GetCvars(float f) GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[7], "cl_weaponpriority7", W_FixWeaponOrder_AllowIncomplete); GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[8], "cl_weaponpriority8", W_FixWeaponOrder_AllowIncomplete); GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[9], "cl_weaponpriority9", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleFloat(s, f, cvar_cl_weaponimpulsemode, "cl_weaponimpulsemode"); - GetCvars_handleFloat(s, f, cvar_cl_autotaunt, "cl_autotaunt"); - GetCvars_handleFloat(s, f, cvar_cl_noantilag, "cl_noantilag"); - GetCvars_handleFloat(s, f, cvar_cl_voice_directional, "cl_voice_directional"); - GetCvars_handleFloat(s, f, cvar_cl_voice_directional_taunt_attenuation, "cl_voice_directional_taunt_attenuation"); - GetCvars_handleFloat(s, f, cvar_cl_accuracy_data_share, "cl_accuracy_data_share"); - GetCvars_handleFloat(s, f, cvar_cl_accuracy_data_receive, "cl_accuracy_data_receive"); - - self.cvar_cl_accuracy_data_share = boolean(self.cvar_cl_accuracy_data_share); - self.cvar_cl_accuracy_data_receive = boolean(self.cvar_cl_accuracy_data_receive); - - GetCvars_handleFloatOnce(s, f, cvar_cl_gunalign, "cl_gunalign"); - GetCvars_handleFloat(s, f, cvar_cl_allow_uid2name, "cl_allow_uid2name"); + GetCvars_handleFloat(s, f, cvar_cl_allow_uidtracking, "cl_allow_uidtracking"); - GetCvars_handleFloat(s, f, cvar_cl_movement_track_canjump, "cl_movement_track_canjump"); - GetCvars_handleFloat(s, f, cvar_cl_newusekeysupported, "cl_newusekeysupported"); // fixup of switchweapon (needed for LMS or when spectating is disabled, as PutClientInServer comes too early) if (f > 0) { if (s == "cl_weaponpriority") - self.switchweapon = w_getbestweapon(self); + if (PS(self)) PS(self).m_switchweapon = w_getbestweapon(self); if (s == "cl_allow_uidtracking") PlayerStats_GameReport_AddPlayer(self); } @@ -483,27 +464,29 @@ string playername(entity p) float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still needs done? { - int i = weaponinfo.weapon; + int i = weaponinfo.m_id; int d = 0; + bool allow_mutatorblocked = false; - if (!i) + if(!i) return 0; - if (g_lms || g_ca || allguns) + bool mutator_returnvalue = MUTATOR_CALLHOOK(WantWeapon, weaponinfo, d, allguns, allow_mutatorblocked); + d = ret_float; + allguns = want_allguns; + allow_mutatorblocked = false; + + if(allguns) { if(weaponinfo.spawnflags & WEP_FLAG_NORMAL) d = true; else d = false; } - else if (g_cts) - d = (i == WEP_SHOTGUN.m_id); - else if (g_nexball) - d = 0; // weapon is set a few lines later - else + else if(!mutator_returnvalue) d = !(!weaponinfo.weaponstart); - if(!g_cts && (weaponinfo.spawnflags & WEP_FLAG_MUTATORBLOCKED)) // never default mutator blocked guns + if(!allow_mutatorblocked && (weaponinfo.spawnflags & WEP_FLAG_MUTATORBLOCKED)) // never default mutator blocked guns d = 0; float t = weaponinfo.weaponstartoverride; @@ -524,8 +507,7 @@ float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still ne void readplayerstartcvars() { - entity e; - float i, j, t; + float i, t; string s; // initialize starting values for players @@ -545,11 +527,9 @@ void readplayerstartcvars() g_weaponarena_weapons = '0 0 0'; s = cvar_string("g_weaponarena"); - if (s == "0" || s == "") - { - if(g_ca || g_freezetag) - s = "most"; - } + + MUTATOR_CALLHOOK(SetWeaponArena, s); + s = ret_string; if (s == "0" || s == "") { @@ -563,24 +543,20 @@ void readplayerstartcvars() { g_weaponarena = 1; g_weaponarena_list = "All Weapons"; - for (j = WEP_FIRST; j <= WEP_LAST; ++j) - { - e = get_weaponinfo(j); - if (!(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)) - g_weaponarena_weapons |= WepSet_FromWeapon(j); - } + FOREACH(Weapons, it != WEP_Null, LAMBDA( + if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED)) + g_weaponarena_weapons |= (it.m_wepset); + )); } else if (s == "most") { g_weaponarena = 1; g_weaponarena_list = "Most Weapons"; - for (j = WEP_FIRST; j <= WEP_LAST; ++j) - { - e = get_weaponinfo(j); - if (!(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)) - if (e.spawnflags & WEP_FLAG_NORMAL) - g_weaponarena_weapons |= WepSet_FromWeapon(j); - } + FOREACH(Weapons, it != WEP_Null, LAMBDA( + if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED)) + if(it.spawnflags & WEP_FLAG_NORMAL) + g_weaponarena_weapons |= (it.m_wepset); + )); } else if (s == "none") { @@ -595,20 +571,14 @@ void readplayerstartcvars() for (i = 0; i < t; ++i) { s = argv(i); - for (j = WEP_FIRST; j <= WEP_LAST; ++j) - { - e = get_weaponinfo(j); - if (e.netname == s) + FOREACH(Weapons, it != WEP_Null, LAMBDA( + if(it.netname == s) { - g_weaponarena_weapons |= WepSet_FromWeapon(j); - g_weaponarena_list = strcat(g_weaponarena_list, e.message, " & "); + g_weaponarena_weapons |= (it.m_wepset); + g_weaponarena_list = strcat(g_weaponarena_list, it.m_name, " & "); break; } - } - if (j > WEP_LAST) - { - LOG_INFO("The weapon mutator list contains an unknown weapon ", s, ". Skipped.\n"); - } + )); } g_weaponarena_list = strzone(substring(g_weaponarena_list, 0, strlen(g_weaponarena_list) - 3)); } @@ -627,17 +597,16 @@ void readplayerstartcvars() } else { - for (i = WEP_FIRST; i <= WEP_LAST; ++i) - { - e = get_weaponinfo(i); - int w = want_weapon(e, false); + FOREACH(Weapons, it != WEP_Null, LAMBDA( + int w = want_weapon(it, false); + WepSet s = it.m_wepset; if(w & 1) - start_weapons |= WepSet_FromWeapon(i); + start_weapons |= s; if(w & 2) - start_weapons_default |= WepSet_FromWeapon(i); + start_weapons_default |= s; if(w & 4) - start_weapons_defaultmask |= WepSet_FromWeapon(i); - } + start_weapons_defaultmask |= s; + )); } if(!cvar("g_use_ammunition")) @@ -689,17 +658,16 @@ void readplayerstartcvars() warmup_start_weapons = '0 0 0'; warmup_start_weapons_default = '0 0 0'; warmup_start_weapons_defaultmask = '0 0 0'; - for (i = WEP_FIRST; i <= WEP_LAST; ++i) - { - e = get_weaponinfo(i); - int w = want_weapon(e, g_warmup_allguns); + FOREACH(Weapons, it != WEP_Null, LAMBDA( + int w = want_weapon(it, g_warmup_allguns); + WepSet s = (it.m_wepset); if(w & 1) - warmup_start_weapons |= WepSet_FromWeapon(i); + warmup_start_weapons |= s; if(w & 2) - warmup_start_weapons_default |= WepSet_FromWeapon(i); + warmup_start_weapons_default |= s; if(w & 4) - warmup_start_weapons_defaultmask |= WepSet_FromWeapon(i); - } + warmup_start_weapons_defaultmask |= s; + )); } } @@ -718,14 +686,10 @@ void readplayerstartcvars() WepSet precache_weapons = start_weapons; if (g_warmup_allguns != 1) precache_weapons |= warmup_start_weapons; - for (i = WEP_FIRST; i <= WEP_LAST; ++i) - { - e = get_weaponinfo(i); - if(precache_weapons & WepSet_FromWeapon(i)) { - Weapon w = get_weaponinfo(i); - w.wr_init(w); - } - } + FOREACH(Weapons, it != WEP_Null, LAMBDA( + if(precache_weapons & (it.m_wepset)) + it.wr_init(it); + )); start_ammo_shells = max(0, start_ammo_shells); start_ammo_nails = max(0, start_ammo_nails); @@ -742,184 +706,6 @@ void readplayerstartcvars() warmup_start_ammo_fuel = max(0, warmup_start_ammo_fuel); } -float sound_allowed(float destin, entity e) -{ - // sounds from world may always pass - for (;;) - { - if (e.classname == "body") - e = e.enemy; - else if (e.realowner && e.realowner != e) - e = e.realowner; - else if (e.owner && e.owner != e) - e = e.owner; - else - break; - } - // sounds to self may always pass - if (destin == MSG_ONE) - if (e == msg_entity) - return true; - // sounds by players can be removed - if (autocvar_bot_sound_monopoly) - if (IS_REAL_CLIENT(e)) - return false; - // anything else may pass - return true; -} - -void soundtoat(float _dest, entity e, vector o, float chan, string samp, float vol, float attenu) -{ - float entno, idx; - - if (!sound_allowed(_dest, e)) - return; - - entno = num_for_edict(e); - idx = precache_sound_index(samp); - - int sflags; - sflags = 0; - - attenu = floor(attenu * 64); - vol = floor(vol * 255); - - if (vol != 255) - sflags |= SND_VOLUME; - if (attenu != 64) - sflags |= SND_ATTENUATION; - if (entno >= 8192 || chan < 0 || chan > 7) - sflags |= SND_LARGEENTITY; - if (idx >= 256) - sflags |= SND_LARGESOUND; - - WriteByte(_dest, SVC_SOUND); - WriteByte(_dest, sflags); - if (sflags & SND_VOLUME) - WriteByte(_dest, vol); - if (sflags & SND_ATTENUATION) - WriteByte(_dest, attenu); - if (sflags & SND_LARGEENTITY) - { - WriteShort(_dest, entno); - WriteByte(_dest, chan); - } - else - { - WriteShort(_dest, entno * 8 + chan); - } - if (sflags & SND_LARGESOUND) - WriteShort(_dest, idx); - else - WriteByte(_dest, idx); - - WriteCoord(_dest, o.x); - WriteCoord(_dest, o.y); - WriteCoord(_dest, o.z); -} -void soundto(float _dest, entity e, float chan, string samp, float vol, float _atten) -{ - vector o; - - if (!sound_allowed(_dest, e)) - return; - - o = e.origin + 0.5 * (e.mins + e.maxs); - soundtoat(_dest, e, o, chan, samp, vol, _atten); -} -void soundat(entity e, vector o, float chan, string samp, float vol, float _atten) -{ - soundtoat(((chan & 8) ? MSG_ALL : MSG_BROADCAST), e, o, chan, samp, vol, _atten); -} -void stopsoundto(float _dest, entity e, float chan) -{ - float entno; - - if (!sound_allowed(_dest, e)) - return; - - entno = num_for_edict(e); - - if (entno >= 8192 || chan < 0 || chan > 7) - { - float idx, sflags; - idx = precache_sound_index(SND(Null)); - sflags = SND_LARGEENTITY; - if (idx >= 256) - sflags |= SND_LARGESOUND; - WriteByte(_dest, SVC_SOUND); - WriteByte(_dest, sflags); - WriteShort(_dest, entno); - WriteByte(_dest, chan); - if (sflags & SND_LARGESOUND) - WriteShort(_dest, idx); - else - WriteByte(_dest, idx); - WriteCoord(_dest, e.origin.x); - WriteCoord(_dest, e.origin.y); - WriteCoord(_dest, e.origin.z); - } - else - { - WriteByte(_dest, SVC_STOPSOUND); - WriteShort(_dest, entno * 8 + chan); - } -} -void stopsound(entity e, float chan) -{ - if (!sound_allowed(MSG_BROADCAST, e)) - return; - - stopsoundto(MSG_BROADCAST, e, chan); // unreliable, gets there fast - stopsoundto(MSG_ALL, e, chan); // in case of packet loss -} - -void play2(entity e, string filename) -{ - //stuffcmd(e, strcat("play2 ", filename, "\n")); - msg_entity = e; - soundtoat(MSG_ONE, world, '0 0 0', CH_INFO, filename, VOL_BASE, ATTEN_NONE); -} - -// use this one if you might be causing spam (e.g. from touch functions that might get called more than once per frame) -.float spamtime; -float spamsound(entity e, float chan, string samp, float vol, float _atten) -{ - if (!sound_allowed(MSG_BROADCAST, e)) - return false; - - if (time > e.spamtime) - { - e.spamtime = time; - _sound(e, chan, samp, vol, _atten); - return true; - } - return false; -} - -void play2team(float t, string filename) -{ - entity head; - - if (autocvar_bot_sound_monopoly) - return; - - FOR_EACH_REALPLAYER(head) - { - if (head.team == t) - play2(head, filename); - } -} - -void play2all(string samp) -{ - if (autocvar_bot_sound_monopoly) - return; - - _sound(world, CH_INFO, samp, VOL_BASE, ATTEN_NONE); -} - -void PrecachePlayerSounds(string f); void precache_playermodel(string m) { float globhandle, i, n; @@ -951,24 +737,24 @@ void precache_playermodel(string m) } void precache_all_playermodels(string pattern) { - float globhandle, i, n; - string f; - - globhandle = search_begin(pattern, true, false); - if (globhandle < 0) - return; - n = search_getsize(globhandle); - for (i = 0; i < n; ++i) + int globhandle = search_begin(pattern, true, false); + if (globhandle < 0) return; + int n = search_getsize(globhandle); + for (int i = 0; i < n; ++i) { - //print(search_getfilename(globhandle, i), "\n"); - f = search_getfilename(globhandle, i); - precache_playermodel(f); + string s = search_getfilename(globhandle, i); + precache_playermodel(s); } search_end(globhandle); } +void precache_playermodels(string s) +{ + FOREACH_WORD(s, true, LAMBDA(precache_playermodel(it))); +} + void precache() -{SELFPARAM(); +{ // gamemode related things // Precache all player models if desired @@ -984,34 +770,13 @@ void precache() if (autocvar_sv_defaultcharacter) { - string s; - s = autocvar_sv_defaultplayermodel_red; - if (s != "") - precache_playermodel(s); - s = autocvar_sv_defaultplayermodel_blue; - if (s != "") - precache_playermodel(s); - s = autocvar_sv_defaultplayermodel_yellow; - if (s != "") - precache_playermodel(s); - s = autocvar_sv_defaultplayermodel_pink; - if (s != "") - precache_playermodel(s); - s = autocvar_sv_defaultplayermodel; - if (s != "") - precache_playermodel(s); - } - - if (g_footsteps) - { - PrecacheGlobalSound((globalsound_step = "misc/footstep0 6")); - PrecacheGlobalSound((globalsound_metalstep = "misc/metalfootstep0 6")); + precache_playermodels(autocvar_sv_defaultplayermodel_red); + precache_playermodels(autocvar_sv_defaultplayermodel_blue); + precache_playermodels(autocvar_sv_defaultplayermodel_yellow); + precache_playermodels(autocvar_sv_defaultplayermodel_pink); + precache_playermodels(autocvar_sv_defaultplayermodel); } - // gore and miscellaneous sounds - PrecacheGlobalSound((globalsound_fall = "misc/hitground 4")); - PrecacheGlobalSound((globalsound_metalfall = "misc/metalhitground 4")); - #if 0 // Disabled this code because it simply does not work (e.g. ignores bgmvolume, overlaps with "cd loop" controlled tracks). @@ -1086,7 +851,7 @@ void remove_safely(entity e) builtin_remove(e); } -void InitializeEntity(entity e, void(void) func, float order) +void InitializeEntity(entity e, void() func, float order) { entity prev, cur; @@ -1145,7 +910,7 @@ void InitializeEntitiesRun() //dprint("Delayed initialization: ", e.classname, "\n"); if (func) { - WITH(entity, self, e, func()); + WITHSELF(e, func()); } else { @@ -1162,7 +927,7 @@ bool EliminatedPlayers_SendEntity(entity this, entity to, float sendflags) { float i, f, b; entity e; - WriteByte(MSG_ENTITY, ENT_CLIENT_ELIMINATEDPLAYERS); + WriteHeader(MSG_ENTITY, ENT_CLIENT_ELIMINATEDPLAYERS); WriteByte(MSG_ENTITY, sendflags); if(sendflags & 1) @@ -1204,21 +969,15 @@ void adaptor_think2touch() void adaptor_think2use() {SELFPARAM(); - entity o, a; - o = other; - a = activator; - activator = world; - other = world; - self.use(); - other = o; - activator = a; + if(this.use1) + this.use1(this, NULL, NULL); } void adaptor_think2use_hittype_splash() // for timed projectile detonation {SELFPARAM(); - if(!(self.flags & FL_ONGROUND)) // if onground, we ARE touching something, but HITTYPE_SPLASH is to be networked if the damage causing projectile is not touching ANYTHING - self.projectiledeathtype |= HITTYPE_SPLASH; - adaptor_think2use(); + if(!(IS_ONGROUND(this))) // if onground, we ARE touching something, but HITTYPE_SPLASH is to be networked if the damage causing projectile is not touching ANYTHING + this.projectiledeathtype |= HITTYPE_SPLASH; + WITHSELF(this, adaptor_think2use()); } // deferred dropping @@ -1293,7 +1052,7 @@ float SUB_NoImpactCheck() if(trace_dphitcontents == 0) { //dprint("A hit happened with zero hit contents... DEBUG THIS, this should never happen for projectiles! Projectile will self-destruct.\n"); - LOG_TRACEF("A hit from a projectile happened with no hit contents! DEBUG THIS, this should never happen for projectiles! Profectile will self-destruct. (edict: %d, classname: %s, origin: %s)\n", num_for_edict(self), self.classname, vtos(self.origin)); + LOG_TRACEF("A hit from a projectile happened with no hit contents! DEBUG THIS, this should never happen for projectiles! Profectile will self-destruct. (edict: %d, classname: %s, origin: %s)\n", etof(self), self.classname, vtos(self.origin)); checkclient(); } if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) @@ -1345,7 +1104,7 @@ float WarpZone_Projectile_Touch_ImpactFilter_Callback() return false; } - +/** engine callback */ void URI_Get_Callback(float id, float status, string data) { if(url_URI_Get_Callback(id, status, data)) @@ -1366,6 +1125,10 @@ void URI_Get_Callback(float id, float status, string data) // online ban list OnlineBanList_URI_Get_Callback(id, status, data); } + else if (MUTATOR_CALLHOOK(URI_GetCallback, id, status, data)) + { + // handled by a mutator + } else { LOG_INFO("Received HTTP request data for an invalid id ", ftos(id), ".\n"); @@ -1384,7 +1147,7 @@ string uid2name(string myuid) { if(s != "") { db_put(ServerProgsDB, strcat("/uid2name/", myuid), s); - db_put(ServerProgsDB, strcat("uid2name", myuid), ""); + db_remove(ServerProgsDB, strcat("uid2name", myuid)); } } @@ -1520,94 +1283,6 @@ void write_recordmarker(entity pl, float tstart, float dt) " ", ftos(tstart), " ", ftos(dt), "\n")); } -vector shotorg_adjustfromclient(vector vecs, float y_is_right, float allowcenter, float algn) -{ - switch(algn) - { - default: - case 3: // right - break; - - case 4: // left - vecs.y = -vecs.y; - break; - - case 1: - if(allowcenter) // 2: allow center handedness - { - // center - vecs.y = 0; - vecs.z -= 2; - } - else - { - // right - } - break; - - case 2: - if(allowcenter) // 2: allow center handedness - { - // center - vecs.y = 0; - vecs.z -= 2; - } - else - { - // left - vecs.y = -vecs.y; - } - break; - } - return vecs; -} - -vector shotorg_adjust_values(vector vecs, float y_is_right, float visual, float algn) -{ - string s; - vector v; - - if (autocvar_g_shootfromeye) - { - if (visual) - { - if (autocvar_g_shootfromclient) { vecs = shotorg_adjustfromclient(vecs, y_is_right, (autocvar_g_shootfromclient >= 2), algn); } - else { vecs.y = 0; vecs.z -= 2; } - } - else - { - vecs.y = 0; - vecs.z = 0; - } - } - else if (autocvar_g_shootfromcenter) - { - vecs.y = 0; - vecs.z -= 2; - } - else if ((s = autocvar_g_shootfromfixedorigin) != "") - { - v = stov(s); - if (y_is_right) - v.y = -v.y; - if (v.x != 0) - vecs.x = v.x; - vecs.y = v.y; - vecs.z = v.z; - } - else if (autocvar_g_shootfromclient) - { - vecs = shotorg_adjustfromclient(vecs, y_is_right, (autocvar_g_shootfromclient >= 2), algn); - } - return vecs; -} - -vector shotorg_adjust(vector vecs, float y_is_right, float visual) -{SELFPARAM(); - return shotorg_adjust_values(vecs, y_is_right, visual, self.owner.cvar_cl_gunalign); -} - - void attach_sameorigin(entity e, entity to, string tag) { vector org, t_forward, t_left, t_up, e_forward, e_up; @@ -1690,151 +1365,6 @@ vector gettaginfo_relative(entity e, float tag) return gettaginfo(gettaginfo_relative_ent, tag); } -.float scale2; - -bool modeleffect_SendEntity(entity this, entity to, int sf) -{ - float f; - WriteByte(MSG_ENTITY, ENT_CLIENT_MODELEFFECT); - - f = 0; - if(self.velocity != '0 0 0') - f |= 1; - if(self.angles != '0 0 0') - f |= 2; - if(self.avelocity != '0 0 0') - f |= 4; - - WriteByte(MSG_ENTITY, f); - WriteShort(MSG_ENTITY, self.modelindex); - WriteByte(MSG_ENTITY, self.skin); - WriteByte(MSG_ENTITY, self.frame); - WriteCoord(MSG_ENTITY, self.origin.x); - WriteCoord(MSG_ENTITY, self.origin.y); - WriteCoord(MSG_ENTITY, self.origin.z); - if(f & 1) - { - WriteCoord(MSG_ENTITY, self.velocity.x); - WriteCoord(MSG_ENTITY, self.velocity.y); - WriteCoord(MSG_ENTITY, self.velocity.z); - } - if(f & 2) - { - WriteCoord(MSG_ENTITY, self.angles.x); - WriteCoord(MSG_ENTITY, self.angles.y); - WriteCoord(MSG_ENTITY, self.angles.z); - } - if(f & 4) - { - WriteCoord(MSG_ENTITY, self.avelocity.x); - WriteCoord(MSG_ENTITY, self.avelocity.y); - WriteCoord(MSG_ENTITY, self.avelocity.z); - } - WriteShort(MSG_ENTITY, self.scale * 256.0); - WriteShort(MSG_ENTITY, self.scale2 * 256.0); - WriteByte(MSG_ENTITY, self.teleport_time * 100.0); - WriteByte(MSG_ENTITY, self.fade_time * 100.0); - WriteByte(MSG_ENTITY, self.alpha * 255.0); - - return true; -} - -void modeleffect_spawn(string m, float s, float f, vector o, vector v, vector ang, vector angv, float s0, float s2, float a, float t1, float t2) -{ - entity e; - float sz; - e = spawn(); - e.classname = "modeleffect"; - _setmodel(e, m); - e.frame = f; - setorigin(e, o); - e.velocity = v; - e.angles = ang; - e.avelocity = angv; - e.alpha = a; - e.teleport_time = t1; - e.fade_time = t2; - e.skin = s; - if(s0 >= 0) - e.scale = s0 / max6(-e.mins.x, -e.mins.y, -e.mins.z, e.maxs.x, e.maxs.y, e.maxs.z); - else - e.scale = -s0; - if(s2 >= 0) - e.scale2 = s2 / max6(-e.mins.x, -e.mins.y, -e.mins.z, e.maxs.x, e.maxs.y, e.maxs.z); - else - e.scale2 = -s2; - sz = max(e.scale, e.scale2); - setsize(e, e.mins * sz, e.maxs * sz); - Net_LinkEntity(e, false, 0.1, modeleffect_SendEntity); -} - -void shockwave_spawn(string m, vector org, float sz, float t1, float t2) -{ - return modeleffect_spawn(m, 0, 0, org, '0 0 0', '0 0 0', '0 0 0', 0, sz, 1, t1, t2); -} - -float randombit(float bits) -{ - if(!(bits & (bits-1))) // this ONLY holds for powers of two! - return bits; - - float n, f, b, r; - - r = random(); - b = 0; - n = 0; - - for(f = 1; f <= bits; f *= 2) - { - if(bits & f) - { - ++n; - r *= n; - if(r <= 1) - b = f; - else - r = (r - 1) / (n - 1); - } - } - - return b; -} - -float randombits(float bits, float k, float error_return) -{ - float r; - r = 0; - while(k > 0 && bits != r) - { - r += randombit(bits - r); - --k; - } - if(error_return) - if(k > 0) - return -1; // all - return r; -} - -void randombit_test(float bits, float iter) -{ - while(iter > 0) - { - LOG_INFO(ftos(randombit(bits)), "\n"); - --iter; - } -} - -float ExponentialFalloff(float mindist, float maxdist, float halflifedist, float d) -{ - if(halflifedist > 0) - return pow(0.5, (bound(mindist, d, maxdist) - mindist) / halflifedist); - else if(halflifedist < 0) - return pow(0.5, (bound(mindist, d, maxdist) - maxdist) / halflifedist); - else - return 1; -} - - .string aiment_classname; .float aiment_deadflag; void SetMovetypeFollow(entity ent, entity e) @@ -1872,7 +1402,8 @@ float LostMovetypeFollow(entity ent) return 0; } -float isPushable(entity e) +.bool pushable; +bool isPushable(entity e) { if(e.pushable) return true;