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

Rename CHAT_MAX_WINDOW_WIDTH - kChatMaxWindowWidth

This commit is contained in:
Harry-Hopkinson 2024-04-15 15:36:43 +00:00
parent 337f9ca549
commit 47939567c4
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -838,7 +838,7 @@ void Guest::Loc68FA89()
}
else
{
newEnergy = std::min(kPeepMaxEnergyTarget, newEnergy + 4);
newEnergy = std::min<uint16_t>(kPeepMaxEnergyTarget, newEnergy + 4);
if (newEnergy > newTargetEnergy)
newEnergy = newTargetEnergy;
}
@ -3035,7 +3035,7 @@ static void PeepUpdateHunger(Guest* peep)
{
peep->Hunger -= 2;
peep->EnergyTarget = std::min(peep->EnergyTarget + 2, kPeepMaxEnergyTarget);
peep->EnergyTarget = std::min<uint16_t>(peep->EnergyTarget + 2, kPeepMaxEnergyTarget);
peep->Toilet = std::min(peep->Toilet + 1, 255);
}
}

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

@ -23,7 +23,7 @@
constexpr uint8_t kPeepMinEnergy = 32;
constexpr uint8_t kPeepMaxEnergy = 128;
constexpr int kPeepMaxEnergyTarget = 255; // Oddly, this differs from max energy!
constexpr uint8_t kPeepMaxEnergyTarget = 255; // Oddly, this differs from max energy!
constexpr auto PEEP_CLEARANCE_HEIGHT = 4 * COORDS_Z_STEP;

2
src/openrct2/interface/Chat.cpp
View File

@ -97,7 +97,7 @@ void ChatDraw(DrawPixelInfo& dpi, uint8_t chatBackgroundColor)
}
_chatLeft = 10;
_chatRight = std::min((ContextGetWidth() - 10), CHAT_MAX_WINDOW_WIDTH);
_chatRight = std::min<int16_t>((ContextGetWidth() - 10), kChatMaxWindowWidth);
_chatWidth = _chatRight - _chatLeft;
_chatBottom = ContextGetHeight() - 45;
_chatTop = _chatBottom - 10;

4
src/openrct2/interface/Chat.h
View File

@ -16,8 +16,8 @@
constexpr int8_t kChatHistorySize = 10;
constexpr int16_t kChatInputSize = 1024;
constexpr int kChatMaxMessageLength = 200;
#define CHAT_MAX_WINDOW_WIDTH 600
constexpr uint8_t kChatMaxMessageLength = 200;
constexpr int16_t kChatMaxWindowWidth = 600;
struct DrawPixelInfo;
struct ScreenCoordsXY;