Wrong flag used in PeepProblemWarningsUpdate() to determine if hungry guest counts for warnings

[zzril]

Operating System

Linux

OpenRCT2 build

8dd5014

Base game

RollerCoaster Tycoon 2

Area(s) with this issue?

This is a development issue

Describe the issue

PeepProblemWarningsUpdate() in src/openrct2/entity/Peep.cpp is responsible for counting guests with specific thoughts and creating in-game news messages / warnings accordingly.

Concerning the I'm thirsty thought, guests that are currently heading for a drinks stall are discarded for this purpose.
Similarly, guests that are currently heading for a toilet are not counted for the warning about guests not finding toilets.

However, for guests that have the I'm hungry thought, all those are discarded that are currently heading for any flat ride:

        switch (peep->Thoughts[0].type)
        {
// [...]
            case PeepThoughtType::Hungry: // 0x14
                if (peep->GuestHeadingToRideId.IsNull())
                {
                    hungerCounter++;
                    break;
                }
                ride = GetRide(peep->GuestHeadingToRideId);
                if (ride != nullptr && !ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_FLAT_RIDE))
                    hungerCounter++;
                break;

            case PeepThoughtType::Thirsty:
                if (peep->GuestHeadingToRideId.IsNull())
                {
                    thirstCounter++;
                    break;
                }
                ride = GetRide(peep->GuestHeadingToRideId);
                if (ride != nullptr && !ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_SELLS_DRINKS))
                    thirstCounter++;
                break;

            case PeepThoughtType::Toilet:
                if (peep->GuestHeadingToRideId.IsNull())
                {
                    toiletCounter++;
                    break;
                }
                ride = GetRide(peep->GuestHeadingToRideId);
                if (ride != nullptr && !ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_TOILET))
                    toiletCounter++;
                break;

There exists a flag RIDE_TYPE_FLAG_SELLS_FOOD, so it seems that that one should be used instead.

Not sure if this was an original bug or a mistake during reverse engineering.
The last commit that changed the name of the flag used in the specific line was d5bf01e22cfa56c29cb2f07136dcb1765fc7ee41, labelled refactor ride type flags.

Steps to reproduce

Check out the above code.

Attachments

No response

[ZehMatt]

It is actually a bug/oversight in the original,