From 72448307c04b5c7a639b7b1e055d91e574a4f1c5 Mon Sep 17 00:00:00 2001
From: bones_was_here <bones_was_here@xa.org.au>
Date: Sat, 18 Jun 2022 19:38:43 +1000
Subject: [PATCH] Do the pre-release TODOs

---
 models/arctrail.mdl         | Bin 692 -> 0 bytes
 models/arctrail.mdl_0.skin  |   2 --
 qcsrc/common/models/all.inc |   2 +-
 qcsrc/server/world.qc       |   7 -------
 4 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 models/arctrail.mdl
 delete mode 100644 models/arctrail.mdl_0.skin

diff --git a/models/arctrail.mdl b/models/arctrail.mdl
deleted file mode 100644
index 5669bc4cc58d3f218688ab0a708a496af6b46ee6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 692
zcmeZt2{7hoU|`72Pf5)w)=$*SO)*X^DN4-D0kMD*BmhRJS|%u+1EiNg@fM(9dPLJ9
zTZYRAgC1WnpK<c4BarO~VndaKshGJvP8w-N`MC<lF2TNu6`DX%PoNtEauV}W4GfW$
zlFSCV4}@8O805wcKn!x@2_Sv}#2i4$<f6))%)IRQf};Ga)Z~)PoYeT_{GwE#Eb#zj
zHZxQ?EKFd028ITE1csRj5@TRU_?ht&MEA2n=!Bm$*dTlejR*%LkTBVR%y7ub&r2uC
cPIALx>-!C$C}P<9KHxWqUdIOEuVaJo0fxX+umAu6

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
-- 
2.39.2