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

Name Flags in PeepThoughtToActionMap

This commit is contained in:
Mustapha Elghoul 2020-04-22 12:50:53 -04:00 committed by GitHub
parent 2323cc1596
commit b138cb46ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 189 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contributors.md
View File

@ -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

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

@ -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);
}