diff options
| author | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2021-12-30 02:40:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-30 02:40:22 +0000 |
| commit | 7ec925302424beef8a76bcac454ca900cd3f558a (patch) | |
| tree | e7d7dea966ad87ac1523fe474e33d377ccd346e5 | |
| parent | 3e5fb06337812e4a6b2aff3eea203ce2b76cc46d (diff) | |
| parent | d90fccb4cef95c2809cabab8454c22121c91efef (diff) | |
| download | NorthstarMods-7ec925302424beef8a76bcac454ca900cd3f558a.tar.gz NorthstarMods-7ec925302424beef8a76bcac454ca900cd3f558a.zip | |
Merge pull request #34 from abarichello/fix/dropship-offhand-weapon
Disable offhand weapon during dropship intro
| -rw-r--r-- | Northstar.CustomServers/mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut index d3b4cd7e7..8e624c14a 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut +++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut @@ -180,6 +180,7 @@ void function SpawnPlayerIntoDropship( entity player ) // respawn player and holster their weapons so they aren't out player.RespawnPlayer( null ) + HolsterAndDisableWeapons(player) player.DisableWeaponViewModel() // hide hud and fade screen out from black @@ -187,7 +188,7 @@ void function SpawnPlayerIntoDropship( entity player ) ScreenFadeFromBlack( player, 0.5, 0.5 ) // faction leaders are done clientside, spawn them here Remote_CallFunction_NonReplay( player, "ServerCallback_SpawnFactionCommanderInDropship", playerDropship.dropship.GetEncodedEHandle(), file.introStartTime ) - + // do firstperson sequence FirstPersonSequenceStruct idleSequence idleSequence.firstPersonAnim = DROPSHIP_IDLE_ANIMS_POV[ playerDropshipIndex ] @@ -229,6 +230,7 @@ void function PlayerJumpsFromDropship( entity player ) // show weapon viewmodel and hud and let them move again player.MovementEnable() player.EnableWeaponViewModel() + DeployAndEnableWeapons(player) RemoveCinematicFlag( player, CE_FLAG_CLASSIC_MP_SPAWNING ) } }) |