X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=319b6f16ff7e3c7c333d8fb3a67e2b360eefbde8;hb=879dac5094b8eb7890fb5fd970f822da31ee242f;hp=554da5f804bbaa2b35a633053b5c3a9c1bd55fa3;hpb=ef456a7e36afd5c8279bb91a7d295b9b3fcd94c7;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 554da5f80..319b6f16f 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -5,20 +5,24 @@ #include "constants.qh" #include "g_hook.qh" #include "ipban.qh" -#include "mutators/_mod.qh" +#include #include "../common/t_items.qh" +#include "resources.qh" +#include "items.qh" +#include "player.qh" #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" #include "weapons/selection.qh" #include "../common/command/_mod.qh" #include "../common/constants.qh" #include +#include #include "../common/deathtypes/all.qh" #include "../common/mapinfo.qh" #include "../common/notifications/all.qh" #include "../common/playerstats.qh" #include "../common/teams.qh" -#include "../common/triggers/subs.qh" +#include "../common/mapobjects/subs.qh" #include "../common/util.qh" #include "../common/turrets/sv_turrets.qh" #include @@ -64,6 +68,10 @@ void WarpZone_crosshair_trace(entity pl) WarpZone_traceline_antilag(pl, CS(pl).cursor_trace_start, CS(pl).cursor_trace_start + normalize(CS(pl).cursor_trace_endpos - CS(pl).cursor_trace_start) * max_shot_distance, MOVE_NORMAL, pl, ANTILAG_LATENCY(pl)); } +void dedicated_print(string input) +{ + if (server_is_dedicated) print(input); +} void GameLogEcho(string s) { @@ -196,17 +204,17 @@ string NearestLocation(vector p) return ret; } -string AmmoNameFromWeaponentity(entity wpn) +string AmmoNameFromWeaponentity(Weapon wep) { string ammoitems = "batteries"; - switch((wpn.m_weapon).ammo_field) + switch (wep.ammo_type) { - case ammo_shells: ammoitems = ITEM_Shells.m_name; break; - case ammo_nails: ammoitems = ITEM_Bullets.m_name; break; - case ammo_rockets: ammoitems = ITEM_Rockets.m_name; break; - case ammo_cells: ammoitems = ITEM_Cells.m_name; break; - case ammo_plasma: ammoitems = ITEM_Plasma.m_name; break; - case ammo_fuel: ammoitems = ITEM_JetpackFuel.m_name; break; + case RESOURCE_SHELLS: ammoitems = ITEM_Shells.m_name; break; + case RESOURCE_BULLETS: ammoitems = ITEM_Bullets.m_name; break; + case RESOURCE_ROCKETS: ammoitems = ITEM_Rockets.m_name; break; + case RESOURCE_CELLS: ammoitems = ITEM_Cells.m_name; break; + case RESOURCE_PLASMA: ammoitems = ITEM_Plasma.m_name; break; + case RESOURCE_FUEL: ammoitems = ITEM_JetpackFuel.m_name; break; } return ammoitems; } @@ -258,13 +266,13 @@ string formatmessage(entity this, string msg) case "%": replacement = "%"; break; case "\\":replacement = "\\"; break; case "n": replacement = "\n"; break; - case "a": replacement = ftos(floor(this.armorvalue)); break; - case "h": replacement = ftos(floor(this.health)); break; + case "a": replacement = ftos(floor(GetResourceAmount(this, RESOURCE_ARMOR))); break; + case "h": replacement = ftos(floor(GetResourceAmount(this, RESOURCE_HEALTH))); break; case "l": replacement = NearestLocation(this.origin); break; case "y": replacement = NearestLocation(cursor); break; case "d": replacement = NearestLocation(this.death_origin); break; case "w": replacement = ((this.(weaponentity).m_weapon == WEP_Null) ? ((this.(weaponentity).m_switchweapon == WEP_Null) ? Weapons_from(this.(weaponentity).cnt) : this.(weaponentity).m_switchweapon) : this.(weaponentity).m_weapon).m_name; break; - case "W": replacement = AmmoNameFromWeaponentity(this.(weaponentity)); break; + case "W": replacement = AmmoNameFromWeaponentity(this.(weaponentity).m_weapon); break; case "x": replacement = ((cursor_ent.netname == "" || !cursor_ent) ? "nothing" : cursor_ent.netname); break; case "s": replacement = ftos(vlen(this.velocity - this.velocity_z * '0 0 1')); break; case "S": replacement = ftos(vlen(this.velocity)); break; @@ -296,17 +304,13 @@ void GetCvars_handleString(entity this, entity store, string thisname, float f, { if (f < 0) { - if (store.(field)) - strunzone(store.(field)); - store.(field) = string_null; + strfree(store.(field)); } else if (f > 0) { if (thisname == name) { - if (store.(field)) - strunzone(store.(field)); - store.(field) = strzone(argv(f + 1)); + strcpy(store.(field), argv(f + 1)); } } else @@ -321,8 +325,7 @@ void GetCvars_handleString_Fixup(entity this, entity store, string thisname, flo string s = func(this, strcat1(store.(field))); if (s != store.(field)) { - strunzone(store.(field)); - store.(field) = strzone(s); + strcpy(store.(field), s); } } } @@ -364,14 +367,8 @@ void GetCvars_handleFloatOnce(entity this, entity store, string thisname, float } string W_FixWeaponOrder_ForceComplete_AndBuildImpulseList(entity this, string wo) { - string o; - o = W_FixWeaponOrder_ForceComplete(wo); - if(this.weaponorder_byimpulse) - { - strunzone(this.weaponorder_byimpulse); - this.weaponorder_byimpulse = string_null; - } - this.weaponorder_byimpulse = strzone(W_FixWeaponOrder_BuildImpulseList(o)); + string o = W_FixWeaponOrder_ForceComplete(wo); + strcpy(CS(this).weaponorder_byimpulse, W_FixWeaponOrder_BuildImpulseList(o)); return o; } @@ -525,6 +522,10 @@ void readplayerstartcvars() start_ammo_rockets = 0; start_ammo_cells = 0; start_ammo_plasma = 0; + if (random_start_ammo == NULL) + { + random_start_ammo = spawn(); + } start_health = cvar("g_balance_health_start"); start_armorvalue = cvar("g_balance_armor_start"); @@ -597,12 +598,6 @@ void readplayerstartcvars() g_weaponarena_list = strzone(substring(g_weaponarena_list, 0, strlen(g_weaponarena_list) - 3)); } - if(g_weaponarena) - g_weaponarena_random = cvar("g_weaponarena_random"); - else - g_weaponarena_random = 0; - g_weaponarena_random_with_blaster = cvar("g_weaponarena_random_with_blaster"); - if (g_weaponarena) { g_weapon_stay = 0; // incompatible @@ -643,6 +638,17 @@ void readplayerstartcvars() start_ammo_cells = cvar("g_start_ammo_cells"); start_ammo_plasma = cvar("g_start_ammo_plasma"); start_ammo_fuel = cvar("g_start_ammo_fuel"); + random_start_weapons_count = cvar("g_random_start_weapons_count"); + SetResourceAmount(random_start_ammo, RESOURCE_SHELLS, cvar( + "g_random_start_shells")); + SetResourceAmount(random_start_ammo, RESOURCE_BULLETS, cvar( + "g_random_start_bullets")); + SetResourceAmount(random_start_ammo, RESOURCE_ROCKETS, + cvar("g_random_start_rockets")); + SetResourceAmount(random_start_ammo, RESOURCE_CELLS, cvar( + "g_random_start_cells")); + SetResourceAmount(random_start_ammo, RESOURCE_PLASMA, cvar( + "g_random_start_plasma")); } if (warmup_stage) @@ -711,6 +717,16 @@ void readplayerstartcvars() start_ammo_cells = max(0, start_ammo_cells); start_ammo_plasma = max(0, start_ammo_plasma); start_ammo_fuel = max(0, start_ammo_fuel); + SetResourceAmount(random_start_ammo, RESOURCE_SHELLS, max(0, + GetResourceAmount(random_start_ammo, RESOURCE_SHELLS))); + SetResourceAmount(random_start_ammo, RESOURCE_BULLETS, max(0, + GetResourceAmount(random_start_ammo, RESOURCE_BULLETS))); + SetResourceAmount(random_start_ammo, RESOURCE_ROCKETS, max(0, + GetResourceAmount(random_start_ammo, RESOURCE_ROCKETS))); + SetResourceAmount(random_start_ammo, RESOURCE_CELLS, max(0, + GetResourceAmount(random_start_ammo, RESOURCE_CELLS))); + SetResourceAmount(random_start_ammo, RESOURCE_PLASMA, max(0, + GetResourceAmount(random_start_ammo, RESOURCE_PLASMA))); warmup_start_ammo_shells = max(0, warmup_start_ammo_shells); warmup_start_ammo_nails = max(0, warmup_start_ammo_nails); @@ -1044,7 +1060,7 @@ bool SUB_NoImpactCheck(entity this, entity toucher) if(trace_dphitcontents == 0) { LOG_TRACEF("A hit from a projectile happened with no hit contents! DEBUG THIS, this should never happen for projectiles! Projectile will self-destruct. (edict: %i, classname: %s, origin: %v)", this, this.classname, this.origin); - checkclient(this); + checkclient(this); // TODO: .health is checked in the engine with this, possibly replace with a QC function? } if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) return true; @@ -1070,7 +1086,6 @@ bool SUB_NoImpactCheck(entity this, entity toucher) #define SUB_OwnerCheck(ent,oth) ((oth) && ((oth) == (ent).owner)) -void W_Crylink_Dequeue(entity e); bool WarpZone_Projectile_Touch_ImpactFilter_Callback(entity this, entity toucher) { if(SUB_OwnerCheck(this, toucher)) @@ -1217,6 +1232,7 @@ float MoveToRandomLocationWithinBounds(entity e, vector boundmin, vector boundma }); if(!sp) { + int items_checked = 0; IL_EACH(g_items, checkpvs(mstart, it), { if((traceline(mstart, it.origin + (it.mins + it.maxs) * 0.5, MOVE_NORMAL, e), trace_fraction) >= 1) @@ -1224,6 +1240,10 @@ float MoveToRandomLocationWithinBounds(entity e, vector boundmin, vector boundma sp = it; break; } + + ++items_checked; + if(items_checked >= attempts) + break; // sanity }); if(!sp) @@ -1411,10 +1431,13 @@ bool isPushable(entity e) return false; if(e.iscreature) return true; + if (Item_IsLoot(e)) + { + return true; + } switch(e.classname) { case "body": - case "droppedweapon": return true; case "bullet": // antilagged bullets can't hit this either return false;