From 4ae2a865120b502479221d8a4dca9575aaa8feda Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Fri, 5 Oct 2018 16:32:32 +1000 Subject: [PATCH] passive mode is now automatically enabled --- gamemodes/irresistible/cnr/checkpoints.pwn | 2 +- gamemodes/irresistible/cnr/player_settings.pwn | 2 +- gamemodes/sf-cnr.pwn | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gamemodes/irresistible/cnr/checkpoints.pwn b/gamemodes/irresistible/cnr/checkpoints.pwn index a6260c1..e6e0710 100644 --- a/gamemodes/irresistible/cnr/checkpoints.pwn +++ b/gamemodes/irresistible/cnr/checkpoints.pwn @@ -19,7 +19,7 @@ #define CP_BANK_MENU_LS ( 5 ) #define CP_PAINTBALL ( 6 ) #define CP_AMMUNATION_0 ( 7 ) -#define CP_LUMBERJACK ( 8 ) +//#define CP_LUMBERJACK ( 8 ) #define CP_FIGHTSTYLE ( 9 ) #define CP_AMMUNATION_1 ( 10 ) #define CP_AMMUNATION_2 ( 11 ) diff --git a/gamemodes/irresistible/cnr/player_settings.pwn b/gamemodes/irresistible/cnr/player_settings.pwn index 55283b7..754807e 100644 --- a/gamemodes/irresistible/cnr/player_settings.pwn +++ b/gamemodes/irresistible/cnr/player_settings.pwn @@ -30,7 +30,7 @@ static stock g_PlayerSettings [ MAX_SETTINGS ] [ 24 ] = { { "Prevent Bail Offers" }, { "Prevent Event Teleports" }, { "Prevent Gang Invites" }, { "Prevent Chat Prefixes" }, { "Prevent Ransom Offers" }, { "Prevent Auto-Save" }, { "Display Connection Log" }, { "Display Hitmarker" }, { "Set V.I.P Skin" }, { "Hide Total Coin Bar" }, { "Hide Last Donor Text" }, - { "Manual Pickup Weapon" }, { "Passive Mode" } + { "Manual Pickup Weapon" }, { "Prevent Passive Mode" } }, bool: p_PlayerSettings [ MAX_PLAYERS ] [ MAX_SETTINGS char ] ; diff --git a/gamemodes/sf-cnr.pwn b/gamemodes/sf-cnr.pwn index 1ccacd8..aa00bab 100644 --- a/gamemodes/sf-cnr.pwn +++ b/gamemodes/sf-cnr.pwn @@ -1943,7 +1943,6 @@ public OnGameModeInit() CreateDynamicPickup( 337, 2, -2744.6367, 1264.8502, 11.77030 ); // Spade @Mining CreateDynamicPickup( 337, 2, 589.440800, 869.86900, -42.4973 ); // Spade @Mining CreateDynamicPickup( 337, 2, -1998.7056, 1777.7448, 43.73860 ); // Spade @Alcatraz - // CreateDynamicPickup( 341, 2, -2069.1431, 1788.9657, 43.7386 ); // Chainsaw @Alcatraz CreateDynamicPickup( 371, 2, 1318.92200, 2002.7311, 1200.250 ); // Parachute @Shamal CreateDynamicPickup( 371, 2, -1745.2754, 59.301500, 866.4556 ); // Parachute @Veloxity @@ -23228,7 +23227,7 @@ stock DisablePlayerSpawnProtection( playerid ) stock SetPlayerPassiveMode( playerid ) { - if ( ! IsPlayerSettingToggled( playerid, SETTING_PASSIVE_MODE ) ) + if ( IsPlayerSettingToggled( playerid, SETTING_PASSIVE_MODE ) ) return 0; // reset any labels etc @@ -23244,7 +23243,7 @@ stock SetPlayerPassiveMode( playerid ) stock IsPlayerPassive( playerid ) { - return IsPlayerSettingToggled( playerid, SETTING_PASSIVE_MODE ) && ! p_WantedLevel[ playerid ] && p_Class[ playerid ] != CLASS_POLICE && ! p_PassiveModeDisabled{ playerid }; + return ! IsPlayerSettingToggled( playerid, SETTING_PASSIVE_MODE ) && ! p_WantedLevel[ playerid ] && p_Class[ playerid ] != CLASS_POLICE && ! p_PassiveModeDisabled{ playerid }; } stock ResetPlayerPassiveMode( playerid, bool: passive_disabled = false )