X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=af6b7b64d4104a175e31c016402f7093410fe22b;hb=9ddd00d3479c56a93e210d16f4870c803e23c680;hp=d9ca813aa372a3dc331704ef168254d0e68475b7;hpb=2a718ebca6aed499161fc61b8ec3ebf0abc110c1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index d9ca813aa..af6b7b64d 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -568,9 +568,6 @@ spawnfunc(__init_dedicated_server)
 	// handler for _init/_init map (only for dedicated server initialization)
 
 	world_initialized = -1; // don't complain
-	cvar = cvar_normal;
-	cvar_string = cvar_string_normal;
-	cvar_set = cvar_set_normal;
 
 	delete_fn = remove_unsafely;
 
@@ -680,8 +677,8 @@ spawnfunc(worldspawn)
 			// localcmd("\nfs_rescan\n"); // FIXME: does more harm than good, has unintended side effects. What we really want is to unload temporary pk3s only
 			// restore csqc_progname too
 			string expect = "csprogs.dat";
-			wantrestart = cvar_string_normal("csqc_progname") != expect;
-			cvar_set_normal("csqc_progname", expect);
+			wantrestart = cvar_string("csqc_progname") != expect;
+			cvar_set("csqc_progname", expect);
 		}
 		else
 		{
@@ -692,9 +689,9 @@ spawnfunc(worldspawn)
 			// This always works; fall back to it if a versioned csprogs.dat is suddenly missing
 			string select = "csprogs.dat";
 			if (fexists(pk3csprogs)) select = pk3csprogs;
-			if (cvar_string_normal("csqc_progname") != select)
+			if (cvar_string("csqc_progname") != select)
 			{
-				cvar_set_normal("csqc_progname", select);
+				cvar_set("csqc_progname", select);
 				wantrestart = true;
 			}
 			// Check for updates on startup
@@ -713,13 +710,13 @@ spawnfunc(worldspawn)
 					string newprogs = sprintf("progs-%s.dat", switchversion);
 					if (fexists(newprogs))
 					{
-						cvar_set_normal("sv_progs", newprogs);
+						cvar_set("sv_progs", newprogs);
 						wantrestart = true;
 					}
 					string newcsprogs = sprintf("csprogs-%s.dat", switchversion);
 					if (fexists(newcsprogs))
 					{
-						cvar_set_normal("csqc_progname", newcsprogs);
+						cvar_set("csqc_progname", newcsprogs);
 						wantrestart = true;
 					}
 				}
@@ -733,10 +730,6 @@ spawnfunc(worldspawn)
 		}
 	}
 
-	cvar = cvar_normal;
-	cvar_string = cvar_string_normal;
-	cvar_set = cvar_set_normal;
-
 	if(world_already_spawned)
 		error("world already spawned - you may have EXACTLY ONE worldspawn!");
 	world_already_spawned = true;