From: bones_was_here <bones_was_here@xa.org.au>
Date: Sat, 18 Jun 2022 09:38:43 +0000 (+1000)
Subject: Do the pre-release TODOs
X-Git-Tag: xonotic-v0.8.5~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=72448307c04b5c7a639b7b1e055d91e574a4f1c5;p=xonotic%2Fxonotic-data.pk3dir.git

Do the pre-release TODOs
---

diff --git a/models/arctrail.mdl b/models/arctrail.mdl
deleted file mode 100644
index 5669bc4cc..000000000
Binary files a/models/arctrail.mdl and /dev/null differ
diff --git a/models/arctrail.mdl_0.skin b/models/arctrail.mdl_0.skin
deleted file mode 100644
index 96ddf3079..000000000
--- a/models/arctrail.mdl_0.skin
+++ /dev/null
@@ -1,2 +0,0 @@
-Plane01,arc_projectile_core
-Plane02,arc_projectile_long
diff --git a/qcsrc/common/models/all.inc b/qcsrc/common/models/all.inc
index 56f07d2b4..b8fc08f38 100644
--- a/qcsrc/common/models/all.inc
+++ b/qcsrc/common/models/all.inc
@@ -88,7 +88,7 @@ MODEL(PROJECTILE_HOOKBOMB,              "models/grenademodel.md3");
 MODEL(PROJECTILE_HAGAR,                 "models/hagarmissile.mdl");
 MODEL(PROJECTILE_HAGAR_BOUNCING,        "models/hagarmissile.mdl");
 
-MODEL(PROJECTILE_ARC_BOLT,              "models/ebomb.mdl"); // TODO: remove models/arctrail.mdl right before 0.8.3 release!
+MODEL(PROJECTILE_ARC_BOLT,              "models/ebomb.mdl");
 
 // napalm grenade
 MODEL(PROJECTILE_NAPALM_FOUNTAIN,       "null");
diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index 1c589e5f0..ebf53c38f 100644
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -518,13 +518,6 @@ void cvar_changes_init()
 		BADCVAR("g_grappling_hook");
 		BADCVAR("g_jetpack");
 
-		// temporary for testing
-		// TODO remove before 0.8.3 release
-		BADCVAR("g_ca_weaponarena");
-		BADCVAR("g_freezetag_weaponarena");
-		BADCVAR("g_lms_weaponarena");
-		BADCVAR("g_ctf_stalemate_time");
-
 #undef BADPRESUFFIX
 #undef BADPREFIX
 #undef BADCVAR