mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 00:34:46 +01:00
Code Issues Releases Wiki Activity

Refactor #9291: Move easter egg code to Guest

Browse Source 
Refactored static Peep functions related to easter egg names into member
functions in the Guest struct.
This commit is contained in:
Jim Armstrong
2019-06-21 14:40:09 -04:00
parent 6bd298b3a3
commit cc62e41feb
6 changed files with 360 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/openrct2/ride/Station.cpp
View File

@@ -284,23 +284,29 @@ static void ride_race_init_vehicle_speeds(Ride* ride)
{
Peep* peep = &get_sprite(vehicle->peep[0])->peep;
switch (peep_get_easteregg_name_id(peep))
// Easter egg names should only work on guests
Guest* guest = peep->AsGuest();
if (guest != nullptr)
{
case EASTEREGG_PEEP_NAME_MICHAEL_SCHUMACHER:
vehicle->speed += 35;
break;
case EASTEREGG_PEEP_NAME_JACQUES_VILLENEUVE:
vehicle->speed += 25;
break;
case EASTEREGG_PEEP_NAME_DAMON_HILL:
vehicle->speed += 55;
break;
case EASTEREGG_PEEP_NAME_CHRIS_SAWYER:
vehicle->speed += 14;
break;
case EASTEREGG_PEEP_NAME_MR_BEAN:
vehicle->speed = 9;
break;
switch (guest->GetEasterEggNameId())
{
case EASTEREGG_PEEP_NAME_MICHAEL_SCHUMACHER:
vehicle->speed += 35;
break;
case EASTEREGG_PEEP_NAME_JACQUES_VILLENEUVE:
vehicle->speed += 25;
break;
case EASTEREGG_PEEP_NAME_DAMON_HILL:
vehicle->speed += 55;
break;
case EASTEREGG_PEEP_NAME_CHRIS_SAWYER:
vehicle->speed += 14;
break;
case EASTEREGG_PEEP_NAME_MR_BEAN:
vehicle->speed = 9;
break;
}
}
}
}