X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=95e3f7d61566c2cb26b1083d41d69d03e31a5a8a;hp=263f53d49f7c3c37ec090de9eb6facbe5106285a;hb=5e42a6f54307afc1263845f546bfe74a6dfa100b;hpb=88323e586852adfa78a5761f71ac88f5ae0bfce6

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 263f53d49f..95e3f7d615 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -297,11 +297,13 @@ void cvar_changes_init()
 		BADPREFIX("g_ban_");
 		BADPREFIX("g_banned_list");
 		BADPREFIX("g_chat_flood_");
+		BADPREFIX("g_ghost_items");
 		BADPREFIX("g_playerstats_");
+		BADPREFIX("g_respawn_ghosts");
 		BADPREFIX("g_voice_flood_");
 		BADPREFIX("rcon_");
 		BADPREFIX("settemp_");
-		BADPREFIX("sv_allowdownloads_");
+		BADPREFIX("sv_allowdownloads");
 		BADPREFIX("sv_autodemo");
 		BADPREFIX("sv_curl_");
 		BADPREFIX("sv_eventlog");
@@ -402,6 +404,9 @@ void cvar_changes_init()
 		BADCVAR("gameversion");
 		BADPREFIX("gameversion_");
 		BADCVAR("sv_namechangetimer");
+#ifndef NO_LEGACY_NETWORKING
+		BADCVAR("sv_use_csqc_players"); // transition
+#endif
 
 		// allowed changes to server admins (please sync this to server.cfg)
 		// vi commands:
@@ -410,10 +415,10 @@ void cvar_changes_init()
 		//   :%s,//\([^ ]*\).*,BADCVAR("\1");,
 		//   :%!sort
 		// yes, this does contain some redundant stuff, don't really care
+		BADCVAR("bot_config_file");
 		BADCVAR("bot_number");
 		BADCVAR("bot_prefix");
 		BADCVAR("bot_suffix");
-		BADCVAR("bot_config_file");
 		BADCVAR("capturelimit_override");
 		BADCVAR("fraglimit_override");
 		BADCVAR("gametype");
@@ -444,6 +449,7 @@ void cvar_changes_init()
 		BADCVAR("g_minstagib");
 		BADCVAR("g_mirrordamage");
 		BADCVAR("g_nexball_goallimit");
+		BADCVAR("g_powerups");
 		BADCVAR("g_runematch_point_limit");
 		BADCVAR("g_start_delay");
 		BADCVAR("g_warmup");
@@ -460,6 +466,7 @@ void cvar_changes_init()
 		BADCVAR("skill");
 		BADCVAR("sv_adminnick");
 		BADCVAR("sv_autoscreenshot");
+		BADCVAR("sv_autotaunt");
 		BADCVAR("sv_curl_defaulturl");
 		BADCVAR("sv_defaultcharacter");
 		BADCVAR("sv_defaultplayercolors");
@@ -471,6 +478,7 @@ void cvar_changes_init()
 		BADCVAR("sv_public");
 		BADCVAR("sv_ready_restart");
 		BADCVAR("sv_status_privacy");
+		BADCVAR("sv_taunt");
 		BADCVAR("sv_vote_call");
 		BADCVAR("sv_vote_commands");
 		BADCVAR("sv_vote_majority_factor");
@@ -482,6 +490,7 @@ void cvar_changes_init()
 		BADCVAR("teamplay_mode");
 		BADCVAR("timelimit_override");
 		BADPREFIX("g_warmup_");
+		BADPREFIX("sv_ready_restart_");
 
 		if(autocvar_g_minstagib)
 		{
@@ -718,6 +727,10 @@ void spawnfunc_worldspawn (void)
 	//	dom_init();
 
 	GameLogInit(); // prepare everything
+	// NOTE for matchid:
+	// changing the logic generating it is okay. But:
+	// it HAS to stay <= 64 chars
+	// character set: ASCII 33-126 without the following characters: : ; ' " \ $
 	if(autocvar_sv_eventlog)
 	{
 		s = sprintf("%d.%s.%06d", ftos(autocvar_sv_eventlog_files_counter), strftime(FALSE, "%s"), floor(random() * 1000000));
@@ -739,8 +752,10 @@ void spawnfunc_worldspawn (void)
 			s = strcat(s, ":no_use_ammunition");
 
 		// initialiation stuff, not good in the mutator system
-		if(!autocvar_g_pickup_items)
+		if(autocvar_g_pickup_items == 0)
 			s = strcat(s, ":no_pickup_items");
+		if(autocvar_g_pickup_items > 0)
+			s = strcat(s, ":pickup_items");
 
 		// initialiation stuff, not good in the mutator system
 		if(autocvar_g_weaponarena != "0")
@@ -758,6 +773,12 @@ void spawnfunc_worldspawn (void)
 		if(autocvar_g_minstagib)
 			s = strcat(s, ":minstagib");
 
+		// TODO to mutator system
+		if(autocvar_g_powerups == 0)
+			s = strcat(s, ":no_powerups");
+		if(autocvar_g_powerups > 0)
+			s = strcat(s, ":powerups");
+
 		GameLogEcho(s);
 		GameLogEcho(":gameinfo:end");
 	}
@@ -931,8 +952,17 @@ void spawnfunc_worldspawn (void)
 		s = "";
 		n = tokenize_console(cvar_string("sv_curl_serverpackages"));
 		for(i = 0; i < n; ++i)
-			if(substring(argv(i), -14, -1) != ".serverpackage")
+			if(substring(argv(i), -14, -1) != "-serverpackage.txt")
+			if(substring(argv(i), -14, -1) != ".serverpackage") // OLD legacy
 				s = strcat(s, " ", argv(i));
+		fd = search_begin("*-serverpackage.txt", TRUE, FALSE);
+		if(fd >= 0)
+		{
+			j = search_getsize(fd);
+			for(i = 0; i < j; ++i)
+				s = strcat(s, " ", search_getfilename(fd, i));
+			search_end(fd);
+		}
 		fd = search_begin("*.serverpackage", TRUE, FALSE);
 		if(fd >= 0)
 		{