X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=b4e9ad1f2b9b09d74c12c604361058e8734851a4;hp=ef05b5a5b6ccc4fa647c7b13d724e96592dacab6;hb=97e94ea0a05686d60a6f5de8d369d040005b8eb1;hpb=8ece2525b0ef31c747f8e0913d6d7ce1307b147b

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index ef05b5a5b..b4e9ad1f2 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -79,9 +79,9 @@ float DistributeEvenly_GetRandomized(float weight)
 
 #define move_out_of_solid(e) WarpZoneLib_MoveOutOfSolid(e)
 
-string STR_PLAYER = "player";
-string STR_SPECTATOR = "spectator";
-string STR_OBSERVER = "observer";
+const string STR_PLAYER = "player";
+const string STR_SPECTATOR = "spectator";
+const string STR_OBSERVER = "observer";
 
 #define IS_PLAYER(v) 			(v.classname == STR_PLAYER)
 #define IS_SPEC(v) 				(v.classname == STR_SPECTATOR)
@@ -178,7 +178,7 @@ float strstr(string haystack, string needle, float offset)
 }
 */
 
-float NUM_NEAREST_ENTITIES = 4;
+const float NUM_NEAREST_ENTITIES = 4;
 entity nearest_entity[NUM_NEAREST_ENTITIES];
 float nearest_length[NUM_NEAREST_ENTITIES];
 entity findnearest(vector point, .string field, string value, vector axismod)
@@ -591,7 +591,7 @@ float g_pickup_healthmega_anyway;
 float g_pickup_ammo_anyway;
 float g_pickup_weapons_anyway;
 float g_weaponarena;
-WEPSET_DECLARE_A(g_weaponarena_weapons);
+WepSet g_weaponarena_weapons;
 float g_weaponarena_random;
 float g_weaponarena_random_with_laser;
 string g_weaponarena_list;
@@ -601,9 +601,9 @@ float g_weapondamagefactor;
 float g_weaponforcefactor;
 float g_weaponspreadfactor;
 
-WEPSET_DECLARE_A(start_weapons);
-WEPSET_DECLARE_A(start_weapons_default);
-WEPSET_DECLARE_A(start_weapons_defaultmask);
+WepSet start_weapons;
+WepSet start_weapons_default;
+WepSet start_weapons_defaultmask;
 float start_items;
 float start_ammo_shells;
 float start_ammo_nails;
@@ -612,9 +612,9 @@ float start_ammo_cells;
 float start_ammo_fuel;
 float start_health;
 float start_armorvalue;
-WEPSET_DECLARE_A(warmup_start_weapons);
-WEPSET_DECLARE_A(warmup_start_weapons_default);
-WEPSET_DECLARE_A(warmup_start_weapons_defaultmask);
+WepSet warmup_start_weapons;
+WepSet warmup_start_weapons_default;
+WepSet warmup_start_weapons_defaultmask;
 float warmup_start_ammo_shells;
 float warmup_start_ammo_nails;
 float warmup_start_ammo_rockets;
@@ -676,9 +676,9 @@ void readplayerstartcvars()
 	string s;
 
 	// initialize starting values for players
-	WEPSET_CLEAR_A(start_weapons);
-	WEPSET_CLEAR_A(start_weapons_default);
-	WEPSET_CLEAR_A(start_weapons_defaultmask);
+	start_weapons = '0 0 0';
+	start_weapons_default = '0 0 0';
+	start_weapons_defaultmask = '0 0 0';
 	start_items = 0;
 	start_ammo_shells = 0;
 	start_ammo_nails = 0;
@@ -688,7 +688,7 @@ void readplayerstartcvars()
 	start_armorvalue = cvar("g_balance_armor_start");
 
 	g_weaponarena = 0;
-	WEPSET_CLEAR_A(g_weaponarena_weapons);
+	g_weaponarena_weapons = '0 0 0';
 
 	s = cvar_string("g_weaponarena");
 	if (s == "0" || s == "")
@@ -713,7 +713,7 @@ void readplayerstartcvars()
 		{
 			e = get_weaponinfo(j);
 			if not(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
-				WEPSET_OR_AW(g_weaponarena_weapons, j);
+				g_weaponarena_weapons |= WepSet_FromWeapon(j);
 		}
 	}
 	else if (s == "most")
@@ -725,7 +725,7 @@ void readplayerstartcvars()
 			e = get_weaponinfo(j);
 			if not(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
 				if (e.spawnflags & WEP_FLAG_NORMAL)
-					WEPSET_OR_AW(g_weaponarena_weapons, j);
+					g_weaponarena_weapons |= WepSet_FromWeapon(j);
 		}
 	}
 	else if (s == "none")
@@ -746,7 +746,7 @@ void readplayerstartcvars()
 				e = get_weaponinfo(j);
 				if (e.netname == s)
 				{
-					WEPSET_OR_AW(g_weaponarena_weapons, j);
+					g_weaponarena_weapons |= WepSet_FromWeapon(j);
 					g_weaponarena_list = strcat(g_weaponarena_list, e.message, " & ");
 					break;
 				}
@@ -768,7 +768,7 @@ void readplayerstartcvars()
 	if (g_weaponarena)
 	{
 		g_weapon_stay = 0; // incompatible
-		WEPSET_COPY_AA(start_weapons, g_weaponarena_weapons);
+		start_weapons = g_weaponarena_weapons;
 		start_items |= IT_UNLIMITED_AMMO;
 	}
 	else
@@ -778,11 +778,11 @@ void readplayerstartcvars()
 			e = get_weaponinfo(i);
 			float w = want_weapon("g_start_weapon_", e, FALSE);
 			if(w & 1)
-				WEPSET_OR_AW(start_weapons, i);
+				start_weapons |= WepSet_FromWeapon(i);
 			if(w & 2)
-				WEPSET_OR_AW(start_weapons_default, i);
+				start_weapons_default |= WepSet_FromWeapon(i);
 			if(w & 4)
-				WEPSET_OR_AW(start_weapons_defaultmask, i);
+				start_weapons_defaultmask |= WepSet_FromWeapon(i);
 		}
 	}
 
@@ -806,7 +806,7 @@ void readplayerstartcvars()
 		start_ammo_fuel = cvar("g_start_ammo_fuel");
 	}
 
-	if (inWarmupStage)
+	if (warmup_stage)
 	{
 		warmup_start_ammo_shells = start_ammo_shells;
 		warmup_start_ammo_nails = start_ammo_nails;
@@ -815,9 +815,9 @@ void readplayerstartcvars()
 		warmup_start_ammo_fuel = start_ammo_fuel;
 		warmup_start_health = start_health;
 		warmup_start_armorvalue = start_armorvalue;
-		WEPSET_COPY_AA(warmup_start_weapons, start_weapons);
-		WEPSET_COPY_AA(warmup_start_weapons_default, start_weapons_default);
-		WEPSET_COPY_AA(warmup_start_weapons_defaultmask, start_weapons_defaultmask);
+		warmup_start_weapons = start_weapons;
+		warmup_start_weapons_default = start_weapons_default;
+		warmup_start_weapons_defaultmask = start_weapons_defaultmask;
 
 		if (!g_weaponarena && !g_ca)
 		{
@@ -828,19 +828,19 @@ void readplayerstartcvars()
 			warmup_start_ammo_fuel = cvar("g_warmup_start_ammo_fuel");
 			warmup_start_health = cvar("g_warmup_start_health");
 			warmup_start_armorvalue = cvar("g_warmup_start_armor");
-			WEPSET_CLEAR_A(warmup_start_weapons);
-			WEPSET_CLEAR_A(warmup_start_weapons_default);
-			WEPSET_CLEAR_A(warmup_start_weapons_defaultmask);
+			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);
 				float w = want_weapon("g_start_weapon_", e, cvar("g_warmup_allguns"));
 				if(w & 1)
-					WEPSET_OR_AW(warmup_start_weapons, i);
+					warmup_start_weapons |= WepSet_FromWeapon(i);
 				if(w & 2)
-					WEPSET_OR_AW(warmup_start_weapons_default, i);
+					warmup_start_weapons_default |= WepSet_FromWeapon(i);
 				if(w & 4)
-					WEPSET_OR_AW(warmup_start_weapons_defaultmask, i);
+					warmup_start_weapons_defaultmask |= WepSet_FromWeapon(i);
 			}
 		}
 	}
@@ -850,7 +850,7 @@ void readplayerstartcvars()
 
 	MUTATOR_CALLHOOK(SetStartItems);
 
-	if ((start_items & IT_JETPACK) || (g_grappling_hook && WEPSET_CONTAINS_AW(start_weapons, WEP_HOOK)))
+	if ((start_items & IT_JETPACK) || (g_grappling_hook && (start_weapons & WEPSET_HOOK)))
 	{
 		g_grappling_hook = 0; // these two can't coexist, as they use the same button
 		start_items |= IT_FUEL_REGEN;
@@ -861,7 +861,7 @@ void readplayerstartcvars()
 	for (i = WEP_FIRST; i <= WEP_LAST; ++i)
 	{
 		e = get_weaponinfo(i);
-		if(WEPSET_CONTAINS_AW(start_weapons, i) || WEPSET_CONTAINS_AW(warmup_start_weapons, i))
+		if((start_weapons | warmup_start_weapons) & WepSet_FromWeapon(i))
 			weapon_action(i, WR_PRECACHE);
 	}
 
@@ -961,13 +961,13 @@ void readlevelcvars(void)
 	sv_autotaunt = cvar("sv_autotaunt");
 	sv_taunt = cvar("sv_taunt");
 
-	inWarmupStage = cvar("g_warmup");
+	warmup_stage = cvar("g_warmup");
 	g_warmup_limit = cvar("g_warmup_limit");
 	g_warmup_allguns = cvar("g_warmup_allguns");
 	g_warmup_allow_timeout = cvar("g_warmup_allow_timeout");
 
-	if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || cvar("g_campaign"))
-		inWarmupStage = 0; // these modes cannot work together, sorry
+	if ((g_race && g_race_qualifying == 2) || g_assault || cvar("g_campaign"))
+		warmup_stage = 0; // these modes cannot work together, sorry
 
 	g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon");
 	g_pickup_respawntime_superweapon = cvar("g_pickup_respawntime_superweapon");
@@ -1033,7 +1033,7 @@ void readlevelcvars(void)
     if(!g_weapon_stay)
         g_weapon_stay = cvar("g_weapon_stay");
 
-	if not(inWarmupStage)
+	if not(warmup_stage)
 		game_starttime = time + cvar("g_start_delay");
 
 	readplayerstartcvars();
@@ -1204,7 +1204,7 @@ 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, ATTN_NONE);
+    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)
@@ -1242,7 +1242,7 @@ void play2all(string samp)
     if (autocvar_bot_sound_monopoly)
         return;
 
-    sound(world, CH_INFO, samp, VOL_BASE, ATTN_NONE);
+    sound(world, CH_INFO, samp, VOL_BASE, ATTEN_NONE);
 }
 
 void PrecachePlayerSounds(string f);
@@ -1411,7 +1411,7 @@ void precache()
     if (self.noise)
     {
         precache_sound (self.noise);
-        ambientsound ('0 0 0', self.noise, VOL_BASE, ATTN_NONE);
+        ambientsound ('0 0 0', self.noise, VOL_BASE, ATTEN_NONE);
     }
 #endif
 
@@ -1718,7 +1718,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");
-		dprint(sprintf(_("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)));
+		dprint(sprintf("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)));
 		checkclient();
 	}
     if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
@@ -1940,30 +1940,32 @@ float MoveToRandomMapLocation(entity e, float goodcontents, float badcontents, f
         // these can be traceLINES as we already verified the starting box
         mstart = start + 0.5 * (e.mins + e.maxs);
         traceline(mstart, mstart + '1 0 0' * delta_x, MOVE_NORMAL, e);
-        if (trace_fraction >= 1)
+        if (trace_fraction >= 1 || trace_dphittexturename == "common/caulk")
             continue;
         traceline(mstart, mstart - '1 0 0' * delta_x, MOVE_NORMAL, e);
-        if (trace_fraction >= 1)
+        if (trace_fraction >= 1 || trace_dphittexturename == "common/caulk")
             continue;
         traceline(mstart, mstart + '0 1 0' * delta_y, MOVE_NORMAL, e);
-        if (trace_fraction >= 1)
+        if (trace_fraction >= 1 || trace_dphittexturename == "common/caulk")
             continue;
         traceline(mstart, mstart - '0 1 0' * delta_y, MOVE_NORMAL, e);
-        if (trace_fraction >= 1)
+        if (trace_fraction >= 1 || trace_dphittexturename == "common/caulk")
             continue;
         traceline(mstart, mstart + '0 0 1' * delta_z, MOVE_NORMAL, e);
-        if (trace_fraction >= 1)
+        if (trace_fraction >= 1 || trace_dphittexturename == "common/caulk")
             continue;
 
-	// rule 4: we must "see" some spawnpoint
+	// rule 4: we must "see" some spawnpoint or item
 	for(sp = world; (sp = find(sp, classname, "info_player_deathmatch")); )
 		if(checkpvs(mstart, sp))
-			break;
+			if((traceline(mstart, sp.origin, MOVE_NORMAL, e), trace_fraction) >= 1)
+				break;
 	if(!sp)
 	{
 		for(sp = world; (sp = findflags(sp, flags, FL_ITEM)); )
 			if(checkpvs(mstart, sp))
-				break;
+				if((traceline(mstart, sp.origin + (sp.mins + sp.maxs) * 0.5, MOVE_NORMAL, e), trace_fraction) >= 1)
+					break;
 		if(!sp)
 			continue;
 	}