Persson-dev/Tower-Defense
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

refactor: cpp style casts

Browse Source
This commit is contained in:
Simon Pribylski
2022-04-27 19:25:36 +02:00
parent d3edc0cb6c
commit d5b42caf39
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/game/BaseGame.h
View File

@@ -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<std::uint8_t>(TeamColor::Red)]; }
const Team& GetRedTeam() const { return m_Teams[static_cast<std::uint8_t>(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<std::uint8_t>(TeamColor::Blue)]; }
const Team& GetBlueTeam() const { return m_Teams[static_cast<std::uint8_t>(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<std::uint8_t>(team)]; }
const Team& GetTeam(TeamColor team) const { return m_Teams[static_cast<std::uint8_t>(team)]; }
GameState GetGameState() const { return m_GameState; }
void SetGameState(GameState gameState) { m_GameState = gameState; };

2
include/game/server/Server.h
View File

@@ -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<float>(SERVER_TPS) / static_cast<float>(timeElapsedSinceLast20Ticks / 1000.0f);
m_TickCount = 0;
m_LastTPSTime = td::utils::GetTime();
return true;