Fix spawn without weapons.

master
Icedream 2018-03-30 04:44:23 +02:00
parent 8385946838
commit f7ce2ba94d
Signed by: icedream
GPG Key ID: 1573F6D8EFE4D0CF
1 changed files with 11 additions and 24 deletions

View File

@ -89,8 +89,8 @@ main()
// Specific DVars for this gametype // Specific DVars for this gametype
registerPrereleaseDvar(level.gameType, 30, 0, 300); registerPrereleaseDvar(level.gameType, 30, 0, 300);
registerSeekersPrimaryWeaponDvar(level.gameType, "ak47_reflex_mp"); setDvarIfUninitialized("scr_" + level.gameType + "_seekers_primary_weapon", "ak47_reflex_mp");
registerSeekersSecondaryWeaponDvar(level.gameType, "deserteagle_tactical_mp"); setDvarIfUninitialized("scr_" + level.gameType + "_seekers_secondary_weapon", "deserteagle_tactical_mp");
// Don't show perks // Don't show perks
SetDvar("scr_showperksonspawn", 0); 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() updateGametypeDvars()
{ {
logPrint("updateGametypeDvars called"); logPrint("updateGametypeDvars called");
@ -234,8 +220,6 @@ onStartGameType()
setDvarIfUninitialized("scr_hns_winlimit", 4); setDvarIfUninitialized("scr_hns_winlimit", 4);
setDvarIfUninitialized("scr_hns_halftime", 0); setDvarIfUninitialized("scr_hns_halftime", 0);
setDvarIfUninitialized("scr_hns_numlives", 1); 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 // reset flags
gameFlagClear("seekers_released"); gameFlagClear("seekers_released");
@ -600,20 +584,23 @@ handleSeeker() {
wait 0.5; 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 // random primary weapon
player GiveWeapon(level.gameTweaks["seekers_primary_weapon"].value, RandomInt(9), false); player GiveWeapon(primaryWeapon, RandomInt(9), false);
player setSpawnWeapon(level.gameTweaks["seekers_primary_weapon"].value); player setSpawnWeapon(primaryWeapon);
player SwitchToWeapon(level.gameTweaks["seekers_primary_weapon"].value); player SwitchToWeapon(primaryWeapon);
// deagle + tactical knife // deagle + tactical knife
player GiveWeapon(level.gameTweaks["seekers_secondary_weapon"].value, 0, false); player GiveWeapon(secondaryWeapon, 0, false);
// single semtex // single semtex
player GiveWeapon("semtex_mp"); player GiveWeapon("semtex_mp");
// ammo // ammo
player GiveMaxAmmo(level.gameTweaks["seekers_primary_weapon"].value); player GiveMaxAmmo(primaryWeapon);
player GiveMaxAmmo(level.gameTweaks["seekers_secondary_weapon"].value); player GiveMaxAmmo(secondaryWeapon);
// gametype-friendly perks // gametype-friendly perks
player GivePerk("specialty_lightweight"); player GivePerk("specialty_lightweight");