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

OnServerUpdate & OnPlayerUpdateEx now hookable

Browse Source
This commit is contained in:
Lorenc Pekaj 2018-09-11 08:01:18 +10:00
parent 97b129e2fe
commit 64923afd6d
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,5 +100,5 @@ hook OnServerUpdate( )
// throttle // throttle
g_randomMessageTick = GetServerTime( ) + 30; g_randomMessageTick = GetServerTime( ) + 30;
} }
return 1; return Y_HOOKS_CONTINUE_RETURN_1;
} }

15
gamemodes/sf-cnr.pwn
View File

@ -2086,7 +2086,7 @@ new
/* ** Forwards ** */ /* ** Forwards ** */
public OnPlayerDriveVehicle( playerid, vehicleid ); public OnPlayerDriveVehicle( playerid, vehicleid );
public OnServerUpdate( ); public OnServerUpdateTimer( );
public OnHelpHTTPResponse( index, response_code, data[ ] ); public OnHelpHTTPResponse( index, response_code, data[ ] );
public OnRulesHTTPResponse( index, response_code, data[ ] ); public OnRulesHTTPResponse( index, response_code, data[ ] );
public OnTwitterHTTPResponse( index, response_code, data[ ] ); public OnTwitterHTTPResponse( index, response_code, data[ ] );
@ -3222,7 +3222,7 @@ public OnGameModeInit()
mysql_function_query( dbHandle, "SELECT * FROM `BUSINESSES`", true, "OnBusinessLoad", "" ); mysql_function_query( dbHandle, "SELECT * FROM `BUSINESSES`", true, "OnBusinessLoad", "" );
/* ** Timers ** */ /* ** Timers ** */
rl_ServerUpdate = SetTimer( "OnServerUpdate", 960, true ); rl_ServerUpdate = SetTimer( "OnServerUpdateTimer", 960, true );
rl_ZoneUpdate = SetTimer( "ZoneTimer", 980, true ); rl_ZoneUpdate = SetTimer( "ZoneTimer", 980, true );
HTTP( 0, HTTP_GET, "files.sfcnr.com/en_rules.txt", "", "OnRulesHTTPResponse" ); HTTP( 0, HTTP_GET, "files.sfcnr.com/en_rules.txt", "", "OnRulesHTTPResponse" );
@ -3583,13 +3583,17 @@ public OnGameModeExit( )
return 1; return 1;
} }
public OnServerUpdate( ) public OnServerUpdateTimer( )
{ {
static static
iState, iVehicle, iWeapon, iAmmo, iKeys, iState, iVehicle, iWeapon, iAmmo, iKeys,
Float: fX, Float: fY, Float: fZ, Float: fLastRate Float: fX, Float: fY, Float: fZ, Float: fLastRate
; ;
// for hooks
CallLocalFunction( "OnServerUpdate", "" );
// better to store in a variable as we are getting the timestamp from hardware
g_iTime = gettime( ); g_iTime = gettime( );
// Time For Tax? // Time For Tax?
@ -3626,7 +3630,8 @@ public OnServerUpdate( )
// Begin iterating all players // Begin iterating all players
foreach ( new playerid : Player ) foreach ( new playerid : Player )
{ {
CallLocalFunction( "OnPlayerUpdateEx", "dd", playerid ); // For modules that wish to update data appropriately
CallLocalFunction( "OnPlayerUpdateEx", "d", playerid );
if ( IsPlayerSpawned( playerid ) && p_PlayerLogged{ playerid } ) if ( IsPlayerSpawned( playerid ) && p_PlayerLogged{ playerid } )
{ {
@ -4181,7 +4186,7 @@ public OnServerUpdate( )
g_RestoreRobberiesBribes = g_iTime + 10; g_RestoreRobberiesBribes = g_iTime + 10;
} }
return 1; return Y_HOOKS_CONTINUE_RETURN_1;
} }
stock GetGangCapturedTurfs( gangid ) stock GetGangCapturedTurfs( gangid )