mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add missing Invalidate calls

This commit is contained in:
Matt 2019-08-21 12:31:05 +02:00
parent 66793e664a
commit e0afefc6de
No known key found for this signature in database
GPG Key ID: 6D4C24A61C93E208
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/peep/Guest.cpp
View File

@ -3369,6 +3369,7 @@ void Guest::UpdateBuying()
if (action != PEEP_ACTION_NONE_2) if (action != PEEP_ACTION_NONE_2)
{ {
UpdateAction(); UpdateAction();
Invalidate();
return; return;
} }
@ -5777,7 +5778,7 @@ void Guest::UpdateWatching()
{ {
// 6917F6 // 6917F6
UpdateAction(); UpdateAction();
Invalidate();
if (action != PEEP_ACTION_NONE_2) if (action != PEEP_ACTION_NONE_2)
return; return;
action = PEEP_ACTION_NONE_1; action = PEEP_ACTION_NONE_1;
@ -5862,6 +5863,7 @@ void Guest::UpdateUsingBin()
if (action != PEEP_ACTION_NONE_2) if (action != PEEP_ACTION_NONE_2)
{ {
UpdateAction(); UpdateAction();
Invalidate();
return; return;
} }

1
src/openrct2/peep/Peep.cpp
View File

@ -881,6 +881,7 @@ void Peep::UpdateFalling()
{ {
// Check to see if we are ready to drown. // Check to see if we are ready to drown.
UpdateAction(); UpdateAction();
Invalidate();
if (action == PEEP_ACTION_DROWNING) if (action == PEEP_ACTION_DROWNING)
return; return;

10
src/openrct2/peep/Staff.cpp
View File

@ -1242,6 +1242,7 @@ void Staff::UpdateWatering()
if (action != PEEP_ACTION_NONE_2) if (action != PEEP_ACTION_NONE_2)
{ {
UpdateAction(); UpdateAction();
Invalidate();
return; return;
} }
@ -1308,6 +1309,7 @@ void Staff::UpdateEmptyingBin()
} }
UpdateAction(); UpdateAction();
Invalidate();
if (action_frame != 11) if (action_frame != 11)
return; return;
@ -1531,6 +1533,7 @@ void Staff::UpdateAnswering()
return; return;
} }
UpdateAction(); UpdateAction();
Invalidate();
return; return;
} }
else if (sub_state <= 3) else if (sub_state <= 3)
@ -2234,6 +2237,7 @@ bool Staff::UpdateFixingFixVehicle(bool firstRun, Ride* ride)
} }
UpdateAction(); UpdateAction();
Invalidate();
uint8_t actionFrame = (action == PEEP_ACTION_STAFF_FIX) ? 0x25 : 0x50; uint8_t actionFrame = (action == PEEP_ACTION_STAFF_FIX) ? 0x25 : 0x50;
if (action_frame != actionFrame) if (action_frame != actionFrame)
@ -2275,6 +2279,8 @@ bool Staff::UpdateFixingFixVehicleMalfunction(bool firstRun, Ride* ride)
} }
UpdateAction(); UpdateAction();
Invalidate();
if (action_frame != 0x65) if (action_frame != 0x65)
{ {
return false; return false;
@ -2384,6 +2390,7 @@ bool Staff::UpdateFixingFixStationEnd(bool firstRun)
} }
UpdateAction(); UpdateAction();
Invalidate();
return false; return false;
} }
@ -2530,6 +2537,8 @@ bool Staff::UpdateFixingFixStationBrakes(bool firstRun, Ride* ride)
} }
UpdateAction(); UpdateAction();
Invalidate();
if (action_frame == 0x28) if (action_frame == 0x28)
{ {
ride->mechanic_status = RIDE_MECHANIC_STATUS_HAS_FIXED_STATION_BRAKES; ride->mechanic_status = RIDE_MECHANIC_STATUS_HAS_FIXED_STATION_BRAKES;
@ -2625,6 +2634,7 @@ bool Staff::UpdateFixingFinishFixOrInspect(bool firstRun, int32_t steps, Ride* r
if (action != PEEP_ACTION_NONE_2) if (action != PEEP_ACTION_NONE_2)
{ {
UpdateAction(); UpdateAction();
Invalidate();
return false; return false;
} }