This commit is contained in:
Lorenc Pekaj 2018-12-04 00:09:08 +11:00
parent 8feb261284
commit 41b68256b8
2 changed files with 11 additions and 20 deletions

View File

@ -14,10 +14,10 @@
#endif #endif
/* ** Definitions ** */ /* ** Definitions ** */
#define MAX_BURGLARY_SLOTS 8 #define MAX_BURGLARY_SLOTS ( 8 )
#define PROGRESS_CRACKING 0 #define PROGRESS_CRACKING ( 0 )
#define PROGRESS_BRUTEFORCE 1 #define PROGRESS_BRUTEFORCE ( 1 )
/* ** Variables ** */ /* ** Variables ** */
static stock static stock
@ -66,23 +66,14 @@ hook OnPlayerDriveVehicle( playerid, vehicleid )
Get2DCity( szCity, pX, pY, pZ ); Get2DCity( szCity, pX, pY, pZ );
if ( strmatch( szCity, "Los Santos" ) ) if ( strmatch( szCity, "Los Santos" ) ) {
{ X = 2522.1677, Y = -1717.4137, Z = 13.6086;
X = 2522.1677;
Y = -1717.4137;
Z = 13.6086;
} }
else if ( strmatch( szCity, "Las Venturas" ) ) else if ( strmatch( szCity, "Las Venturas" ) ) {
{ X = 2481.6812, Y = 1315.8477, Z = 10.6797;
X = 2481.6812;
Y = 1315.8477;
Z = 10.6797;
} }
else // default SF if not LV and LS else { // default SF if not LV and LS
{ X = -2480.2461, Y = 6.0720, Z = 25.6172;
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 ); 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." ); 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 ) 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 ) ) if ( IsPlayerAttachedObjectSlotUsed( playerid, 3 ) )
return ShowPlayerHelpDialog( playerid, 3000, "Your hands are busy at the moment." ); return ShowPlayerHelpDialog( playerid, 3000, "Your hands are busy at the moment." );

View File

@ -116,9 +116,9 @@ new
{ FC_ELECTRONIC, "Stereo System", 2100, 2175 }, { FC_ELECTRONIC, "Stereo System", 2100, 2175 },
{ FC_ELECTRONIC, "Wide-screen TV", 1786, 2500 }, { FC_ELECTRONIC, "Wide-screen TV", 1786, 2500 },
{ FC_ELECTRONIC, "Huge LCD", 19786, 3000 }, { FC_ELECTRONIC, "Huge LCD", 19786, 3000 },
{ FC_ELECTRONIC, "PC with Desk", 2181, 3400 },
{ FC_ELECTRONIC, "Small TV Unit", 2297, 3700 }, { FC_ELECTRONIC, "Small TV Unit", 2297, 3700 },
{ FC_ELECTRONIC, "TV Unit", 2296, 4000 }, { FC_ELECTRONIC, "TV Unit", 2296, 4000 },
{ FC_ELECTRONIC, "PC with Desk", 2181, 4200 },
// Bedroom // Bedroom
{ FC_BEDROOM, "Wooden Stance", 1743, 650 }, { FC_BEDROOM, "Wooden Stance", 1743, 650 },
{ FC_BEDROOM, "Wooden Counter", 1416, 750 }, { FC_BEDROOM, "Wooden Counter", 1416, 750 },