ChronosXYZ/sfcnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lorenc Pekaj 2019-03-02 14:58:26 +11:00
commit 4f71af4c99
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gamemodes/irresistible/cnr/features/cop/arrest.pwn
View File

@ -503,7 +503,7 @@ stock AwardNearestLEO( playerid, reason )
new closestLEO = GetClosestPlayerEx( playerid, CLASS_POLICE, radius ); new closestLEO = GetClosestPlayerEx( playerid, CLASS_POLICE, radius );
if ( IsPlayerConnected( closestLEO ) ) if ( IsPlayerConnected( closestLEO ) && !p_Spectating{ closestLEO } )
{ {
new reasonText[ 24 ]; new reasonText[ 24 ];

2
gamemodes/irresistible/cnr/features/houses/realestate.pwn
View File

@ -79,7 +79,7 @@ hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
if ( IsPlayerInAnyVehicle( playerid ) ) 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 ] ); 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 else
{ {

2
gamemodes/irresistible/cnr/features/pool.pwn
View File

@ -11,7 +11,7 @@
/* ** Definitions ** */ /* ** Definitions ** */
#define POCKET_RADIUS ( 0.09 ) #define POCKET_RADIUS ( 0.09 )
#define POOL_TIMER_SPEED ( 500 ) #define POOL_TIMER_SPEED ( 25 )
#define DEFAULT_AIM ( 0.38 ) #define DEFAULT_AIM ( 0.38 )
#define DEFAULT_POOL_STRING "Pool Table\n{FFFFFF}Press ENTER To Play" #define DEFAULT_POOL_STRING "Pool Table\n{FFFFFF}Press ENTER To Play"
#define POOL_FEE_RATE ( 0.02 ) #define POOL_FEE_RATE ( 0.02 )

4
gamemodes/irresistible/cnr/features/weapon_drop.pwn
View File

@ -133,8 +133,8 @@ hook OnPlayerPickUpDynPickup( playerid, pickupid )
// Health Pickups // Health Pickups
if ( pickupid == g_HealthPickup ) { if ( pickupid == g_HealthPickup ) {
SetPlayerHealth( playerid, 100.0 ); new Float: health;
return 1; if ( GetPlayerHealth( playerid, health ) <= 100 ) return SetPlayerHealth( playerid, 100.0 );
} }
// ignore if theres a delay // ignore if theres a delay

2
gamemodes/irresistible/physics_dynamic.pwn
View File

@ -19,7 +19,7 @@
#include <foreach> #include <foreach>
#if !defined PHY_TIMER_INTERVAL #if !defined PHY_TIMER_INTERVAL
#define PHY_TIMER_INTERVAL (20.0) #define PHY_TIMER_INTERVAL (50.0)
#endif #endif
#if !defined PHY_MAX_OBJECTS #if !defined PHY_MAX_OBJECTS
#define PHY_MAX_OBJECTS (1024) #define PHY_MAX_OBJECTS (1024)