From f22566c215c4d1200d8d133cf809c2fe182cc2d0 Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Mon, 24 Sep 2018 23:28:47 +1000 Subject: [PATCH] make player passive if they leave jail --- gamemodes/sf-cnr.pwn | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gamemodes/sf-cnr.pwn b/gamemodes/sf-cnr.pwn index e2e2c2f..d5be56d 100644 --- a/gamemodes/sf-cnr.pwn +++ b/gamemodes/sf-cnr.pwn @@ -5218,7 +5218,7 @@ public OnPlayerUnjailed( playerid, reasonid ) PlainUnjailPlayer ( playerid ); SetPlayerColorToTeam ( playerid ); ClearPlayerWantedLevel ( playerid ); - ResetPlayerPassiveMode ( playerid ); + SetPlayerPassiveMode ( playerid ); return 1; } @@ -17993,12 +17993,8 @@ stock GivePlayerWantedLevel( playerid, wantedlevel, bool:loadingstats = false ) { format( szWanted, sizeof( szWanted ), "] %d ]", p_WantedLevel[ playerid ] ); PlayerTextDrawSetString( playerid, p_WantedLevelTD[ playerid ], szWanted ); - if ( !p_inMovieMode{ playerid } ) PlayerTextDrawShow( playerid, p_WantedLevelTD[ playerid ] ); - - // remove passive mode if the player is wanted - if ( p_PassiveModeExpireTimer[ playerid ] == -1 ) { - p_PassiveModeExpireTimer[ playerid ] = PassiveMode_Reset( playerid, 4 ); // it will just set it to anything but -1 for now - } + if ( ! p_inMovieMode{ playerid } ) PlayerTextDrawShow( playerid, p_WantedLevelTD[ playerid ] ); + PassiveMode_Reset( playerid, 0 ); // remove passive mode if the player is wanted } } else SetPlayerColorToTeam( playerid ), PlayerTextDrawHide( playerid, p_WantedLevelTD[ playerid ] ), Uncuff( playerid ); @@ -25709,7 +25705,7 @@ stock ResetPlayerPassiveMode( playerid, bool: passive_disabled = false ) function PassiveMode_Reset( playerid, time_left ) { - if ( -- time_left <= 0 ) + if ( p_WantedLevel[ playerid ] > 0 || p_Class[ playerid ] != CLASS_CIVILIAN || -- time_left <= 0 ) { ResetPlayerPassiveMode( playerid, .passive_disabled = true ); ShowPlayerHelpDialog( playerid, 2000, "Passive mode is ~r~disabled." );