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

Rename PEEP_MAX_ENERGY to kPeepMaxEnergy

This commit is contained in:
Harry-Hopkinson 2024-04-15 15:21:49 +00:00
parent 04ca18b7c6
commit cf50b4c8a3
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/Cheats.cpp
View File

@ -978,7 +978,7 @@ static StringId window_cheats_page_titles[] = {
CheatsSet(CheatType::SetGuestParameter, GUEST_PARAMETER_HAPPINESS, 0);
break;
case WIDX_GUEST_ENERGY_MAX:
CheatsSet(CheatType::SetGuestParameter, GUEST_PARAMETER_ENERGY, PEEP_MAX_ENERGY);
CheatsSet(CheatType::SetGuestParameter, GUEST_PARAMETER_ENERGY, kPeepMaxEnergy);
break;
case WIDX_GUEST_ENERGY_MIN:
CheatsSet(CheatType::SetGuestParameter, GUEST_PARAMETER_ENERGY, kPeepMinEnergy);

2
src/openrct2-ui/windows/Guest.cpp
View File

@ -1101,7 +1101,7 @@ static_assert(_guestWindowPageWidgets.size() == WINDOW_GUEST_PAGE_COUNT);
screenCoords.y += LIST_ROW_HEIGHT;
DrawTextBasic(dpi, screenCoords, STR_GUEST_STAT_ENERGY_LABEL);
int32_t energy = NormalizeGuestStatValue(peep->Energy - kPeepMinEnergy, PEEP_MAX_ENERGY - kPeepMinEnergy, 10);
int32_t energy = NormalizeGuestStatValue(peep->Energy - kPeepMinEnergy, kPeepMaxEnergy - kPeepMinEnergy, 10);
barColour = COLOUR_BRIGHT_GREEN;
barBlink = energy < 50;
StatsBarsDraw(energy, screenCoords, dpi, barColour, barBlink);

2
src/openrct2/actions/CheatSetAction.cpp
View File

@ -353,7 +353,7 @@ ParametersRange CheatSetAction::GetParameterRange(CheatType cheatType) const
{ 0, kPeepMaxHappiness } };
case GUEST_PARAMETER_ENERGY:
return { { GUEST_PARAMETER_HAPPINESS, GUEST_PARAMETER_PREFERRED_RIDE_INTENSITY },
{ kPeepMinEnergy, PEEP_MAX_ENERGY } };
{ kPeepMinEnergy, kPeepMaxEnergy } };
case GUEST_PARAMETER_HUNGER:
return { { GUEST_PARAMETER_HAPPINESS, GUEST_PARAMETER_PREFERRED_RIDE_INTENSITY }, { 0, kPeepMaxHunger } };
case GUEST_PARAMETER_THIRST:

2
src/openrct2/entity/Guest.cpp
View File

@ -847,7 +847,7 @@ void Guest::Loc68FA89()
newEnergy = kPeepMinEnergy;
/* Previous code here suggested maximum energy is 128. */
newEnergy = std::min(static_cast<uint8_t>(PEEP_MAX_ENERGY), newEnergy);
newEnergy = std::min(kPeepMaxEnergy, newEnergy);
if (newEnergy != Energy)
{

4
src/openrct2/entity/Peep.h
View File

@ -21,8 +21,8 @@
#include <array>
#include <optional>
constexpr int8_t kPeepMinEnergy = 32;
#define PEEP_MAX_ENERGY 128
constexpr uint8_t kPeepMinEnergy = 32;
constexpr uint8_t kPeepMaxEnergy = 128;
#define PEEP_MAX_ENERGY_TARGET 255 // Oddly, this differs from max energy!
constexpr auto PEEP_CLEARANCE_HEIGHT = 4 * COORDS_Z_STEP;