From 41b68256b8e7b5c7979c87f144f4f9d9101a4e6f Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Tue, 4 Dec 2018 00:09:08 +1100 Subject: [PATCH] cleanup --- .../cnr/features/houses/burglar.pwn | 29 +++++++------------ .../cnr/features/houses/furniture.pwn | 2 +- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/gamemodes/irresistible/cnr/features/houses/burglar.pwn b/gamemodes/irresistible/cnr/features/houses/burglar.pwn index 70c5fd9..f41f7ca 100644 --- a/gamemodes/irresistible/cnr/features/houses/burglar.pwn +++ b/gamemodes/irresistible/cnr/features/houses/burglar.pwn @@ -14,10 +14,10 @@ #endif /* ** Definitions ** */ -#define MAX_BURGLARY_SLOTS 8 +#define MAX_BURGLARY_SLOTS ( 8 ) -#define PROGRESS_CRACKING 0 -#define PROGRESS_BRUTEFORCE 1 +#define PROGRESS_CRACKING ( 0 ) +#define PROGRESS_BRUTEFORCE ( 1 ) /* ** Variables ** */ static stock @@ -66,23 +66,14 @@ hook OnPlayerDriveVehicle( playerid, vehicleid ) Get2DCity( szCity, pX, pY, pZ ); - if ( strmatch( szCity, "Los Santos" ) ) - { - X = 2522.1677; - Y = -1717.4137; - Z = 13.6086; + if ( strmatch( szCity, "Los Santos" ) ) { + X = 2522.1677, Y = -1717.4137, Z = 13.6086; } - else if ( strmatch( szCity, "Las Venturas" ) ) - { - X = 2481.6812; - Y = 1315.8477; - Z = 10.6797; + else if ( strmatch( szCity, "Las Venturas" ) ) { + X = 2481.6812, Y = 1315.8477, Z = 10.6797; } - else // default SF if not LV and LS - { - X = -2480.2461; - Y = 6.0720; - Z = 25.6172; + else { // default SF if not LV and LS + X = -2480.2461, Y = 6.0720, Z = 25.6172; } p_PawnStoreMapIcon[ playerid ] = CreateDynamicMapIconEx( X, Y, Z, 51, 0, MAPICON_GLOBAL, 6000.0, { -1 }, { -1 }, aPlayer ); @@ -348,7 +339,7 @@ hook OnPlayerKeyStateChange( playerid, newkeys, oldkeys ) return SendError( playerid, "You are not close to any furniture." ); if ( g_houseFurniture[ furniture_id ] [ E_CATEGORY ] != FC_ELECTRONIC && g_houseFurniture[ furniture_id ] [ E_CATEGORY ] != FC_WEAPONS ) - return ShowPlayerHelpDialog( playerid, 3000, "The furniture you're near is not an electronic." ); + return ShowPlayerHelpDialog( playerid, 3000, "The furniture you're near is not an electronic or weapon." ); if ( IsPlayerAttachedObjectSlotUsed( playerid, 3 ) ) return ShowPlayerHelpDialog( playerid, 3000, "Your hands are busy at the moment." ); diff --git a/gamemodes/irresistible/cnr/features/houses/furniture.pwn b/gamemodes/irresistible/cnr/features/houses/furniture.pwn index c769ae6..e4b46c1 100644 --- a/gamemodes/irresistible/cnr/features/houses/furniture.pwn +++ b/gamemodes/irresistible/cnr/features/houses/furniture.pwn @@ -116,9 +116,9 @@ new { FC_ELECTRONIC, "Stereo System", 2100, 2175 }, { FC_ELECTRONIC, "Wide-screen TV", 1786, 2500 }, { FC_ELECTRONIC, "Huge LCD", 19786, 3000 }, + { FC_ELECTRONIC, "PC with Desk", 2181, 3400 }, { FC_ELECTRONIC, "Small TV Unit", 2297, 3700 }, { FC_ELECTRONIC, "TV Unit", 2296, 4000 }, - { FC_ELECTRONIC, "PC with Desk", 2181, 4200 }, // Bedroom { FC_BEDROOM, "Wooden Stance", 1743, 650 }, { FC_BEDROOM, "Wooden Counter", 1416, 750 },