X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fworld.qc;h=728c9d757e6ffa77ad2f1edfc0637492dc2c8c0f;hb=cb8c9f9915bdaff154b2cf3d757c3b3bcbcbaa1c;hp=ee8bdbddeb48e08a10da415965f8633415f46014;hpb=658b3cecc02ad7040d46f3c4602d1ee874ae5a19;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index ee8bdbdde..728c9d757 100644
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -461,7 +461,7 @@ void cvar_changes_init()
 		BADCVAR("g_physics_clientselect");
 		BADCVAR("g_pinata");
 		BADCVAR("g_powerups");
-		BADCVAR("g_powerups_dropondeath");
+		BADCVAR("g_powerups_drop_ondeath");
 		BADCVAR("g_player_brightness");
 		BADCVAR("g_rocket_flying");
 		BADCVAR("g_rocket_flying_disabledelays");
@@ -888,11 +888,8 @@ spawnfunc(worldspawn)
 	MapInfo_Enumerate();
 	MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 1);
 
-	if(fexists(strcat("scripts/", mapname, ".arena")))
-		cvar_settemp("sv_q3acompat_machineshotgunswap", "1");
-
-	if(fexists(strcat("scripts/", mapname, ".defi")))
-		cvar_settemp("sv_q3defragcompat", "1");
+	q3compat = BITSET(q3compat, Q3COMPAT_ARENA, fexists(strcat("scripts/", mapname, ".arena")));
+	q3compat = BITSET(q3compat, Q3COMPAT_DEFI, fexists(strcat("scripts/", mapname, ".defi")));
 
 	if(whichpack(strcat("maps/", mapname, ".cfg")) != "")
 	{