From f7ce2ba94d59396e9ae9c0bade69a1a4ad00dd97 Mon Sep 17 00:00:00 2001
From: Carl Kittelberger <icedream@icedream.pw>
Date: Fri, 30 Mar 2018 04:44:23 +0200
Subject: [PATCH] Fix spawn without weapons.

---
 maps/mp/gametypes/hns.gsc | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/maps/mp/gametypes/hns.gsc b/maps/mp/gametypes/hns.gsc
index c4482ff..e81c79c 100644
--- a/maps/mp/gametypes/hns.gsc
+++ b/maps/mp/gametypes/hns.gsc
@@ -89,8 +89,8 @@ main()
 
 	// Specific DVars for this gametype
 	registerPrereleaseDvar(level.gameType, 30, 0, 300);
-	registerSeekersPrimaryWeaponDvar(level.gameType, "ak47_reflex_mp");
-	registerSeekersSecondaryWeaponDvar(level.gameType, "deserteagle_tactical_mp");
+	setDvarIfUninitialized("scr_" + level.gameType + "_seekers_primary_weapon", "ak47_reflex_mp");
+	setDvarIfUninitialized("scr_" + level.gameType + "_seekers_secondary_weapon", "deserteagle_tactical_mp");
 
 	// Don't show perks
 	SetDvar("scr_showperksonspawn", 0);
@@ -200,20 +200,6 @@ registerPrereleaseDvar(dvarString, defaultValue, minValue, maxValue)
 	}
 }
 
-registerSeekersPrimaryWeaponDvar(dvarString, defaultValue)
-{
-	logPrint("registerSeekersPrimaryWeaponDvar called");
-
-	maps\mp\gametypes\_tweakables::registerTweakable("game", "seekers_primary_weapon", "scr_" + dvarString + "_seekers_primary_weapon", "ak47_reflex_mp");
-}
-
-registerSeekersSecondaryWeaponDvar(dvarString, defaultValue)
-{
-	logPrint("registerSeekersSecondaryWeaponDvar called");
-
-	maps\mp\gametypes\_tweakables::registerTweakable("game", "seekers_secondary_weapon", "scr_" + dvarString + "_seekers_secondary_weapon", "deserteagle_tactical_mp");
-}
-
 updateGametypeDvars()
 {
 	logPrint("updateGametypeDvars called");
@@ -234,8 +220,6 @@ onStartGameType()
 	setDvarIfUninitialized("scr_hns_winlimit", 4);
 	setDvarIfUninitialized("scr_hns_halftime", 0);
 	setDvarIfUninitialized("scr_hns_numlives", 1);
-	setDvarIfUninitialized("scr_hns_seekers_primary_weapon", "ak47_reflex_mp");
-	setDvarIfUninitialized("scr_hns_seekers_secondary_weapon", "deserteagle_tactical_mp");
 
 	// reset flags
 	gameFlagClear("seekers_released");
@@ -600,20 +584,23 @@ handleSeeker() {
 		wait 0.5;
 	}
 
+	primaryWeapon = GetDvar("scr_" + level.gameType + "_seekers_primary_weapon", "ak47_reflex_mp");
+	secondaryWeapon = GetDvar("scr_" + level.gameType + "_seekers_secondary_weapon", "deserteagle_tactical_mp");
+
 	// random primary weapon
-	player GiveWeapon(level.gameTweaks["seekers_primary_weapon"].value, RandomInt(9), false);
-	player setSpawnWeapon(level.gameTweaks["seekers_primary_weapon"].value);
-	player SwitchToWeapon(level.gameTweaks["seekers_primary_weapon"].value);
+	player GiveWeapon(primaryWeapon, RandomInt(9), false);
+	player setSpawnWeapon(primaryWeapon);
+	player SwitchToWeapon(primaryWeapon);
 
 	// deagle + tactical knife
-	player GiveWeapon(level.gameTweaks["seekers_secondary_weapon"].value, 0, false);
+	player GiveWeapon(secondaryWeapon, 0, false);
 
 	// single semtex
 	player GiveWeapon("semtex_mp");
 
 	// ammo
-	player GiveMaxAmmo(level.gameTweaks["seekers_primary_weapon"].value);
-	player GiveMaxAmmo(level.gameTweaks["seekers_secondary_weapon"].value);
+	player GiveMaxAmmo(primaryWeapon);
+	player GiveMaxAmmo(secondaryWeapon);
 
 	// gametype-friendly perks
 	player GivePerk("specialty_lightweight");