From b138cb46ba544a7c1426c051ac2f6feca0142586 Mon Sep 17 00:00:00 2001 From: Mustapha Elghoul <48503499+mustaphaelghoul@users.noreply.github.com> Date: Wed, 22 Apr 2020 12:50:53 -0400 Subject: [PATCH] Name Flags in PeepThoughtToActionMap --- contributors.md | 1 + src/openrct2/peep/Peep.cpp | 367 +++++++++++++++++++------------------ 2 files changed, 189 insertions(+), 179 deletions(-) diff --git a/contributors.md b/contributors.md index c4af6a2e87..bacb4b74e0 100644 --- a/contributors.md +++ b/contributors.md @@ -139,6 +139,7 @@ The following people are not part of the development team, but have been contrib * Tushar Sariya (TusharSariya) * (WantDiscussion) * Tomáš Žilínek (TomasZilinek) +* Mustapha Elghoul (mustaphaelghoul) ## Toolchain * (Balletie) - macOS diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index ff0b29d5aa..6f4732e70e 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -82,186 +82,195 @@ static void peep_128_tick_update(Peep* peep, int32_t index); static void peep_release_balloon(Guest* peep, int16_t spawn_height); // clang-format off +// Flags used by PeepThoughtToActionMap +enum PeepThoughtToActionFlag : uint8_t +{ + PEEP_THOUGHT_ACTION_NO_FLAGS = 0, + PEEP_THOUGHT_ACTION_FLAG_RIDE = (1 << 0), + PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_SINGULAR = (1 << 1), + PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_INDEFINITE = (1 << 2), +}; + /** rct2: 0x00981DB0 */ static struct { PeepActionType action; - uint8_t flags; + PeepThoughtToActionFlag flags; } PeepThoughtToActionMap[] = { - { PEEP_ACTION_SHAKE_HEAD, 1 }, - { PEEP_ACTION_EMPTY_POCKETS, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_WOW, 1 }, - { PEEP_ACTION_NONE_2, 2 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 4 }, - { PEEP_ACTION_SHAKE_HEAD, 4 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_WAVE, 0 }, - { PEEP_ACTION_JOY, 1 }, - { PEEP_ACTION_CHECK_TIME, 1 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_WAVE, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_WAVE, 0 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_DISGUST, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_BEING_WATCHED, 0 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 1 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_SHAKE_HEAD, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_NONE_2, 0 }, - { PEEP_ACTION_JOY, 0 }, - { PEEP_ACTION_NONE_2, 1 }, + { PEEP_ACTION_SHAKE_HEAD, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_EMPTY_POCKETS, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_WOW, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_SINGULAR }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_INDEFINITE }, + { PEEP_ACTION_SHAKE_HEAD, PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_INDEFINITE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_WAVE, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_JOY, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_CHECK_TIME, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_WAVE, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_WAVE, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_DISGUST, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_BEING_WATCHED, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_SHAKE_HEAD, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_JOY, PEEP_THOUGHT_ACTION_NO_FLAGS }, + { PEEP_ACTION_NONE_2, PEEP_THOUGHT_ACTION_FLAG_RIDE }, }; static PeepActionSpriteType PeepSpecialSpriteToSpriteTypeMap[] = { @@ -2049,8 +2058,8 @@ void peep_thought_set_format_args(const rct_peep_thought* thought) { set_format_arg(0, rct_string_id, PeepThoughts[thought->type]); - uint8_t flags = PeepThoughtToActionMap[thought->type].flags; - if (flags & 1) + PeepThoughtToActionFlag flags = PeepThoughtToActionMap[thought->type].flags; + if (flags & PEEP_THOUGHT_ACTION_FLAG_RIDE) { auto ride = get_ride(thought->item); if (ride != nullptr) @@ -2062,11 +2071,11 @@ void peep_thought_set_format_args(const rct_peep_thought* thought) set_format_arg(2, rct_string_id, STR_NONE); } } - else if (flags & 2) + else if (flags & PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_SINGULAR) { set_format_arg(2, rct_string_id, ShopItems[thought->item].Naming.Singular); } - else if (flags & 4) + else if (flags & PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_INDEFINITE) { set_format_arg(2, rct_string_id, ShopItems[thought->item].Naming.Indefinite); }