diff --git a/include/game/World.h b/include/game/World.h index 32d4c5e..0500464 100644 --- a/include/game/World.h +++ b/include/game/World.h @@ -232,15 +232,14 @@ public: // WorldListener - virtual void OnArcherTowerShot(MobPtr target, ArcherTower* shooter); - - virtual void OnArrowShot(MobPtr target, bool fire, Tower* shooter); - virtual void OnExplosion(utils::shape::Circle explosion, float centerDamage, Tower* shooter); + virtual void OnArcherTowerShot(MobPtr target, ArcherTower* shooter) override; + virtual void OnArrowShot(MobPtr target, bool fire, Tower* shooter) override; + virtual void OnExplosion(utils::shape::Circle explosion, float centerDamage, Tower* shooter) override; // MobListener - virtual void OnMobDamage(Mob* target, float damage, Tower* source); - virtual void OnMobCastleDamage(Mob* damager, TeamCastle* enemyCastle, float damage); + virtual void OnMobDamage(Mob* target, float damage, Tower* source) override; + virtual void OnMobCastleDamage(Mob* damager, TeamCastle* enemyCastle, float damage) override; private: void TickMobs(std::uint64_t delta); diff --git a/include/game/client/ClientGame.h b/include/game/client/ClientGame.h index a193521..2a04c3f 100644 --- a/include/game/client/ClientGame.h +++ b/include/game/client/ClientGame.h @@ -39,16 +39,16 @@ public: render::Renderer* GetRenderer() const { return m_Renderer; } WorldClient& GetWorldClient() { return m_WorldClient; } - virtual void HandlePacket(const protocol::ConnexionInfoPacket* packet); - virtual void HandlePacket(const protocol::PlayerJoinPacket* packet); - virtual void HandlePacket(const protocol::PlayerLeavePacket* packet); - virtual void HandlePacket(const protocol::PlayerListPacket* packet); - virtual void HandlePacket(const protocol::UpdatePlayerTeamPacket* packet); - virtual void HandlePacket(const protocol::UpdateGameStatePacket* packet); - virtual void HandlePacket(const protocol::UpdateLobbyTimePacket* packet); - virtual void HandlePacket(const protocol::UpdateMoneyPacket* packet); - virtual void HandlePacket(const protocol::DisconnectPacket* packet); - virtual void HandlePacket(const protocol::WorldDataPacket* packet); + virtual void HandlePacket(const protocol::ConnexionInfoPacket* packet) override; + virtual void HandlePacket(const protocol::PlayerJoinPacket* packet) override; + virtual void HandlePacket(const protocol::PlayerLeavePacket* packet) override; + virtual void HandlePacket(const protocol::PlayerListPacket* packet) override; + virtual void HandlePacket(const protocol::UpdatePlayerTeamPacket* packet) override; + virtual void HandlePacket(const protocol::UpdateGameStatePacket* packet) override; + virtual void HandlePacket(const protocol::UpdateLobbyTimePacket* packet) override; + virtual void HandlePacket(const protocol::UpdateMoneyPacket* packet) override; + virtual void HandlePacket(const protocol::DisconnectPacket* packet) override; + virtual void HandlePacket(const protocol::WorldDataPacket* packet) override; }; diff --git a/include/game/client/WorldClient.h b/include/game/client/WorldClient.h index 8582b77..41c919f 100644 --- a/include/game/client/WorldClient.h +++ b/include/game/client/WorldClient.h @@ -14,14 +14,14 @@ private: public: WorldClient(ClientGame* game); - virtual void HandlePacket(const protocol::WorldBeginDataPacket* packet); - virtual void HandlePacket(const protocol::WorldDataPacket* packet); - virtual void HandlePacket(const protocol::SpawnMobPacket* packet); - virtual void HandlePacket(const protocol::UpgradeTowerPacket* packet); - virtual void HandlePacket(const protocol::WorldAddTowerPacket* packet); - virtual void HandlePacket(const protocol::RemoveTowerPacket* packet); - virtual void HandlePacket(const protocol::UpdateMobStatesPacket* packet); - virtual void HandlePacket(const protocol::UpdateCastleLifePacket* packet); + virtual void HandlePacket(const protocol::WorldBeginDataPacket* packet) override; + virtual void HandlePacket(const protocol::WorldDataPacket* packet) override; + virtual void HandlePacket(const protocol::SpawnMobPacket* packet) override; + virtual void HandlePacket(const protocol::UpgradeTowerPacket* packet) override; + virtual void HandlePacket(const protocol::WorldAddTowerPacket* packet) override; + virtual void HandlePacket(const protocol::RemoveTowerPacket* packet) override; + virtual void HandlePacket(const protocol::UpdateMobStatesPacket* packet) override; + virtual void HandlePacket(const protocol::UpdateCastleLifePacket* packet) override; }; diff --git a/include/game/server/ServerConnexion.h b/include/game/server/ServerConnexion.h index ce638bd..48ed29d 100644 --- a/include/game/server/ServerConnexion.h +++ b/include/game/server/ServerConnexion.h @@ -33,14 +33,14 @@ public: void SetServer(Server* server); - virtual void HandlePacket(const protocol::PlayerLoginPacket* packet); - virtual void HandlePacket(const protocol::KeepAlivePacket* packet); - virtual void HandlePacket(const protocol::SelectTeamPacket* packet); - virtual void HandlePacket(const protocol::DisconnectPacket* packet); - virtual void HandlePacket(const protocol::PlaceTowerPacket* packet); - virtual void HandlePacket(const protocol::SendMobsPacket* packet); - virtual void HandlePacket(const protocol::UpgradeTowerPacket* packet); - virtual void HandlePacket(const protocol::RemoveTowerPacket* packet); + virtual void HandlePacket(const protocol::PlayerLoginPacket* packet) override; + virtual void HandlePacket(const protocol::KeepAlivePacket* packet) override; + virtual void HandlePacket(const protocol::SelectTeamPacket* packet) override; + virtual void HandlePacket(const protocol::DisconnectPacket* packet) override; + virtual void HandlePacket(const protocol::PlaceTowerPacket* packet) override; + virtual void HandlePacket(const protocol::SendMobsPacket* packet) override; + virtual void HandlePacket(const protocol::UpgradeTowerPacket* packet) override; + virtual void HandlePacket(const protocol::RemoveTowerPacket* packet) override; std::uint8_t GetID() const { return m_ID; } const game::Player* GetPlayer() const { return m_Player; } diff --git a/include/game/server/ServerGame.h b/include/game/server/ServerGame.h index 611fc88..9e8cd7f 100644 --- a/include/game/server/ServerGame.h +++ b/include/game/server/ServerGame.h @@ -27,10 +27,10 @@ public: // GameListener - virtual void OnGameStateUpdate(game::GameState newState); - virtual void OnGameBegin(); - virtual void OnGameEnd(); - virtual void OnGameClose(); + virtual void OnGameStateUpdate(game::GameState newState) override; + virtual void OnGameBegin() override; + virtual void OnGameEnd() override; + virtual void OnGameClose() override; private: void BalanceTeams(); void UpdateMobStates(); diff --git a/include/game/server/ServerWorld.h b/include/game/server/ServerWorld.h index dd9c1a3..0c65f97 100644 --- a/include/game/server/ServerWorld.h +++ b/include/game/server/ServerWorld.h @@ -21,9 +21,8 @@ public: void SpawnMobs(game::MobType type, std::uint8_t level, game::PlayerID sender, std::uint8_t count); game::TowerPtr PlaceTowerAt(game::TowerType type, std::int32_t x, std::int32_t y, game::PlayerID builder); - virtual void OnMobDie(game::Mob* mob); - - virtual void OnMobCastleDamage(game::Mob* damager, game::TeamCastle* enemyCastle, float damage); + virtual void OnMobDie(game::Mob* mob) override; + virtual void OnMobCastleDamage(game::Mob* damager, game::TeamCastle* enemyCastle, float damage) override; };