diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp index ef5ca96db..e46b4f0fe 100644 --- a/cockatrice/src/game/game_event_handler.cpp +++ b/cockatrice/src/game/game_event_handler.cpp @@ -340,6 +340,8 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties while (playerIterator.hasNext()) playerIterator.next().value()->updateZones(); + emit logConcede(eventPlayerId); + break; } case GameEventContext::UNCONCEDE: { @@ -349,6 +351,8 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties while (playerIterator.hasNext()) playerIterator.next().value()->updateZones(); + emit logUnconcede(eventPlayerId); + break; } case GameEventContext::DECK_SELECT: { diff --git a/cockatrice/src/game/game_event_handler.h b/cockatrice/src/game/game_event_handler.h index 251273dc7..4270bed74 100644 --- a/cockatrice/src/game/game_event_handler.h +++ b/cockatrice/src/game/game_event_handler.h @@ -122,6 +122,8 @@ signals: void logGameClosed(); void logActivePlayer(Player *activePlayer); void logActivePhaseChanged(int activePhase); + void logConcede(int playerId); + void logUnconcede(int playerId); }; #endif // COCKATRICE_GAME_EVENT_HANDLER_H diff --git a/cockatrice/src/tabs/tab_game.cpp b/cockatrice/src/tabs/tab_game.cpp index c8ea5e7fe..7e345472d 100644 --- a/cockatrice/src/tabs/tab_game.cpp +++ b/cockatrice/src/tabs/tab_game.cpp @@ -78,7 +78,6 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay) connectToGameEventHandler(); connectPlayerListToGameEventHandler(); connectMessageLogToGameEventHandler(); - connectMessageLogToPlayerHandler(); retranslateUi(); connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this, @@ -124,7 +123,6 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, connectToGameEventHandler(); connectPlayerListToGameEventHandler(); connectMessageLogToGameEventHandler(); - connectMessageLogToPlayerHandler(); retranslateUi(); connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this, @@ -206,16 +204,13 @@ void TabGame::connectMessageLogToGameEventHandler() connect(game->getGameEventHandler(), &GameEventHandler::logTurnReversed, messageLog, &MessageLogWidget::logReverseTurn); + connect(game->getGameEventHandler(), &GameEventHandler::logConcede, messageLog, &MessageLogWidget::logConcede); + connect(game->getGameEventHandler(), &GameEventHandler::logUnconcede, messageLog, &MessageLogWidget::logUnconcede); + connect(game->getGameEventHandler(), &GameEventHandler::logGameClosed, messageLog, &MessageLogWidget::logGameClosed); } -void TabGame::connectMessageLogToPlayerHandler() -{ - connect(game->getPlayerManager(), &PlayerManager::playerConceded, messageLog, &MessageLogWidget::logConcede); - connect(game->getPlayerManager(), &PlayerManager::playerUnconceded, messageLog, &MessageLogWidget::logUnconcede); -} - void TabGame::connectPlayerListToGameEventHandler() { connect(game->getGameEventHandler(), &GameEventHandler::playerJoined, playerListWidget, diff --git a/cockatrice/src/tabs/tab_game.h b/cockatrice/src/tabs/tab_game.h index 660e64506..a0aeb8138 100644 --- a/cockatrice/src/tabs/tab_game.h +++ b/cockatrice/src/tabs/tab_game.h @@ -168,7 +168,6 @@ public: void connectToPlayerManager(); void connectToGameEventHandler(); void connectMessageLogToGameEventHandler(); - void connectMessageLogToPlayerHandler(); void connectPlayerListToGameEventHandler(); TabGame(TabSupervisor *_tabSupervisor, GameReplay *replay); ~TabGame() override;