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

Define PEEP_ACTION_SPRITE_TYPE_SITTING_IDLE 

Previously untitled 'PEEP_ACTION_SPRITE_TYPE7' is actually a single-frame animation for sitting on benches, from looking at the sprite. Makes sense with the way the value is used in the code too.
This commit is contained in:
Richard Fine 2019-01-01 23:06:57 +00:00
parent f3292194f5
commit 73686e84d6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -911,7 +911,7 @@ void rct_peep::UpdateSitting()
sprite_direction = ((var_37 + 2) & 3) * 8;
Invalidate();
action = PEEP_ACTION_NONE_1;
next_action_sprite_type = PEEP_ACTION_SPRITE_TYPE_7;
next_action_sprite_type = PEEP_ACTION_SPRITE_TYPE_SITTING_IDLE;
SwitchNextActionSpriteType();
sub_state = PEEP_SITTING_SAT_DOWN;
@ -6669,7 +6669,7 @@ void rct_peep::SetSpriteType(PEEP_SPRITE_TYPE new_sprite_type)
if (state == PEEP_STATE_SITTING)
{
action = PEEP_ACTION_NONE_1;
next_action_sprite_type = PEEP_ACTION_SPRITE_TYPE_7;
next_action_sprite_type = PEEP_ACTION_SPRITE_TYPE_SITTING_IDLE;
SwitchNextActionSpriteType();
}
if (state == PEEP_STATE_WATCHING)

2
src/openrct2/peep/Peep.h
View File

@ -300,7 +300,7 @@ enum PEEP_ACTION_SPRITE_TYPE : uint8_t
PEEP_ACTION_SPRITE_TYPE_SHAKE_HEAD = 4,
PEEP_ACTION_SPRITE_TYPE_EMPTY_POCKETS = 5,
PEEP_ACTION_SPRITE_TYPE_HOLD_MAT = 6,
PEEP_ACTION_SPRITE_TYPE_7 = 7,
PEEP_ACTION_SPRITE_TYPE_SITTING_IDLE = 7,
PEEP_ACTION_SPRITE_TYPE_SITTING_EAT_FOOD = 8,
PEEP_ACTION_SPRITE_TYPE_SITTING_LOOK_AROUND_LEFT = 9,
PEEP_ACTION_SPRITE_TYPE_SITTING_LOOK_AROUND_RIGHT = 10,