X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=fa8be67fe04bdcae11117eec41683166b2a74ae0;hb=026dde2924af9bca060bc1bea3e194c47e98b4be;hp=effa386f475957589bb80cc4484501a987b92389;hpb=aac920445a06f02c56ef00e17ee8825724cd595f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index effa386f4..fa8be67fe 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -537,7 +537,11 @@ void GetCvars(float f)
 
 	get_cvars_f = f;
 	get_cvars_s = s;
+
 	MUTATOR_CALLHOOK(GetCvars);
+
+	Notification_GetCvars();
+
 	GetCvars_handleFloat(s, f, autoswitch, "cl_autoswitch");
 	GetCvars_handleFloat(s, f, cvar_cl_autoscreenshot, "cl_autoscreenshot");
 	GetCvars_handleString(s, f, cvar_g_xonoticversion, "g_xonoticversion");
@@ -989,12 +993,6 @@ float g_bugrigs_speed_ref;
 float g_bugrigs_speed_pow;
 float g_bugrigs_steer;
 
-float g_touchexplode;
-float g_touchexplode_radius;
-float g_touchexplode_damage;
-float g_touchexplode_edgedamage;
-float g_touchexplode_force;
-
 float sv_autotaunt;
 float sv_taunt;
 
@@ -1010,6 +1008,8 @@ void readlevelcvars(void)
 		MUTATOR_ADD(mutator_spawn_near_teammate);
 	if(cvar("g_physical_items"))
 		MUTATOR_ADD(mutator_physical_items);
+	if(cvar("g_touchexplode"))
+		MUTATOR_ADD(mutator_touchexplode);
 	if(!g_minstagib)
 	{
 		if(cvar("g_invincible_projectiles"))
@@ -1049,12 +1049,6 @@ void readlevelcvars(void)
     g_bugrigs_speed_pow = cvar("g_bugrigs_speed_pow");
     g_bugrigs_steer = cvar("g_bugrigs_steer");
 
-    g_touchexplode = cvar("g_touchexplode");
-    g_touchexplode_radius = cvar("g_touchexplode_radius");
-    g_touchexplode_damage = cvar("g_touchexplode_damage");
-    g_touchexplode_edgedamage = cvar("g_touchexplode_edgedamage");
-    g_touchexplode_force = cvar("g_touchexplode_force");
-
 	sv_clones = cvar("sv_clones");
 	sv_foginterval = cvar("sv_foginterval");
 	g_cloaked = cvar("g_cloaked");
@@ -1077,7 +1071,7 @@ void readlevelcvars(void)
 	g_warmup_allguns = cvar("g_warmup_allguns");
 	g_warmup_allow_timeout = cvar("g_warmup_allow_timeout");
 
-	if ((g_race && g_race_qualifying == 2) || g_runematch || g_arena || g_assault || cvar("g_campaign"))
+	if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || cvar("g_campaign"))
 		inWarmupStage = 0; // these modes cannot work together, sorry
 
 	g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon");
@@ -1146,8 +1140,8 @@ void readlevelcvars(void)
     if(!g_weapon_stay)
         g_weapon_stay = cvar("g_weapon_stay");
 
-	if not(inWarmupStage && !g_ca)
-		game_starttime = cvar("g_start_delay");
+	if not(inWarmupStage)
+		game_starttime = time + cvar("g_start_delay");
 
 	readplayerstartcvars();
 }
@@ -1410,11 +1404,6 @@ void precache()
 {
     // gamemode related things
     precache_model ("models/misc/chatbubble.spr");
-    if (g_runematch)
-    {
-        precache_model ("models/runematch/curse.mdl");
-        precache_model ("models/runematch/rune.mdl");
-    }
 
 #ifdef TTURRETS_ENABLED
     if (autocvar_g_turrets)
@@ -2012,22 +2001,6 @@ string race_readName(string map, float pos)
 	return uid2name(db_get(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(pos))));
 }
 
-string race_placeName(float pos) {
-	if(floor((mod(pos, 100))/10) * 10 != 10) // examples: 12th, 111th, 213th will not execute this block
-	{
-		if(mod(pos, 10) == 1)
-			return strcat(ftos(pos), "st");
-		else if(mod(pos, 10) == 2)
-			return strcat(ftos(pos), "nd");
-		else if(mod(pos, 10) == 3)
-			return strcat(ftos(pos), "rd");
-		else
-			return strcat(ftos(pos), "th");
-	}
-	else
-		return strcat(ftos(pos), "th");
-}
-
 float MoveToRandomMapLocation(entity e, float goodcontents, float badcontents, float badsurfaceflags, float attempts, float maxaboveground, float minviewdistance)
 {
     float m, i;
@@ -2627,8 +2600,3 @@ float isPushable(entity e)
 		return TRUE;
 	return FALSE;
 }
-
-void dedicated_print(string input) // print(), but only print if the server is not local
-{
-	if not(server_is_local) { print(input); }
-}