diff --git a/include/game/BaseGame.h b/include/game/BaseGame.h index a8cb87e..8d965a5 100644 --- a/include/game/BaseGame.h +++ b/include/game/BaseGame.h @@ -42,14 +42,14 @@ public: virtual void Tick(std::uint64_t delta); - Team& GetRedTeam() { return m_Teams[(std::uint8_t)TeamColor::Red]; } - const Team& GetRedTeam() const { return m_Teams[(std::uint8_t)TeamColor::Red]; } + Team& GetRedTeam() { return m_Teams[static_cast(TeamColor::Red)]; } + const Team& GetRedTeam() const { return m_Teams[static_cast(TeamColor::Red)]; } - Team& GetBlueTeam() { return m_Teams[(std::uint8_t)TeamColor::Blue]; } - const Team& GetBlueTeam() const { return m_Teams[(std::uint8_t)TeamColor::Blue]; } + Team& GetBlueTeam() { return m_Teams[static_cast(TeamColor::Blue)]; } + const Team& GetBlueTeam() const { return m_Teams[static_cast(TeamColor::Red)]; } - Team& GetTeam(TeamColor team) { return m_Teams[(std::uint8_t)team]; } - const Team& GetTeam(TeamColor team) const { return m_Teams[(std::uint8_t)team]; } + Team& GetTeam(TeamColor team) { return m_Teams[static_cast(team)]; } + const Team& GetTeam(TeamColor team) const { return m_Teams[static_cast(team)]; } GameState GetGameState() const { return m_GameState; } void SetGameState(GameState gameState) { m_GameState = gameState; }; diff --git a/include/game/server/Server.h b/include/game/server/Server.h index 32b9991..e0f7981 100644 --- a/include/game/server/Server.h +++ b/include/game/server/Server.h @@ -38,7 +38,7 @@ public: m_TickCount++; if (m_TickCount >= SERVER_TPS) { std::uint64_t timeElapsedSinceLast20Ticks = td::utils::GetTime() - m_LastTPSTime; - m_TPS = (float)SERVER_TPS / (float)(timeElapsedSinceLast20Ticks / 1000.0f); + m_TPS = static_cast(SERVER_TPS) / static_cast(timeElapsedSinceLast20Ticks / 1000.0f); m_TickCount = 0; m_LastTPSTime = td::utils::GetTime(); return true; diff --git a/src/game/Mobs.cpp b/src/game/Mobs.cpp index 229fbe5..4a428f5 100644 --- a/src/game/Mobs.cpp +++ b/src/game/Mobs.cpp @@ -44,7 +44,7 @@ void Mob::AttackCastle(std::uint64_t delta, World* world) { void Mob::Walk(std::uint64_t delta, World* world) { float mobWalkSpeed = GetStats()->GetMovementSpeed(); - float walkAmount = mobWalkSpeed * ((float)delta / 1000.0f); + float walkAmount = mobWalkSpeed * (static_cast(delta) / 1000.0f); if (HasEffect(EffectType::Slowness)) walkAmount *= 0.70; // walk 30% slower diff --git a/src/game/World.cpp b/src/game/World.cpp index b49ac7f..638837b 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -143,14 +143,14 @@ void World::TickMobs(std::uint64_t delta) { const Color* World::GetTileColor(TilePtr tile) const { switch (tile->GetType()) { case TileType::Tower: { - TowerTile* towerTile = (TowerTile*)tile.get(); + TowerTile* towerTile = dynamic_cast(tile.get()); return &m_TowerPlacePalette[towerTile->color_palette_ref]; } case TileType::Walk: { return &m_WalkablePalette; } case TileType::Decoration: { - DecorationTile* towerTile = (DecorationTile*)tile.get(); + DecorationTile* towerTile = dynamic_cast(tile.get()); return &m_DecorationPalette[towerTile->color_palette_ref]; break; } @@ -170,7 +170,7 @@ bool World::CanPlaceLittleTower(const glm::vec2& worldPos, PlayerID playerID) co } if (tile->GetType() == game::TileType::Tower) { - const TowerTile* towerTile = (const TowerTile*)tile.get(); + const TowerTile* towerTile = dynamic_cast(tile.get()); if (towerTile->team_owner != player.GetTeamColor()) return false; for (int x = -1; x < 2; x++) { @@ -198,7 +198,7 @@ bool World::CanPlaceBigTower(const glm::vec2& worldPos, PlayerID playerID) const } if (tile->GetType() == game::TileType::Tower) { - const TowerTile* towerTile = (const TowerTile*)tile.get(); + const TowerTile* towerTile = dynamic_cast(tile.get()); if (towerTile->team_owner != player.GetTeamColor()) return false; for (int x = -2; x < 3; x++) { diff --git a/src/game/server/ServerConnexion.cpp b/src/game/server/ServerConnexion.cpp index b61a856..2b80a7b 100644 --- a/src/game/server/ServerConnexion.cpp +++ b/src/game/server/ServerConnexion.cpp @@ -99,7 +99,7 @@ void ServerConnexion::HandlePacket(const protocol::PlayerLoginPacket* packet) { void ServerConnexion::HandlePacket(const protocol::SelectTeamPacket* packet) { if (m_Server->GetGame().GetGameState() != game::GameState::Lobby) return; - if ((std::int8_t)packet->GetSelectedTeam() >= -1 || (std::int8_t)packet->GetSelectedTeam() <= 1) { + if (static_cast(packet->GetSelectedTeam()) >= -1 || static_cast(packet->GetSelectedTeam()) <= 1) { if (m_Player->GetTeamColor() == game::TeamColor::None) { // join a team m_Server->GetGame().GetTeam(packet->GetSelectedTeam()).AddPlayer(m_Player); } else if (packet->GetSelectedTeam() == game::TeamColor::None) { // leave a team diff --git a/src/render/loader/WorldLoader.cpp b/src/render/loader/WorldLoader.cpp index 887e989..941f532 100644 --- a/src/render/loader/WorldLoader.cpp +++ b/src/render/loader/WorldLoader.cpp @@ -69,14 +69,14 @@ GL::VertexArray LoadWorldModel(const td::game::World* world) { continue; positions.insert(positions.end(), { - (float)chunkX + tileX, (float)chunkY + tileY, - (float)chunkX + tileX + 1, (float)chunkY + tileY, - (float)chunkX + tileX, (float)chunkY + tileY + 1, + static_cast(chunkX + tileX), static_cast(chunkY + tileY), + static_cast(chunkX + tileX + 1), static_cast(chunkY + tileY), + static_cast(chunkX + tileX), static_cast(chunkY + tileY + 1), - (float)chunkX + tileX + 1, (float)chunkY + tileY, - (float)chunkX + tileX, (float)chunkY + tileY + 1, - (float)chunkX + tileX + 1, (float)chunkY + tileY + 1, - }); + static_cast(chunkX + tileX + 1), static_cast(chunkY + tileY), + static_cast(chunkX + tileX), static_cast(chunkY + tileY + 1), + static_cast(chunkX + tileX + 1), static_cast(chunkY + tileY + 1), + }); const td::game::Color* tileColor = world->GetTileColor(tile); @@ -178,7 +178,7 @@ GL::VertexArray LoadTileSelectModel() { int color = 255 << 24 | 255 << 16 | 255 << 8 | 150; float colorFloat; - memcpy((std::uint8_t*)&colorFloat, &color, sizeof(float)); + memcpy(reinterpret_cast(&colorFloat), &color, sizeof(float)); std::vector colors(6, colorFloat);