X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=7e9cf5eef9710b93890ffa4d4da004db3116087f;hp=d6d3c63b6f30c148e33b0d04a2449598a4ca2b7b;hb=275db1b1d382ef40155eeb44fae62ae5f1087029;hpb=854f8fb6d20e83b886e0561b1137b983fa361399

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index d6d3c63b6f..7e9cf5eef9 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -16,6 +16,7 @@
 #include "../common/command/_mod.qh"
 #include "../common/constants.qh"
 #include <common/net_linked.qh>
+#include <common/weapons/weapon/crylink.qh>
 #include "../common/deathtypes/all.qh"
 #include "../common/mapinfo.qh"
 #include "../common/notifications/all.qh"
@@ -39,29 +40,38 @@ void crosshair_trace(entity pl)
 {
 	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));
 }
-.bool ctrace_solidchanged;
+
 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,
 	{
 		if(it.model != "")
 		{
 			it.solid = SOLID_BSP;
-			it.ctrace_solidchanged = true;
 			IL_PUSH(g_ctrace_changed, it);
 		}
 	});
 
-	crosshair_trace(pl);
+	if (is_wz)
+		WarpZone_crosshair_trace(pl);
+	else
+		crosshair_trace(pl);
 
-	IL_EACH(g_ctrace_changed, it.ctrace_solidchanged,
-	{
-		it.solid = SOLID_TRIGGER;
-		it.ctrace_solidchanged = false;
-	});
+	IL_EACH(g_ctrace_changed, true, { it.solid = SOLID_TRIGGER; });
 
 	IL_CLEAR(g_ctrace_changed);
 }
+
 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));
@@ -208,12 +218,12 @@ 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;
 }
@@ -222,16 +232,13 @@ string formatmessage(entity this, string msg)
 {
 	float p, p1, p2;
 	float n;
-	vector cursor;
-	entity cursor_ent;
+	vector cursor = '0 0 0';
+	entity cursor_ent = NULL;
 	string escape;
 	string replacement;
 	p = 0;
 	n = 7;
-
-	WarpZone_crosshair_trace(this);
-	cursor = trace_endpos;
-	cursor_ent = trace_ent;
+	bool traced = false;
 
 	MUTATOR_CALLHOOK(PreFormatMessage, this, msg);
 	msg = M_ARGV(1, string);
@@ -255,6 +262,14 @@ string formatmessage(entity this, string msg)
 		if (p < 0)
 			break;
 
+		if(!traced)
+		{
+			WarpZone_crosshair_trace_plusvisibletriggers(this);
+			cursor = trace_endpos;
+			cursor_ent = trace_ent;
+			traced = true;
+		}
+
 		replacement = substring(msg, p, 2);
 		escape = substring(msg, p + 1, 1);
 
@@ -265,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(this.armorvalue)); break;
-			case "h": replacement = ftos(floor(this.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;
@@ -401,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
  */
@@ -478,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);
 
@@ -492,7 +508,7 @@ float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still ne
 
 	float t = weaponinfo.weaponstartoverride;
 
-	//print(strcat("want_weapon: ", weaponinfo.netname, " - d: ", ftos(d), ", t: ", ftos(t), ". \n"));
+	//LOG_INFOF("want_weapon: %s - d: %d t: %d\n", weaponinfo.netname, d, t);
 
 	// bit order in t:
 	// 1: want or not
@@ -506,10 +522,97 @@ float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still ne
 	return t;
 }
 
+/// Weapons the player normally starts with outside weapon arena.
+WepSet weapons_start()
+{
+	WepSet ret = '0 0 0';
+	FOREACH(Weapons, it != WEP_Null, {
+		int w = want_weapon(it, false); // TODO too complicated? see my MR, test CTS/courtfun - ballstealer
+		if(w & 1)
+			ret |= it.m_wepset;
+	});
+	return ret;
+}
+
+WepSet weapons_all()
+{
+	WepSet ret = '0 0 0';
+	FOREACH(Weapons, it != WEP_Null, {
+		if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED))
+			ret |= it.m_wepset;
+	});
+	return ret;
+}
+
+WepSet weapons_devall()
+{
+	WepSet ret = '0 0 0';
+	FOREACH(Weapons, it != WEP_Null,
+	{
+		ret |= it.m_wepset;
+	});
+	return ret;
+}
+
+WepSet weapons_most()
+{
+	WepSet ret = '0 0 0';
+	FOREACH(Weapons, it != WEP_Null, {
+		if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && (it.spawnflags & WEP_FLAG_NORMAL) && !(it.spawnflags & WEP_FLAG_HIDDEN))
+			ret |= it.m_wepset;
+	});
+	return ret;
+}
+
+void weaponarena_available_all_update(entity this)
+{
+	LOG_INFOF("weaponarena_available_all_update %v\n", weaponsInMapAll);
+
+	if (weaponsInMapAll)
+	{
+		start_weapons = warmup_start_weapons = g_weaponarena_weapons = weapons_start() | (weaponsInMapAll & weapons_all());
+	}
+	else
+	{
+		// if no weapons are available on the map, just fall back to all weapons arena
+		start_weapons = warmup_start_weapons = g_weaponarena_weapons = weapons_all();
+	}
+}
+
+void weaponarena_available_devall_update(entity this)
+{
+	LOG_INFOF("weaponarena_available_devall_update %v\n", weaponsInMapAll);
+
+	if (weaponsInMapAll)
+	{
+		start_weapons = warmup_start_weapons = g_weaponarena_weapons = weapons_start() | weaponsInMapAll;
+	}
+	else
+	{
+		// if no weapons are available on the map, just fall back to devall weapons arena
+		start_weapons = warmup_start_weapons = g_weaponarena_weapons = weapons_devall();
+	}
+}
+
+void weaponarena_available_most_update(entity this) // TODO cleanup
+{
+	LOG_INFOF("weaponarena_available_most_update %v\n", weaponsInMapAll);
+
+	if (weaponsInMapAll)
+	{
+		start_weapons = warmup_start_weapons = g_weaponarena_weapons = weapons_start() | (weaponsInMapAll & weapons_most());
+	}
+	else
+	{
+		// if no weapons are available on the map, just fall back to most weapons arena
+		start_weapons = warmup_start_weapons = g_weaponarena_weapons = weapons_most();
+	}
+}
+
 void readplayerstartcvars()
 {
+	LOG_INFOF("readplayerstartcvars\n");
 	float i, t;
-	string s;
 
 	// initialize starting values for players
 	start_weapons = '0 0 0';
@@ -531,16 +634,17 @@ void readplayerstartcvars()
 	g_weaponarena = 0;
 	g_weaponarena_weapons = '0 0 0';
 
-	s = cvar_string("g_weaponarena");
+	string s = cvar_string("g_weaponarena");
 
 	MUTATOR_CALLHOOK(SetWeaponArena, s);
 	s = M_ARGV(0, string);
+	LOG_INFOF("arena: %s", s);
 
 	if (s == "0" || s == "")
 	{
 		// no arena
 	}
-	else if (s == "off")
+	else if (s == "off") // TODO remove? CA and others don't respect this
 	{
 		// forcibly turn off weaponarena
 	}
@@ -548,29 +652,43 @@ void readplayerstartcvars()
 	{
 		g_weaponarena = 1;
 		g_weaponarena_list = "All Weapons";
-		FOREACH(Weapons, it != WEP_Null, {
-			if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED))
-				g_weaponarena_weapons |= (it.m_wepset);
-		});
+		g_weaponarena_weapons = weapons_all();
 	}
 	else if (s == "devall")
 	{
 		g_weaponarena = 1;
-		g_weaponarena_list = "All Weapons"; // TODO: report as more than just all weapons?
-		FOREACH(Weapons, it != WEP_Null,
-		{
-			g_weaponarena_weapons |= (it.m_wepset);
-		});
+		g_weaponarena_list = "Dev All Weapons";
+		g_weaponarena_weapons = weapons_devall();
 	}
 	else if (s == "most")
 	{
 		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);
-		});
+		g_weaponarena_weapons = weapons_most();
+	}
+	else if (s == "all_available")
+	{
+		g_weaponarena = 1;
+		g_weaponarena_list = "All Available Weapons";
+
+		// this needs to run after weaponsInMapAll is initialized
+		InitializeEntity(NULL, weaponarena_available_all_update, INITPRIO_FINDTARGET);
+	}
+	else if (s == "devall_available")
+	{
+		g_weaponarena = 1;
+		g_weaponarena_list = "Dev All Available Weapons";
+
+		// this needs to run after weaponsInMapAll is initialized
+		InitializeEntity(NULL, weaponarena_available_devall_update, INITPRIO_FINDTARGET);
+	}
+	else if (s == "most_available")
+	{
+		g_weaponarena = 1;
+		g_weaponarena_list = "Most Available Weapons";
+
+		// this needs to run after weaponsInMapAll is initialized
+		InitializeEntity(NULL, weaponarena_available_most_update, INITPRIO_FINDTARGET);
 	}
 	else if (s == "none")
 	{
@@ -585,14 +703,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));
 	}
@@ -617,6 +733,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;
 
@@ -638,19 +757,19 @@ 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"));
 	}
 
-	if (warmup_stage)
+	if (warmup_stage && !g_ca && !g_freezetag) // TODO remove?
 	{
 		warmup_start_ammo_shells = start_ammo_shells;
 		warmup_start_ammo_nails = start_ammo_nails;
@@ -664,7 +783,7 @@ void readplayerstartcvars()
 		warmup_start_weapons_default = start_weapons_default;
 		warmup_start_weapons_defaultmask = start_weapons_defaultmask;
 
-		if (!g_weaponarena && !g_ca && !g_freezetag)
+		if (!g_weaponarena)
 		{
 			warmup_start_ammo_shells = cvar("g_warmup_start_ammo_shells");
 			warmup_start_ammo_nails = cvar("g_warmup_start_ammo_nails");
@@ -702,30 +821,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);
@@ -740,9 +851,9 @@ void precache_playermodel(string m)
 	float globhandle, i, n;
 	string f;
 
-	if(substring(m, -9,5) == "_lod1")
+	if(substring(m, -9, 5) == "_lod1")
 		return;
-	if(substring(m, -9,5) == "_lod2")
+	if(substring(m, -9, 5) == "_lod2")
 		return;
 	precache_model(m);
 	f = strcat(substring(m, 0, -5), "_lod1", substring(m, -4, -1));
@@ -874,7 +985,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;
 
@@ -1059,7 +1170,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;
@@ -1085,7 +1196,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))