Merge branch 'develop' of github.com:iw4x/iw4x-rawfiles into develop
commit
b9ef601902
|
@ -527,7 +527,7 @@ giveLoadout( team, class, allowCopycat )
|
|||
self _clearPerks();
|
||||
self _detachAll();
|
||||
|
||||
if ( level.killstreakRewards )
|
||||
if ( level.killstreakRewards && !isDefined( loadoutKillstreak1 ) && !isDefined( loadoutKillstreak2 ) && !isDefined( loadoutKillstreak3 ) )
|
||||
{
|
||||
if ( getDvarInt( "scr_classic" ) == 1 )
|
||||
{
|
||||
|
|
|
@ -764,7 +764,7 @@ setSpecialLoadouts()
|
|||
level.infect_loadouts["axis"]["loadoutKillstreak1"] = "none";
|
||||
level.infect_loadouts["axis"]["loadoutKillstreak2"] = "none";
|
||||
level.infect_loadouts["axis"]["loadoutKillstreak3"] = "none";
|
||||
level.infect_loadouts["axis"]["loadoutDeathstreak"] = "none";
|
||||
level.infect_loadouts["axis"]["loadoutDeathstreak"] = "specialty_null";
|
||||
|
||||
level.infect_loadouts["axis_initial"]["loadoutPrimary"] = "throwingknife";
|
||||
level.infect_loadouts["axis_initial"]["loadoutPrimaryAttachment"] = "none";
|
||||
|
@ -782,7 +782,7 @@ setSpecialLoadouts()
|
|||
level.infect_loadouts["axis_initial"]["loadoutKillstreak1"] = "none";
|
||||
level.infect_loadouts["axis_initial"]["loadoutKillstreak2"] = "none";
|
||||
level.infect_loadouts["axis_initial"]["loadoutKillstreak3"] = "none";
|
||||
level.infect_loadouts["axis_initial"]["loadoutDeathstreak"] = "none";
|
||||
level.infect_loadouts["axis_initial"]["loadoutDeathstreak"] = "specialty_null";
|
||||
|
||||
level.infect_loadouts["allies"]["loadoutPrimary"] = "spas12";
|
||||
level.infect_loadouts["allies"]["loadoutPrimaryAttachment"] = "xmags";
|
||||
|
|
Loading…
Reference in New Issue