X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=167a75ae2c371ad5e833099cc962ada6889affac;hb=df33af4f3b2347ecf28f744da7a2814c004b57cb;hp=11d7a8b5c04e12f8e42d2ec5603ce4120ba85bd0;hpb=af72d0b3442c3168d1a537afc015ef92b448c503;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 11d7a8b5c..167a75ae2 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -42,6 +42,16 @@ void crosshair_trace(entity pl) } void crosshair_trace_plusvisibletriggers(entity pl) +{ + crosshair_trace_plusvisibletriggers__is_wz(pl, false); +} + +void WarpZone_crosshair_trace_plusvisibletriggers(entity pl) +{ + crosshair_trace_plusvisibletriggers__is_wz(pl, true); +} + +void crosshair_trace_plusvisibletriggers__is_wz(entity pl, bool is_wz) { FOREACH_ENTITY_FLOAT(solid, SOLID_TRIGGER, { @@ -52,7 +62,10 @@ void crosshair_trace_plusvisibletriggers(entity pl) } }); - crosshair_trace(pl); + if (is_wz) + WarpZone_crosshair_trace(pl); + else + crosshair_trace(pl); IL_EACH(g_ctrace_changed, true, { it.solid = SOLID_TRIGGER; }); @@ -205,17 +218,16 @@ string AmmoNameFromWeaponentity(Weapon wep) string ammoitems = "batteries"; switch (wep.ammo_type) { - 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; + case RES_SHELLS: ammoitems = ITEM_Shells.m_name; break; + case RES_BULLETS: ammoitems = ITEM_Bullets.m_name; break; + case RES_ROCKETS: ammoitems = ITEM_Rockets.m_name; break; + case RES_CELLS: ammoitems = ITEM_Cells.m_name; break; + case RES_PLASMA: ammoitems = ITEM_Plasma.m_name; break; + case RES_FUEL: ammoitems = ITEM_JetpackFuel.m_name; break; } return ammoitems; } -.int solid_prev; string formatmessage(entity this, string msg) { float p, p1, p2; @@ -252,17 +264,7 @@ string formatmessage(entity this, string msg) if(!traced) { - IL_EACH(g_items, true, - { - it.solid_prev = it.solid; - it.solid = SOLID_BSP; - }); - WarpZone_crosshair_trace(this); - IL_EACH(g_items, true, - { - it.solid = it.solid_prev; - it.solid_prev = 0; - }); + WarpZone_crosshair_trace_plusvisibletriggers(this); cursor = trace_endpos; cursor_ent = trace_ent; traced = true; @@ -278,8 +280,8 @@ string formatmessage(entity this, string msg) case "%": replacement = "%"; break; case "\\":replacement = "\\"; break; case "n": replacement = "\n"; break; - case "a": replacement = ftos(floor(GetResourceAmount(this, RESOURCE_ARMOR))); break; - case "h": replacement = ftos(floor(GetResourceAmount(this, RESOURCE_HEALTH))); break; + case "a": replacement = ftos(floor(GetResource(this, RES_ARMOR))); break; + case "h": replacement = ftos(floor(GetResource(this, RES_HEALTH))); break; case "l": replacement = NearestLocation(this.origin); break; case "y": replacement = NearestLocation(cursor); break; case "d": replacement = NearestLocation(this.death_origin); break; @@ -414,6 +416,12 @@ REPLICATE(cvar_cl_weaponimpulsemode, int, "cl_weaponimpulsemode"); REPLICATE(cvar_g_xonoticversion, string, "g_xonoticversion"); +REPLICATE(cvar_cl_cts_noautoswitch, bool, "cl_cts_noautoswitch"); + +REPLICATE(cvar_cl_weapon_switch_reload, bool, "cl_weapon_switch_reload"); + +REPLICATE(cvar_cl_weapon_switch_fallback_to_impulse, bool, "cl_weapon_switch_fallback_to_impulse"); + /** * @param f -1: cleanup, 0: request, 1: receive */ @@ -491,12 +499,7 @@ float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still ne allow_mutatorblocked = M_ARGV(3, bool); if(allguns) - { - if(weaponinfo.spawnflags & WEP_FLAG_NORMAL) - d = true; - else - d = false; - } + d = boolean((weaponinfo.spawnflags & WEP_FLAG_NORMAL) && !(weaponinfo.spawnflags & WEP_FLAG_HIDDEN)); else if(!mutator_returnvalue) d = !(!weaponinfo.weaponstart); @@ -580,9 +583,8 @@ void readplayerstartcvars() g_weaponarena = 1; g_weaponarena_list = "Most Weapons"; FOREACH(Weapons, it != WEP_Null, { - if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED)) - if(it.spawnflags & WEP_FLAG_NORMAL) - g_weaponarena_weapons |= (it.m_wepset); + if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && (it.spawnflags & WEP_FLAG_NORMAL) && !(it.spawnflags & WEP_FLAG_HIDDEN)) + g_weaponarena_weapons |= (it.m_wepset); }); } else if (s == "none") @@ -598,14 +600,12 @@ void readplayerstartcvars() for (i = 0; i < t; ++i) { s = argv(i); - FOREACH(Weapons, it != WEP_Null, { - if(it.netname == s) - { - g_weaponarena_weapons |= (it.m_wepset); - g_weaponarena_list = strcat(g_weaponarena_list, it.m_name, " & "); - break; - } - }); + Weapon wep = Weapons_fromstr(s); + if(wep != WEP_Null) + { + g_weaponarena_weapons |= (wep.m_wepset); + g_weaponarena_list = strcat(g_weaponarena_list, wep.m_name, " & "); + } } g_weaponarena_list = strzone(substring(g_weaponarena_list, 0, strlen(g_weaponarena_list) - 3)); } @@ -630,6 +630,9 @@ void readplayerstartcvars() }); } + if(cvar("g_balance_superweapons_time") < 0) + start_items |= IT_UNLIMITED_SUPERWEAPONS; + if(!cvar("g_use_ammunition")) start_items |= IT_UNLIMITED_AMMO; @@ -651,15 +654,15 @@ void readplayerstartcvars() 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( + SetResource(random_start_ammo, RES_SHELLS, cvar( "g_random_start_shells")); - SetResourceAmount(random_start_ammo, RESOURCE_BULLETS, cvar( + SetResource(random_start_ammo, RES_BULLETS, cvar( "g_random_start_bullets")); - SetResourceAmount(random_start_ammo, RESOURCE_ROCKETS, + SetResource(random_start_ammo, RES_ROCKETS, cvar("g_random_start_rockets")); - SetResourceAmount(random_start_ammo, RESOURCE_CELLS, cvar( + SetResource(random_start_ammo, RES_CELLS, cvar( "g_random_start_cells")); - SetResourceAmount(random_start_ammo, RESOURCE_PLASMA, cvar( + SetResource(random_start_ammo, RES_PLASMA, cvar( "g_random_start_plasma")); } @@ -715,30 +718,22 @@ void readplayerstartcvars() warmup_start_ammo_fuel = max(warmup_start_ammo_fuel, cvar("g_balance_fuel_rotstable")); } - WepSet precache_weapons = start_weapons; - if (g_warmup_allguns != 1) - precache_weapons |= warmup_start_weapons; - FOREACH(Weapons, it != WEP_Null, { - 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); start_ammo_rockets = max(0, start_ammo_rockets); 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))); + SetResource(random_start_ammo, RES_SHELLS, max(0, + GetResource(random_start_ammo, RES_SHELLS))); + SetResource(random_start_ammo, RES_BULLETS, max(0, + GetResource(random_start_ammo, RES_BULLETS))); + SetResource(random_start_ammo, RES_ROCKETS, max(0, + GetResource(random_start_ammo, RES_ROCKETS))); + SetResource(random_start_ammo, RES_CELLS, max(0, + GetResource(random_start_ammo, RES_CELLS))); + SetResource(random_start_ammo, RES_PLASMA, max(0, + GetResource(random_start_ammo, RES_PLASMA))); warmup_start_ammo_shells = max(0, warmup_start_ammo_shells); warmup_start_ammo_nails = max(0, warmup_start_ammo_nails); @@ -887,7 +882,7 @@ void remove_safely(entity e) builtin_remove(e); } -void InitializeEntity(entity e, void(entity this) func, float order) +void InitializeEntity(entity e, void(entity this) func, int order) { entity prev, cur;