1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-25 07:44:38 +01:00

Make peep.cpp compilable again

This commit is contained in:
Hielke Morsink
2018-04-01 15:34:05 +02:00
committed by duncanspumpkin
parent 80006cd4a0
commit c3723f337f
3 changed files with 578 additions and 554 deletions

View File

@@ -1322,6 +1322,22 @@ void rct_peep::UpdateRideLeaveVehicle()
sub_state = PEEP_RIDE_APPROACH_EXIT_WAYPOINTS;
}
/**
*
* rct2: 0x00695444
*/
static void peep_on_enter_or_exit_ridebrk(rct_peep * peep, sint32 rideIndex, sint32 flags)
{
if (flags & 1)
{
peep->OnExitRide(rideIndex);
}
else
{
peep->OnEnterRide(rideIndex);
}
}
/**
*
* rct2: 0x0069376A

File diff suppressed because it is too large Load Diff

View File

@@ -690,6 +690,7 @@ struct rct_peep
void Invalidate();
void UpdateCurrentActionSpriteType();
void SwitchToSpecialSprite(uint8 special_sprite_id);
void RemoveFromRide();
void OnEnterRide(uint8 rideIndex);
void OnExitRide(uint8 rideIndex);
@@ -737,15 +738,19 @@ private:
void UpdateRideShopLeave();
void TryGetUpFromSitting();
void RemoveFromQueue();
bool CheckForPath();
sint32 PerformNextAction(uint8 & pathing_result);
public: // TODO: Make these private again when done refactoring - they need to be public since they are called from non-member
// peep functions
bool UpdateAction(sint16 * actionX, sint16 * actionY, sint16 * xy_distance);
bool UpdateAction();
void SwitchNextActionSpriteType();
uint8 GetActionSpriteType();
void SpendMoney(money16 & peep_expend_type, money32 amount);
void SpendMoney(money32 amount);
private:
bool DecideAndBuyItem(uint8 rideIndex, sint32 shopItem, money32 price);
};
assert_struct_size(rct_peep, 0x100);