refactor: add game listener

This commit is contained in:
2021-12-13 19:45:01 +01:00
parent 61166023df
commit 2148c0050c
6 changed files with 46 additions and 16 deletions

View File

@@ -106,7 +106,7 @@ bool World::saveMap(const std::string& fileName) const {
}
void World::tick(std::uint64_t delta) {
if(m_Game->getGameState() != GameState::Game) return;
if (m_Game->getGameState() != GameState::Game) return;
tickMobs(delta);
for (TowerPtr tower : m_Towers) {
@@ -295,7 +295,7 @@ void World::OnExplosion(utils::shape::Circle explosion, float centerDamage, Towe
void World::OnMobCastleDamage(Mob* damager, TeamCastle* enemyCastle, float damage) {
enemyCastle->damage(damage);
if (enemyCastle->getLife() <= 0) {
getWorldNotifier().notifyListeners(&WorldListener::OnGameEnd);
m_Game->notifyListeners(&GameListener::OnGameEnd);
}
}
@@ -306,10 +306,6 @@ void World::OnMobDamage(Mob* target, float damage, Tower* source) {
}
}
void World::OnGameEnd(){
m_Game->setGameState(GameState::EndGame);
}
Team& World::getRedTeam() {
return m_Game->getRedTeam();
}

View File

@@ -37,10 +37,8 @@ void Lobby::tick() {
return;
if (utils::getTime() - m_StartTimerTime >= LobbyWaitingTime) {
protocol::UpdateGameStatePacket packet(game::GameState::Game);
m_Server->broadcastPacket(&packet);
m_Server->getGame().notifyListeners(&game::GameListener::OnGameBegin);
m_GameStarted = true;
m_Server->lauchGame();
return;
}

View File

@@ -5,7 +5,7 @@ namespace td {
namespace server {
ServerGame::ServerGame(server::Server* server) : game::Game(&m_ServerWorld), m_Server(server), m_ServerWorld(server, this) {
bindListener(this);
}
void ServerGame::tick(std::uint64_t delta) {
@@ -70,5 +70,24 @@ void ServerGame::balanceTeams() {
}
}
void ServerGame::OnGameStateUpdate(game::GameState newState) {
setGameState(newState);
protocol::UpdateGameStatePacket packet(newState);
m_Server->broadcastPacket(&packet);
}
void ServerGame::OnGameEnd() {
notifyListeners(&game::GameListener::OnGameStateUpdate, game::GameState::EndGame);
}
void ServerGame::OnGameClose() {
notifyListeners(&game::GameListener::OnGameStateUpdate, game::GameState::Closed);
}
void ServerGame::OnGameBegin() {
notifyListeners(&game::GameListener::OnGameStateUpdate, game::GameState::Game);
startGame();
}
} // namespace game
} // namespace td