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

Merged in traindriver (pull request #17)

Browse Source 
traindriver bugfixes
This commit is contained in:
Steven Howard 2018-09-18 21:57:44 +00:00 committed by Lorenc Pekaj
commit de8163bfe7
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gamemodes/irresistible/cnr/features/minijobs/traindriver.pwn
View File

@ -13,6 +13,7 @@
/* ** Definitions ** */ /* ** Definitions ** */
#define INVALID_TRAIN_ROUTE ( 0xFF ) #define INVALID_TRAIN_ROUTE ( 0xFF )
#define LOADING_SPEED ( 5 ) // in mph
/* ** Variables ** */ /* ** Variables ** */
enum E_STATION_DATA enum E_STATION_DATA
@ -96,7 +97,7 @@ hook OnPlayerStateChange( playerid, newstate, oldstate )
{ {
if ( IsVehicleTrain( GetPlayerVehicleID( playerid ) ) ) if ( IsVehicleTrain( GetPlayerVehicleID( playerid ) ) )
{ {
ShowPlayerHelpDialog( playerid, 3000, "You can begin a train job by typing ~g~~h~/train" ); ShowPlayerHelpDialog( playerid, 3000, "You can begin a train job by typing ~g~/train" );
} }
} }
@ -107,6 +108,9 @@ hook OnPlayerEnterDynRaceCP( playerid, checkpointid )
{ {
if ( checkpointid == p_TrainCheckPoint[ playerid ] ) if ( checkpointid == p_TrainCheckPoint[ playerid ] )
{ {
if ( Train_GetSpeed( GetPlayerVehicleID( playerid ) ) > LOADING_SPEED )
return SendError( playerid, "Please slow down before %s your passengers!", p_TrainRoute[ playerid ] { 0 } != INVALID_TRAIN_ROUTE ? ( "loading" ) : ( "un-loading" ) ), 1;
DestroyDynamicRaceCP ( p_TrainCheckPoint[ playerid ] ); DestroyDynamicRaceCP ( p_TrainCheckPoint[ playerid ] );
DestroyDynamicMapIcon ( p_TrainMapIcon[ playerid ] ); DestroyDynamicMapIcon ( p_TrainMapIcon[ playerid ] );
@ -121,7 +125,7 @@ hook OnPlayerEnterDynRaceCP( playerid, checkpointid )
KillTimer( p_TrainLoadTimer[ playerid ] ); KillTimer( p_TrainLoadTimer[ playerid ] );
p_TrainLoadTimer [ playerid ] = 0xFFFF; p_TrainLoadTimer [ playerid ] = 0xFFFF;
p_TrainLoadTimer [ playerid ] = SetTimerEx( "OnPilotLoadCargo", 5000, false, "d", playerid ); p_TrainLoadTimer [ playerid ] = SetTimerEx( "OnTrainLoadPassengers", 5000, false, "d", playerid );
TogglePlayerControllable( playerid, false ); TogglePlayerControllable( playerid, false );
@ -154,6 +158,19 @@ hook OnPlayerEnterDynRaceCP( playerid, checkpointid )
} }
/* ** Functions ** */ /* ** Functions ** */
stock Train_GetSpeed( vehicleid )
{
new Float: speed_x, Float: speed_y, Float: speed_z, Float: iFinal, iSpeed,
Float: x, Float: y, Float: z;
GetVehiclePos( vehicleid, x, y, z );
GetVehicleVelocity( vehicleid, speed_x, speed_y, speed_z );
iFinal = floatsqroot( ( ( speed_x * speed_x ) + ( speed_y * speed_y ) ) + ( speed_z * speed_z ) ) * 136.666667;
iSpeed = floatround( iFinal, floatround_round );
return iSpeed;
}
stock StopPlayerTrainWork( playerid ) stock StopPlayerTrainWork( playerid )
{ {
DestroyDynamicRaceCP ( p_TrainCheckPoint[ playerid ] ); DestroyDynamicRaceCP ( p_TrainCheckPoint[ playerid ] );
@ -167,6 +184,7 @@ stock StopPlayerTrainWork( playerid )
p_TrainCheckPoint [ playerid ] = 0xFFFF; p_TrainCheckPoint [ playerid ] = 0xFFFF;
p_TrainMapIcon [ playerid ] = 0xFFFF; p_TrainMapIcon [ playerid ] = 0xFFFF;
p_TrainCancelTimer [ playerid ] = 0xFFFF; p_TrainCancelTimer [ playerid ] = 0xFFFF;
p_TrainLoadTimer [ playerid ] = 0xFFFF;
p_TrainPositionTimer [ playerid ] = 0xFFFF; p_TrainPositionTimer [ playerid ] = 0xFFFF;
p_TrainRoute [ playerid ] { 0 } = INVALID_PILOT_ROUTE; p_TrainRoute [ playerid ] { 0 } = INVALID_PILOT_ROUTE;
p_TrainRoute [ playerid ] { 1 } = INVALID_PILOT_ROUTE; p_TrainRoute [ playerid ] { 1 } = INVALID_PILOT_ROUTE;
@ -174,6 +192,20 @@ stock StopPlayerTrainWork( playerid )
PlayerTextDrawHide( playerid, p_TruckingTD[ playerid ] ); PlayerTextDrawHide( playerid, p_TruckingTD[ playerid ] );
} }
function OnTrainLoadPassengers( playerid )
{
if ( !IsPlayerConnected( playerid ) )
return 0;
if ( !IsPlayerInAnyVehicle( playerid ) )
return 0;
TogglePlayerControllable( playerid, true );
ShowPlayerHelpDialog( playerid, 7500, "Great! All of your passengers are sitting comfortably!" );
return KillTimer( p_TrainLoadTimer[ playerid ] ), p_TrainLoadTimer[ playerid ] = 0xFFFF, 1;
}
function OnTrainPositionUpdate( playerid, routeid ) function OnTrainPositionUpdate( playerid, routeid )
{ {
if ( !IsPlayerInAnyVehicle( playerid ) && !p_hasTrainJob{ playerid } && ( p_TrainRoute[ playerid ] { 0 } == 0 && p_TrainRoute[ playerid ] { 1 } == 0 ) ) { if ( !IsPlayerInAnyVehicle( playerid ) && !p_hasTrainJob{ playerid } && ( p_TrainRoute[ playerid ] { 0 } == 0 && p_TrainRoute[ playerid ] { 1 } == 0 ) ) {