Skip to content

Commit

Permalink
Refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@deathkiller
deathkiller committed Jan 19, 2025
1 parent 792d29b commit 45181f2
Show file tree
Hide file tree
Showing 37 changed files with 110 additions and 128 deletions.
6 changes: 3 additions & 3 deletions Sources/Jazz2/Actors/Enemies/Bosses/Bolly.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace Jazz2::Actors::Bosses
/*if (_turret != nullptr) {
_turret->SetState(ActorState::IsDestroyed, true);
}*/
for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(_chain)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(_chain)); i++) {
if (_chain[i] != nullptr) {
_chain[i]->SetState(ActorState::IsDestroyed, true);
}
Expand Down Expand Up @@ -160,7 +160,7 @@ namespace Jazz2::Actors::Bosses
}*/

float distance = 30.0f;
for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(_chain)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(_chain)); i++) {
if (_chain[i] != nullptr) {
float angle = sinf(_chainPhase - i * 0.08f) * 1.2f + fPiOver2;

Expand All @@ -186,7 +186,7 @@ namespace Jazz2::Actors::Bosses

bool Bolly::OnPerish(ActorBase* collider)
{
Explosion::Create(_levelHandler, Vector3i((std::int32_t)_pos.X, (std::int32_t)_pos.Y, _renderer.layer() + 2), Explosion::Type::Large);
Explosion::Create(_levelHandler, Vector3i(std::int32_t(_pos.X), std::int32_t(_pos.Y), _renderer.layer() + 2), Explosion::Type::Large);

CreateDeathDebris(collider);
_levelHandler->PlayCommonSfx("Splat"_s, Vector3f(_pos.X, _pos.Y, 0.0f));
Expand Down
10 changes: 5 additions & 5 deletions Sources/Jazz2/Actors/Enemies/Bosses/Uterus.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Jazz2::Actors::Bosses

Uterus::~Uterus()
{
for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(_shields)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(_shields)); i++) {
if (_shields[i] != nullptr) {
_shields[i]->SetState(ActorState::IsDestroyed, true);
}
Expand Down Expand Up @@ -63,12 +63,12 @@ namespace Jazz2::Actors::Bosses

_hasShield = true;

for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(_shields)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(_shields)); i++) {
_shields[i] = std::make_shared<ShieldPart>();
_shields[i]->Phase = (fTwoPi * i / static_cast<std::int32_t>(arraySize(_shields)));
_shields[i]->Phase = (fTwoPi * i / std::int32_t(arraySize(_shields)));
_shields[i]->OnActivated(ActorActivationDetails(
_levelHandler,
Vector3i((std::int32_t)_pos.X, (std::int32_t)_pos.Y, _renderer.layer() + 2)
Vector3i(std::int32_t(_pos.X), std::int32_t(_pos.Y), _renderer.layer() + 2)
));
_levelHandler->AddActor(_shields[i]);
}
Expand Down Expand Up @@ -144,7 +144,7 @@ namespace Jazz2::Actors::Bosses

if (_hasShield) {
std::int32_t shieldCount = 0;
for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(_shields)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(_shields)); i++) {
if (_shields[i] != nullptr) {
if (_shields[i]->GetHealth() > 0) {
if (_shields[i]->FallTime <= 0.0f) {
Expand Down
10 changes: 5 additions & 5 deletions Sources/Jazz2/Actors/Multiplayer/RemoteActor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace Jazz2::Actors::Multiplayer

Clock& c = nCine::clock();
std::uint64_t now = c.now() * 1000 / c.frequency();
for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(_stateBuffer)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(_stateBuffer)); i++) {
_stateBuffer[i].Time = now - arraySize(_stateBuffer) + i;
_stateBuffer[i].Pos = Vector2f(details.Pos.X, details.Pos.Y);
}
Expand All @@ -34,15 +34,15 @@ namespace Jazz2::Actors::Multiplayer

std::int32_t nextIdx = _stateBufferPos - 1;
if (nextIdx < 0) {
nextIdx += static_cast<std::int32_t>(arraySize(_stateBuffer));
nextIdx += std::int32_t(arraySize(_stateBuffer));
}

if (renderTime <= _stateBuffer[nextIdx].Time) {
std::int32_t prevIdx;
while (true) {
prevIdx = nextIdx - 1;
if (prevIdx < 0) {
prevIdx += static_cast<std::int32_t>(arraySize(_stateBuffer));
prevIdx += std::int32_t(arraySize(_stateBuffer));
}

if (prevIdx == _stateBufferPos || _stateBuffer[prevIdx].Time <= renderTime) {
Expand Down Expand Up @@ -104,7 +104,7 @@ namespace Jazz2::Actors::Multiplayer
// Actor was hidden before, reset state buffer to disable interpolation
std::int32_t stateBufferPrevPos = _stateBufferPos - 1;
if (stateBufferPrevPos < 0) {
stateBufferPrevPos += static_cast<std::int32_t>(arraySize(_stateBuffer));
stateBufferPrevPos += std::int32_t(arraySize(_stateBuffer));
}

std::int64_t renderTime = now - ServerDelay;
Expand All @@ -116,7 +116,7 @@ namespace Jazz2::Actors::Multiplayer
}

_stateBufferPos++;
if (_stateBufferPos >= static_cast<std::int32_t>(arraySize(_stateBuffer))) {
if (_stateBufferPos >= std::int32_t(arraySize(_stateBuffer))) {
_stateBufferPos = 0;
}
}
Expand Down
10 changes: 5 additions & 5 deletions Sources/Jazz2/Actors/Multiplayer/RemotePlayerOnServer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Jazz2::Actors::Multiplayer
{
Clock& c = nCine::clock();
std::uint64_t now = c.now() * 1000 / c.frequency();
for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(_stateBuffer)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(_stateBuffer)); i++) {
_stateBuffer[i].Time = now - arraySize(_stateBuffer) + i;
_stateBuffer[i].Pos = Vector2f(details.Pos.X, details.Pos.Y);
}
Expand All @@ -38,15 +38,15 @@ namespace Jazz2::Actors::Multiplayer

std::int32_t nextIdx = _stateBufferPos - 1;
if (nextIdx < 0) {
nextIdx += static_cast<std::int32_t>(arraySize(_stateBuffer));
nextIdx += std::int32_t(arraySize(_stateBuffer));
}

if (renderTime <= _stateBuffer[nextIdx].Time) {
std::int32_t prevIdx;
while (true) {
prevIdx = nextIdx - 1;
if (prevIdx < 0) {
prevIdx += static_cast<std::int32_t>(arraySize(_stateBuffer));
prevIdx += std::int32_t(arraySize(_stateBuffer));
}

if (prevIdx == _stateBufferPos || _stateBuffer[prevIdx].Time <= renderTime) {
Expand Down Expand Up @@ -112,7 +112,7 @@ namespace Jazz2::Actors::Multiplayer
// Actor was hidden before, reset state buffer to disable interpolation
std::int32_t stateBufferPrevPos = _stateBufferPos - 1;
if (stateBufferPrevPos < 0) {
stateBufferPrevPos += static_cast<std::int32_t>(arraySize(_stateBuffer));
stateBufferPrevPos += std::int32_t(arraySize(_stateBuffer));
}

std::int64_t renderTime = now - ServerDelay;
Expand All @@ -124,7 +124,7 @@ namespace Jazz2::Actors::Multiplayer
}

_stateBufferPos++;
if (_stateBufferPos >= static_cast<std::int32_t>(arraySize(_stateBuffer))) {
if (_stateBufferPos >= std::int32_t(arraySize(_stateBuffer))) {
_stateBufferPos = 0;
}

Expand Down
6 changes: 3 additions & 3 deletions Sources/Jazz2/Actors/Player.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3261,7 +3261,7 @@ namespace Jazz2::Actors
}

// Preload all weapons
for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(_weaponAmmo)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(_weaponAmmo)); i++) {
if (_weaponAmmo[i] != 0) {
PreloadMetadataAsync(String("Weapon/"_s + WeaponNames[i]));
}
Expand Down Expand Up @@ -3329,7 +3329,7 @@ namespace Jazz2::Actors
levelHandler->SetAmbientLight(this, _checkpointLight);

std::int32_t weaponCount = src.ReadVariableInt32();
RETURN_ASSERT_MSG(weaponCount == static_cast<std::int32_t>(arraySize(_weaponAmmoCheckpoint)), "Weapon count mismatch");
RETURN_ASSERT_MSG(weaponCount == std::int32_t(arraySize(_weaponAmmoCheckpoint)), "Weapon count mismatch");
_currentWeapon = (WeaponType)src.ReadVariableInt32();
src.Read(_weaponAmmoCheckpoint, sizeof(_weaponAmmoCheckpoint));
src.Read(_weaponUpgradesCheckpoint, sizeof(_weaponUpgradesCheckpoint));
Expand Down Expand Up @@ -3363,7 +3363,7 @@ namespace Jazz2::Actors
dest.WriteVariableInt32(_gemsTotal[1]);
dest.WriteVariableInt32(_gemsTotal[2]);
dest.WriteVariableInt32(_gemsTotal[3]);
dest.WriteVariableInt32(static_cast<std::int32_t>(arraySize(_weaponAmmoCheckpoint)));
dest.WriteVariableInt32(std::int32_t(arraySize(_weaponAmmoCheckpoint)));
dest.WriteVariableInt32((std::int32_t)_currentWeapon);
dest.Write(_weaponAmmoCheckpoint, sizeof(_weaponAmmoCheckpoint));
dest.Write(_weaponUpgradesCheckpoint, sizeof(_weaponUpgradesCheckpoint));
Expand Down
14 changes: 7 additions & 7 deletions Sources/Jazz2/Actors/Solid/Bridge.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ namespace Jazz2::Actors::Solid

switch (_bridgeType) {
default:
case BridgeType::Rope: async_await RequestMetadataAsync("Bridge/Rope"_s); _widths = PieceWidthsRope; _widthsCount = static_cast<std::int32_t>(arraySize(PieceWidthsRope)); break;
case BridgeType::Stone: async_await RequestMetadataAsync("Bridge/Stone"_s); _widths = PieceWidthsStone; _widthsCount = static_cast<std::int32_t>(arraySize(PieceWidthsStone)); break;
case BridgeType::Vine: async_await RequestMetadataAsync("Bridge/Vine"_s); _widths = PieceWidthsVine; _widthsCount = static_cast<std::int32_t>(arraySize(PieceWidthsVine)); _widthOffset = 8; break;
case BridgeType::StoneRed: async_await RequestMetadataAsync("Bridge/StoneRed"_s); _widths = PieceWidthsStoneRed; _widthsCount = static_cast<std::int32_t>(arraySize(PieceWidthsStoneRed)); break;
case BridgeType::Log: async_await RequestMetadataAsync("Bridge/Log"_s); _widths = PieceWidthsLog; _widthsCount = static_cast<std::int32_t>(arraySize(PieceWidthsLog)); break;
case BridgeType::Gem: async_await RequestMetadataAsync("Bridge/Gem"_s); _widths = PieceWidthsGem; _widthsCount = static_cast<std::int32_t>(arraySize(PieceWidthsGem)); break;
case BridgeType::Lab: async_await RequestMetadataAsync("Bridge/Lab"_s); _widths = PieceWidthsLab; _widthsCount = static_cast<std::int32_t>(arraySize(PieceWidthsLab)); _widthOffset = 12; break;
case BridgeType::Rope: async_await RequestMetadataAsync("Bridge/Rope"_s); _widths = PieceWidthsRope; _widthsCount = std::int32_t(arraySize(PieceWidthsRope)); break;
case BridgeType::Stone: async_await RequestMetadataAsync("Bridge/Stone"_s); _widths = PieceWidthsStone; _widthsCount = std::int32_t(arraySize(PieceWidthsStone)); break;
case BridgeType::Vine: async_await RequestMetadataAsync("Bridge/Vine"_s); _widths = PieceWidthsVine; _widthsCount = std::int32_t(arraySize(PieceWidthsVine)); _widthOffset = 8; break;
case BridgeType::StoneRed: async_await RequestMetadataAsync("Bridge/StoneRed"_s); _widths = PieceWidthsStoneRed; _widthsCount = std::int32_t(arraySize(PieceWidthsStoneRed)); break;
case BridgeType::Log: async_await RequestMetadataAsync("Bridge/Log"_s); _widths = PieceWidthsLog; _widthsCount = std::int32_t(arraySize(PieceWidthsLog)); break;
case BridgeType::Gem: async_await RequestMetadataAsync("Bridge/Gem"_s); _widths = PieceWidthsGem; _widthsCount = std::int32_t(arraySize(PieceWidthsGem)); break;
case BridgeType::Lab: async_await RequestMetadataAsync("Bridge/Lab"_s); _widths = PieceWidthsLab; _widthsCount = std::int32_t(arraySize(PieceWidthsLab)); _widthOffset = 12; break;
}

SetAnimation(AnimState::Default);
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/Compatibility/JJ2Level.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@ namespace Jazz2::Compatibility

bool allZeroes = true;
if (tileEvent.Converted.Type != EventType::Empty) {
for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(tileEvent.Converted.Params)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(tileEvent.Converted.Params)); i++) {
if (tileEvent.Converted.Params[i] != 0) {
allZeroes = false;
break;
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/Compatibility/JJ2Strings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ namespace Jazz2::Compatibility
} else {
buffer[j++] = '\f';
}
std::int32_t colorIndex2 = colorIndex % (static_cast<std::int32_t>(arraySize(DefaultFontColors)) + 1);
std::int32_t colorIndex2 = colorIndex % (std::int32_t(arraySize(DefaultFontColors)) + 1);
if (colorIndex2 == 0) {
buffer[j++] = '[';
buffer[j++] = '/';
Expand Down
4 changes: 2 additions & 2 deletions Sources/Jazz2/Compatibility/JJ2Tileset.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,14 @@ namespace Jazz2::Compatibility
std::memcpy(palette, _palette, sizeof(_palette));

bool hasAlphaChannel = false;
for (std::int32_t i = 1; i < static_cast<std::int32_t>(arraySize(palette)); i++) {
for (std::int32_t i = 1; i < std::int32_t(arraySize(palette)); i++) {
if ((palette[i] & 0xff000000) != 0) {
hasAlphaChannel = true;
break;
}
}
if (!hasAlphaChannel) {
for (std::int32_t i = 1; i < static_cast<std::int32_t>(arraySize(palette)); i++) {
for (std::int32_t i = 1; i < std::int32_t(arraySize(palette)); i++) {
palette[i] |= 0xff000000;
}
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/ContentResolver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1639,7 +1639,7 @@ namespace Jazz2
95, 92, 88, 15, 15
};

constexpr std::int32_t StopsPerGem = (static_cast<std::int32_t>(arraySize(PaletteStops)) / GemColorCount) - 1;
constexpr std::int32_t StopsPerGem = (std::int32_t(arraySize(PaletteStops)) / GemColorCount) - 1;

// Start to fill palette texture from the second row (right after base palette)
std::int32_t src = 0, dst = ColorsPerPalette;
Expand Down
4 changes: 2 additions & 2 deletions Sources/Jazz2/LevelHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ namespace Jazz2
{
std::int32_t playerCount = levelInit.GetPlayerCount();

for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(levelInit.PlayerCarryOvers)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(levelInit.PlayerCarryOvers)); i++) {
if (levelInit.PlayerCarryOvers[i].Type == PlayerType::None) {
continue;
}
Expand Down Expand Up @@ -1968,7 +1968,7 @@ namespace Jazz2

const JoyMappedState* joyStates[UI::ControlScheme::MaxConnectedGamepads];
std::int32_t joyStatesCount = 0;
for (std::int32_t i = 0; i < IInputManager::MaxNumJoysticks && joyStatesCount < static_cast<std::int32_t>(arraySize(joyStates)); i++) {
for (std::int32_t i = 0; i < IInputManager::MaxNumJoysticks && joyStatesCount < std::int32_t(arraySize(joyStates)); i++) {
if (input.isJoyMapped(i)) {
joyStates[joyStatesCount++] = &input.joyMappedState(i);
}
Expand Down
8 changes: 4 additions & 4 deletions Sources/Jazz2/Multiplayer/MultiLevelHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ namespace Jazz2::Multiplayer

std::int32_t prevIdx = it->second.StateBufferPos - 1;
while (prevIdx < 0) {
prevIdx += static_cast<std::int32_t>(arraySize(it->second.StateBuffer));
prevIdx += std::int32_t(arraySize(it->second.StateBuffer));
}

auto posPrev = WorldPosToScreenSpace(it->second.StateBuffer[prevIdx].Pos);
Expand Down Expand Up @@ -1200,7 +1200,7 @@ namespace Jazz2::Multiplayer
return;
}

for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(levelInit.PlayerCarryOvers)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(levelInit.PlayerCarryOvers)); i++) {
if (levelInit.PlayerCarryOvers[i].Type == PlayerType::None) {
continue;
}
Expand Down Expand Up @@ -2043,7 +2043,7 @@ namespace Jazz2::Multiplayer
LevelHandler::PrepareNextLevelInitialization(levelInit);

// Initialize only local players
for (std::int32_t i = 1; i < static_cast<std::int32_t>(arraySize(levelInit.PlayerCarryOvers)); i++) {
for (std::int32_t i = 1; i < std::int32_t(arraySize(levelInit.PlayerCarryOvers)); i++) {
levelInit.PlayerCarryOvers[i].Type = PlayerType::None;
}
}
Expand Down Expand Up @@ -2443,7 +2443,7 @@ namespace Jazz2::Multiplayer
}

playerState.StateBufferPos++;
if (playerState.StateBufferPos >= static_cast<std::int32_t>(arraySize(playerState.StateBuffer))) {
if (playerState.StateBufferPos >= std::int32_t(arraySize(playerState.StateBuffer))) {
playerState.StateBufferPos = 0;
}

Expand Down
6 changes: 3 additions & 3 deletions Sources/Jazz2/UI/Cinematics.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,14 @@ namespace Jazz2::UI
std::uint32_t totalOffset = s->GetPosition();

while (totalOffset < s->GetSize()) {
for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(_decompressedStreams)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(_decompressedStreams)); i++) {
std::int32_t bytesLeft = s->ReadValue<std::int32_t>();
totalOffset += 4 + bytesLeft;
_compressedStreams[i].FetchFromStream(*s, bytesLeft);
}
}

for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(_decompressedStreams)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(_decompressedStreams)); i++) {
// Skip first two bytes (0x78 0xDA)
_compressedStreams[i].Seek(2, SeekOrigin::Begin);
_decompressedStreams[i].Open(_compressedStreams[i]);
Expand Down Expand Up @@ -325,7 +325,7 @@ namespace Jazz2::UI

const JoyMappedState* joyStates[UI::ControlScheme::MaxConnectedGamepads];
std::int32_t joyStatesCount = 0;
for (std::int32_t i = 0; i < IInputManager::MaxNumJoysticks && joyStatesCount < static_cast<std::int32_t>(arraySize(joyStates)); i++) {
for (std::int32_t i = 0; i < IInputManager::MaxNumJoysticks && joyStatesCount < std::int32_t(arraySize(joyStates)); i++) {
if (input.isJoyMapped(i)) {
joyStates[joyStatesCount++] = &input.joyMappedState(i);
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/DiscordRpcClient.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ namespace Jazz2::UI
}

bool isConnected = false;
for (std::int32_t j = 0; j < static_cast<std::int32_t>(arraySize(RpcPaths)); j++) {
for (std::int32_t j = 0; j < std::int32_t(arraySize(RpcPaths)); j++) {
for (std::int32_t i = 0; i < 10; i++) {
formatString(addr.sun_path, sizeof(addr.sun_path), RpcPaths[j].data(), tempPath.data(), i);
if (::connect(_sockFd, (struct sockaddr*)&addr, sizeof(addr)) >= 0) {
Expand Down
8 changes: 4 additions & 4 deletions Sources/Jazz2/UI/Font.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ namespace Jazz2::UI
if (cursor.first == ']') {
break;
}
if (paramLength < static_cast<std::int32_t>(arraySize(param)) - 1) {
if (paramLength < std::int32_t(arraySize(param)) - 1) {
param[paramLength++] = (char)cursor.first;
}
idx = cursor.second;
Expand Down Expand Up @@ -412,7 +412,7 @@ namespace Jazz2::UI
if (cursor.first == ']') {
break;
}
if (paramLength < static_cast<std::int32_t>(arraySize(param)) - 1) {
if (paramLength < std::int32_t(arraySize(param)) - 1) {
param[paramLength++] = (char)cursor.first;
}
idx = cursor.second;
Expand Down Expand Up @@ -444,7 +444,7 @@ namespace Jazz2::UI
if (cursor.first == ']') {
break;
}
if (paramLength < static_cast<std::int32_t>(arraySize(param)) - 1) {
if (paramLength < std::int32_t(arraySize(param)) - 1) {
param[paramLength++] = (char)cursor.first;
}
idx = cursor.second;
Expand Down Expand Up @@ -493,7 +493,7 @@ namespace Jazz2::UI

if (uvRect.W > 0 && uvRect.H > 0) {
if (useRandomColor) {
const Colorf& newColor = RandomColors[charOffset % static_cast<std::int32_t>(arraySize(RandomColors))];
const Colorf& newColor = RandomColors[charOffset % std::int32_t(arraySize(RandomColors))];
color = Colorf(newColor.R, newColor.G, newColor.B, color.A);
}

Expand Down
6 changes: 3 additions & 3 deletions Sources/Jazz2/UI/HUD.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1098,7 +1098,7 @@ namespace Jazz2::UI
}

float angle = -fPiOver2;
for (std::int32_t i = 0, j = 0; i < static_cast<std::int32_t>(arraySize(player->_weaponAmmo)); i++) {
for (std::int32_t i = 0, j = 0; i < std::int32_t(arraySize(player->_weaponAmmo)); i++) {
if (player->_weaponAmmo[i] != 0) {
float x = cosf(angle) * distance;
float y = sinf(angle) * distance;
Expand Down Expand Up @@ -1233,7 +1233,7 @@ namespace Jazz2::UI
{
std::int32_t weaponCount = 0;

for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(player->_weaponAmmo)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(player->_weaponAmmo)); i++) {
if (player->_weaponAmmo[i] != 0) {
weaponCount++;
}
Expand Down Expand Up @@ -1406,7 +1406,7 @@ namespace Jazz2::UI
Color colors[RgbLights::ColorsSize] {};

if (auto captionTile = _levelHandler->_tileMap->GetCaptionTile()) {
for (std::int32_t i = 0; i < static_cast<std::int32_t>(arraySize(KeyLayout)); i++) {
for (std::int32_t i = 0; i < std::int32_t(arraySize(KeyLayout)); i++) {
std::int32_t x = KeyLayout[i] % AURA_KEYBOARD_WIDTH;
std::int32_t y = KeyLayout[i] / AURA_KEYBOARD_WIDTH;
Color tileColor = captionTile[y * 32 + x];
Expand Down
Loading

0 comments on commit 45181f2

Please sign in to comment.