X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=84dd07d94a185f3c065296f49cc3e2af6b79a017;hb=cd4733447ff43d2aa6141fb9b66f718f61d46fc5;hp=a2f4201019a46e19c1b45b78dc8c5d0f38a88a41;hpb=b195663656a3d909655f41a99adb95c0b1da2fd9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index a2f420101..84dd07d94 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -236,6 +236,8 @@ void relocate_spawnpoint()
     if (have_team_spawns != 0)
         if (self.team)
             have_team_spawns = 1;
+    if (!self.team)
+        have_noteam_spawns = 1;
 
     if (autocvar_r_showbboxes)
     {
@@ -603,7 +605,6 @@ void GetCvars(float f)
 	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_hitsound, "cl_hitsound");
 	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");
 
@@ -616,6 +617,7 @@ void GetCvars(float f)
 #endif
 	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");
 
 	// fixup of switchweapon (needed for LMS or when spectating is disabled, as PutClientInServer comes too early)
 	if (f > 0)
@@ -915,8 +917,19 @@ void readplayerstartcvars()
 
 	g_weaponarena = 0;
 	s = cvar_string("g_weaponarena");
-	if (s == "0")
+	if (s == "0" || s == "")
 	{
+		if(g_lms || g_ca)
+			s = "most";
+	}
+
+	if (s == "0" || s == "")
+	{
+		// no arena
+	}
+	else if (s == "off")
+	{
+		// forcibly turn off weaponarena
 	}
 	else if (s == "all")
 	{
@@ -981,24 +994,8 @@ void readplayerstartcvars()
 	if (g_weaponarena)
 	{
 		start_weapons = g_weaponarena;
-		for (j = WEP_FIRST; j <= WEP_LAST; ++j)
-		{
-			e = get_weaponinfo(j);
-			if(start_weapons & e.weapons)
-			{
-				if(e.items & IT_ROCKETS)
-					start_ammo_rockets = 999;
-				if(e.items & IT_SHELLS)
-					start_ammo_shells = 999;
-				if(e.items & IT_CELLS)
-					start_ammo_cells = 999;
-				if(e.items & IT_NAILS)
-					start_ammo_nails = 999;
-				if(e.items & IT_FUEL)
-					start_ammo_fuel = 999;
-			}
-		}
-		start_items |= IT_UNLIMITED_AMMO;
+		if(!(g_lms || g_ca))
+			start_items |= IT_UNLIMITED_AMMO;
 	}
 	else if (g_minstagib)
 	{
@@ -1006,24 +1003,46 @@ void readplayerstartcvars()
 		start_armorvalue = 0;
 		start_weapons = WEPBIT_MINSTANEX;
 		weapon_action(WEP_MINSTANEX, WR_PRECACHE);
-		start_ammo_cells = cvar("g_minstagib_ammo_start");
 		g_minstagib_invis_alpha = cvar("g_minstagib_invis_alpha");
-		start_ammo_fuel = cvar("g_start_ammo_fuel");
 
 		if (g_minstagib_invis_alpha <= 0)
 			g_minstagib_invis_alpha = -1;
 	}
 	else
 	{
-		if (g_lms || g_ca)
+		for (i = WEP_FIRST; i <= WEP_LAST; ++i)
+		{
+			e = get_weaponinfo(i);
+			if(want_weapon("g_start_weapon_", e, FALSE))
+				start_weapons |= e.weapons;
+		}
+	}
+
+	if(!cvar("g_use_ammunition"))
+		start_items |= IT_UNLIMITED_AMMO;
+
+	if(g_minstagib)
+	{
+		start_ammo_cells = cvar("g_minstagib_ammo_start");
+		start_ammo_fuel = cvar("g_start_ammo_fuel");
+	}
+	else if(start_items & IT_UNLIMITED_WEAPON_AMMO)
+	{
+		start_ammo_rockets = 999;
+		start_ammo_shells = 999;
+		start_ammo_cells = 999;
+		start_ammo_nails = 999;
+		start_ammo_fuel = 999;
+	}
+	else
+	{
+		if(g_lms || g_ca)
 		{
 			start_ammo_shells = cvar("g_lms_start_ammo_shells");
 			start_ammo_nails = cvar("g_lms_start_ammo_nails");
 			start_ammo_rockets = cvar("g_lms_start_ammo_rockets");
 			start_ammo_cells = cvar("g_lms_start_ammo_cells");
 			start_ammo_fuel = cvar("g_lms_start_ammo_fuel");
-			start_health = cvar("g_lms_start_health");
-			start_armorvalue = cvar("g_lms_start_armor");
 		}
 		else
 		{
@@ -1033,13 +1052,12 @@ void readplayerstartcvars()
 			start_ammo_cells = cvar("g_start_ammo_cells");
 			start_ammo_fuel = cvar("g_start_ammo_fuel");
 		}
+	}
 
-		for (i = WEP_FIRST; i <= WEP_LAST; ++i)
-		{
-			e = get_weaponinfo(i);
-			if(want_weapon("g_start_weapon_", e, FALSE))
-				start_weapons |= e.weapons;
-		}
+	if (g_lms || g_ca)
+	{
+		start_health = cvar("g_lms_start_health");
+		start_armorvalue = cvar("g_lms_start_armor");
 	}
 
 	if (inWarmupStage)
@@ -1080,22 +1098,6 @@ void readplayerstartcvars()
 		warmup_start_ammo_fuel = max(warmup_start_ammo_fuel, cvar("g_balance_fuel_rotstable"));
 	}
 
-	if(!cvar("g_use_ammunition"))
-	{
-		start_ammo_shells = cvar("g_pickup_shells_max");
-		start_ammo_nails = cvar("g_pickup_nails_max");
-		start_ammo_rockets = cvar("g_pickup_rockets_max");
-		start_ammo_cells = cvar("g_pickup_cells_max");
-		start_ammo_fuel = cvar("g_pickup_fuel_max");
-		start_items |= IT_UNLIMITED_AMMO;
-		warmup_start_ammo_shells = cvar("g_pickup_shells_max");
-		warmup_start_ammo_nails = cvar("g_pickup_nails_max");
-		warmup_start_ammo_rockets = cvar("g_pickup_rockets_max");
-		warmup_start_ammo_cells = cvar("g_pickup_cells_max");
-		warmup_start_ammo_fuel = cvar("g_pickup_fuel_max");
-		//warmup_start_items |= IT_UNLIMITED_AMMO;
-	}
-
 	if (g_jetpack)
 		start_items |= IT_JETPACK;
 
@@ -1528,8 +1530,12 @@ void precache_playermodel(string m)
 	precache_model(m);
 	if(sv_loddistance1)
 	{
-		precache_model(strcat(substring(m, 0, -5), "_lod1", substring(m, -4, -1)));
-		precache_model(strcat(substring(m, 0, -5), "_lod2", substring(m, -4, -1)));
+		f = strcat(substring(m, 0, -5), "_lod1", substring(m, -4, -1));
+		if(fexists(f))
+			precache_model(f);
+		f = strcat(substring(m, 0, -5), "_lod2", substring(m, -4, -1));
+		if(fexists(f))
+			precache_model(f);
 	}
 
 	globhandle = search_begin(strcat(m, "_*.sounds"), TRUE, FALSE);
@@ -1626,8 +1632,6 @@ void precache()
     precache_sound ("misc/gib_splat02.wav");
     precache_sound ("misc/gib_splat03.wav");
     precache_sound ("misc/gib_splat04.wav");
-    precache_sound ("misc/hit.wav");
-	precache_sound ("misc/typehit.wav");
     PrecacheGlobalSound((globalsound_fall = "misc/hitground 4"));
     PrecacheGlobalSound((globalsound_metalfall = "misc/metalhitground 4"));
     precache_sound ("misc/null.wav");
@@ -1654,6 +1658,7 @@ void precache()
     precache_model ("models/sprites/10.spr32");
 
     // common weapon precaches
+	precache_sound ("weapons/reload.wav"); // until weapons have individual reload sounds, precache the reload sound here
     precache_sound ("weapons/weapon_switch.wav");
     precache_sound ("weapons/weaponpickup.wav");
     precache_sound ("weapons/unavailable.wav");
@@ -2541,10 +2546,7 @@ float MoveToRandomMapLocation(entity e, float goodcontents, float badcontents, f
 
         // rule 6: we must not end up in trigger_hurt
         if (tracebox_hits_trigger_hurt(start, e.mins, e.maxs, enddown))
-        {
-            dprint("trigger_hurt! ouch! and nothing else could find it!\n");
             continue;
-        }
 
         break;
     }
@@ -2853,65 +2855,65 @@ void SoundEntity_Detach(entity pl)
 float ParseCommandPlayerSlotTarget_firsttoken;
 entity GetCommandPlayerSlotTargetFromTokenizedCommand(float tokens, float idx) // idx = start index
 {
-    string s;
-    entity e, head;
-    float n;
+	string s;
+	entity e, head;
+	float n;
 
-    s = string_null;
+	s = string_null;
 
-    ParseCommandPlayerSlotTarget_firsttoken = -1;
+	ParseCommandPlayerSlotTarget_firsttoken = -1;
 
-    if (tokens > idx)
-    {
-        if (substring(argv(idx), 0, 1) == "#")
-        {
-            s = substring(argv(idx), 1, -1);
-            ++idx;
-            if (s == "")
-                if (tokens > idx)
-                {
-                    s = argv(idx);
-                    ++idx;
-                }
+	if (tokens > idx)
+	{
+		if (substring(argv(idx), 0, 1) == "#")
+		{
+			s = substring(argv(idx), 1, -1);
+			++idx;
+			if (s == "") if (tokens > idx)
+			{
+				s = argv(idx);
+				++idx;
+			}
 			ParseCommandPlayerSlotTarget_firsttoken = idx;
-            if (s == ftos(stof(s)))
-            {
-                e = edict_num(stof(s));
-                if (e.flags & FL_CLIENT)
-                    return e;
-            }
-        }
-        else
-        {
-            // it must be a nick name
-            s = argv(idx);
-            ++idx;
+			n = stof(s);
+			if (s == ftos(n) && n > 0 && n <= maxclients)
+			{
+				e = edict_num(n);
+				if (e.flags & FL_CLIENT)
+					return e;
+			}
+		}
+		else
+		{
+			// it must be a nick name
+			s = argv(idx);
+			++idx;
 			ParseCommandPlayerSlotTarget_firsttoken = idx;
 
-            n = 0;
-            FOR_EACH_CLIENT(head)
-            if (head.netname == s)
-            {
-                e = head;
-                ++n;
-            }
-            if (n == 1)
-                return e;
+			n = 0;
+			FOR_EACH_CLIENT(head)
+				if (head.netname == s)
+				{
+					e = head;
+					++n;
+				}
+			if (n == 1)
+				return e;
 
-            s = strdecolorize(s);
-            n = 0;
-            FOR_EACH_CLIENT(head)
-            if (strdecolorize(head.netname) == s)
-            {
-                e = head;
-                ++n;
-            }
-            if (n == 1)
-                return e;
-        }
-    }
+			s = strdecolorize(s);
+			n = 0;
+			FOR_EACH_CLIENT(head)
+				if (strdecolorize(head.netname) == s)
+				{
+					e = head;
+					++n;
+				}
+			if (n == 1)
+				return e;
+		}
+	}
 
-    return world;
+	return world;
 }
 
 .float scale2;