From 5abb5c9e9f3be26aba862f2120f52f66c5185c96 Mon Sep 17 00:00:00 2001 From: Richard Jenkins Date: Fri, 2 Jun 2017 01:21:26 +0100 Subject: [PATCH] More accurate name for sub_693BAB() --- src/openrct2/peep/peep.c | 12 ++++++------ src/openrct2/peep/peep.h | 2 +- src/openrct2/rct1.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/openrct2/peep/peep.c b/src/openrct2/peep/peep.c index 385fb4c2ee..4a317cb9c6 100644 --- a/src/openrct2/peep/peep.c +++ b/src/openrct2/peep/peep.c @@ -130,7 +130,7 @@ static sint32 peep_empty_container_standard_flag(rct_peep* peep); static sint32 peep_empty_container_extra_flag(rct_peep* peep); static sint32 peep_should_find_bench(rct_peep* peep); static void peep_stop_purchase_thought(rct_peep* peep, uint8 ride_type); -static void peep_set_action_sprite_type(rct_peep* peep); +static void peep_switch_to_next_action_sprite_type(rct_peep* peep); static sint32 peep_perform_next_action(rct_peep *peep); static void peep_spend_money(rct_peep *peep, money16 *peep_expend_type, money32 amount); static void peep_set_has_ridden(rct_peep *peep, sint32 rideIndex); @@ -1665,12 +1665,12 @@ static void set_sprite_type(rct_peep* peep, uint8 type){ if (peep->state == PEEP_STATE_SITTING){ peep->action = PEEP_ACTION_NONE_1; peep->next_action_sprite_type = 7; - peep_set_action_sprite_type(peep); + peep_switch_to_next_action_sprite_type(peep); } if (peep->state == PEEP_STATE_WATCHING){ peep->action = PEEP_ACTION_NONE_1; peep->next_action_sprite_type = 2; - peep_set_action_sprite_type(peep); + peep_switch_to_next_action_sprite_type(peep); } } @@ -2219,7 +2219,7 @@ static void peep_update_sitting(rct_peep* peep){ invalidate_sprite_2((rct_sprite*)peep); peep->action = 254; peep->next_action_sprite_type = 7; - peep_set_action_sprite_type(peep); + peep_switch_to_next_action_sprite_type(peep); peep->sub_state++; @@ -5243,7 +5243,7 @@ static void peep_update_watching(rct_peep* peep){ peep->action = 0xFE; peep->next_action_sprite_type = 2; - peep_set_action_sprite_type(peep); + peep_switch_to_next_action_sprite_type(peep); peep->sub_state++; @@ -7843,7 +7843,7 @@ void peep_set_map_tooltip(rct_peep *peep) } -void peep_set_action_sprite_type(rct_peep* peep) { +void peep_switch_to_next_action_sprite_type(rct_peep* peep) { // TBD: Add nextActionSpriteType as function parameter and make peep->next_action_sprite_type obsolete? uint8 nextActionSpriteType = peep->next_action_sprite_type; if (nextActionSpriteType != peep->action_sprite_type) { diff --git a/src/openrct2/peep/peep.h b/src/openrct2/peep/peep.h index 349050e9c8..501cf86c81 100644 --- a/src/openrct2/peep/peep.h +++ b/src/openrct2/peep/peep.h @@ -539,7 +539,7 @@ typedef struct rct_peep { // Normally 0, 1 for carrying sliding board on spiral slide ride, 2 for carrying lawn mower uint8 special_sprite; // 0x6D uint8 action_sprite_type; // 0x6E - // Seems to be used like a local variable, as it's always set before calling peep_set_action_sprite_type, which reads this again + // Seems to be used like a local variable, as it's always set before calling peep_switch_to_next_action_sprite_type, which reads this again uint8 next_action_sprite_type; // 0x6F uint8 action_sprite_image_offset; // 0x70 uint8 action; // 0x71 diff --git a/src/openrct2/rct1.h b/src/openrct2/rct1.h index 01491940fd..5dc3a17e05 100644 --- a/src/openrct2/rct1.h +++ b/src/openrct2/rct1.h @@ -433,7 +433,7 @@ typedef struct rct1_peep { // Normally 0, 1 for carrying sliding board on spiral slide ride, 2 for carrying lawn mower uint8 special_sprite; // 0x6D uint8 action_sprite_type; // 0x6E - // Seems to be used like a local variable, as it's always set before calling peep_set_action_sprite_type, which reads this again + // Seems to be used like a local variable, as it's always set before calling peep_switch_to_next_action_sprite_type, which reads this again uint8 next_action_sprite_type; // 0x6F uint8 action_sprite_image_offset; // 0x70 uint8 action; // 0x71