From 22f69ca1be760bead4df58c6fc20e8004e5dbd19 Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Sat, 15 Sep 2018 12:05:53 +1000 Subject: [PATCH] setlevel was not working for level 6 ... moved server defs to _config --- gamemodes/irresistible/cnr/commands/admin/admin_six.pwn | 2 +- gamemodes/irresistible/config/_config.pwn | 6 ++++++ gamemodes/sf-cnr.pwn | 9 +-------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gamemodes/irresistible/cnr/commands/admin/admin_six.pwn b/gamemodes/irresistible/cnr/commands/admin/admin_six.pwn index c2dc327..527a48a 100644 --- a/gamemodes/irresistible/cnr/commands/admin/admin_six.pwn +++ b/gamemodes/irresistible/cnr/commands/admin/admin_six.pwn @@ -260,7 +260,7 @@ CMD:setlevel( playerid, params[ ] ) iLevel ; if ( !IsPlayerAdmin( playerid ) && p_AdminLevel[ playerid ] < 6 ) return SendError( playerid, ADMIN_COMMAND_REJECT ); - else if ( sscanf( params, "d", pID, iLevel ) ) SendUsage( playerid, "/setlevel [PLAYER_ID] [LEVEL]"); + else if ( sscanf( params, "ud", pID, iLevel ) ) SendUsage( playerid, "/setlevel [PLAYER_ID] [LEVEL]"); else if ( iLevel < 0 || iLevel > 6 ) return SendError( playerid, "Please specify an administration level between 0 and 6." ); else if ( !IsPlayerConnected( pID ) || IsPlayerNPC( pID ) ) return SendError( playerid, "Invalid Player ID." ); else diff --git a/gamemodes/irresistible/config/_config.pwn b/gamemodes/irresistible/config/_config.pwn index 9101a56..eca375b 100644 --- a/gamemodes/irresistible/config/_config.pwn +++ b/gamemodes/irresistible/config/_config.pwn @@ -8,3 +8,9 @@ /* ** Includes ** */ #include "irresistible\config\database.pwn" // keep #1 #include "irresistible\config\colors.pwn" + +/* ** Configuration ** */ +#define FILE_BUILD "v11.36.105" +#define SERVER_NAME "San Fierro Cops And Robbers (0.3.7)" +#define SERVER_WEBSITE "www.sfcnr.com" +#define SERVER_IP "54.36.127.43:7777" diff --git a/gamemodes/sf-cnr.pwn b/gamemodes/sf-cnr.pwn index b6209b7..7b0a7ea 100644 --- a/gamemodes/sf-cnr.pwn +++ b/gamemodes/sf-cnr.pwn @@ -112,13 +112,6 @@ new bool: False = false; #define CreateBillboard(%0,%1,%2,%3,%4) SetDynamicObjectMaterialText(CreateDynamicObject(7246,%1,%2,%3,0,0,%4),0,(%0),120,"Arial",24,0,-1,-16777216,1) -/* ** Configuration ** */ -#define FILE_BUILD "v11.36.105" -#define SERVER_NAME "San Fierro Cops And Robbers (0.3.7)" -#define SERVER_WEBSITE "www.sfcnr.com" -#define SERVER_IP "192.169.82.202:7777" - - //#define MAX_WEAPONS 54 #define MAX_CLASS_BAN_WARNS 3 #define MAX_CAR_MODS 15 @@ -14549,7 +14542,7 @@ function OnSafeHelperUpdate( playerid, robberyid ) Float: distance = distanceFromSafe( playerid, robberyid ) ; - if ( robberyid == INVALID_OBJECT_ID || distance > 100.0 || !IsPlayerConnected( playerid ) || !IsPlayerSpawned( playerid ) ) + if ( robberyid == INVALID_OBJECT_ID || distance > 100.0 || ! IsPlayerConnected( playerid ) || ! IsPlayerSpawned( playerid ) || IsPlayerInCasino( playerid ) || IsPlayerPlayingPool( playerid ) ) { p_SafeHelperTimer[ playerid ] = -1; HidePlayerHelpDialog( playerid );