Commit 4f71af4c authored by Lorenc Pekaj's avatar Lorenc Pekaj

Merge branch 'master' of ssh://bitbucket.org/lorenc/cnr

parents 8d6a2921 60e1a70e
......@@ -503,7 +503,7 @@ stock AwardNearestLEO( playerid, reason )
new closestLEO = GetClosestPlayerEx( playerid, CLASS_POLICE, radius );
if ( IsPlayerConnected( closestLEO ) )
if ( IsPlayerConnected( closestLEO ) && !p_Spectating{ closestLEO } )
{
new reasonText[ 24 ];
......
......@@ -79,7 +79,7 @@ hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
if ( IsPlayerInAnyVehicle( playerid ) )
{
GPS_SetPlayerWaypoint( playerid, g_houseData[ houseid ] [ E_HOUSE_NAME ], g_houseData[ houseid ] [ E_EX ], g_houseData[ houseid ] [ E_EY ], g_houseData[ houseid ] [ E_EZ ] );
SendClientMessageFormatted( playerid, -1, ""COL_GREY"[GPS]"COL_WHITE" You have set your destination to %s. Follow the arrow to reach your destination.", g_houseData[ houseid ] [ E_HOUSE_NAME ] );
SendClientMessageFormatted( playerid, -1, ""COL_GREY"[GPS]"COL_WHITE" You have set your destination to %s"COL_WHITE". Follow the arrow to reach your destination.", g_houseData[ houseid ] [ E_HOUSE_NAME ] );
}
else
{
......
......@@ -11,7 +11,7 @@
/* ** Definitions ** */
#define POCKET_RADIUS ( 0.09 )
#define POOL_TIMER_SPEED ( 500 )
#define POOL_TIMER_SPEED ( 25 )
#define DEFAULT_AIM ( 0.38 )
#define DEFAULT_POOL_STRING "Pool Table\n{FFFFFF}Press ENTER To Play"
#define POOL_FEE_RATE ( 0.02 )
......
......@@ -133,8 +133,8 @@ hook OnPlayerPickUpDynPickup( playerid, pickupid )
// Health Pickups
if ( pickupid == g_HealthPickup ) {
SetPlayerHealth( playerid, 100.0 );
return 1;
new Float: health;
if ( GetPlayerHealth( playerid, health ) <= 100 ) return SetPlayerHealth( playerid, 100.0 );
}
// ignore if theres a delay
......
......@@ -19,7 +19,7 @@
#include <foreach>
#if !defined PHY_TIMER_INTERVAL
#define PHY_TIMER_INTERVAL (20.0)
#define PHY_TIMER_INTERVAL (50.0)
#endif
#if !defined PHY_MAX_OBJECTS
#define PHY_MAX_OBJECTS (1024)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment