jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-23 15:13:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Game] Fix double concede in log (#6179)

Browse source
This commit is contained in:
RickyRister 2025-09-26 10:12:20 -07:00 • committed by GitHub
parent 762ea47b8e
commit 6187c7268f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/game/game_event_handler.cpp
View file

@ -340,6 +340,8 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties
while (playerIterator.hasNext()) while (playerIterator.hasNext())
playerIterator.next().value()->updateZones(); playerIterator.next().value()->updateZones();
emit logConcede(eventPlayerId);
break; break;
} }
case GameEventContext::UNCONCEDE: { case GameEventContext::UNCONCEDE: {
@ -349,6 +351,8 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties
while (playerIterator.hasNext()) while (playerIterator.hasNext())
playerIterator.next().value()->updateZones(); playerIterator.next().value()->updateZones();
emit logUnconcede(eventPlayerId);
break; break;
} }
case GameEventContext::DECK_SELECT: { case GameEventContext::DECK_SELECT: {

2
cockatrice/src/game/game_event_handler.h
View file

@ -122,6 +122,8 @@ signals:
void logGameClosed(); void logGameClosed();
void logActivePlayer(Player *activePlayer); void logActivePlayer(Player *activePlayer);
void logActivePhaseChanged(int activePhase); void logActivePhaseChanged(int activePhase);
void logConcede(int playerId);
void logUnconcede(int playerId);
}; };
#endif // COCKATRICE_GAME_EVENT_HANDLER_H #endif // COCKATRICE_GAME_EVENT_HANDLER_H

11
cockatrice/src/tabs/tab_game.cpp
View file

@ -78,7 +78,6 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
connectToGameEventHandler(); connectToGameEventHandler();
connectPlayerListToGameEventHandler(); connectPlayerListToGameEventHandler();
connectMessageLogToGameEventHandler(); connectMessageLogToGameEventHandler();
connectMessageLogToPlayerHandler();
retranslateUi(); retranslateUi();
connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this, connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
@ -124,7 +123,6 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor,
connectToGameEventHandler(); connectToGameEventHandler();
connectPlayerListToGameEventHandler(); connectPlayerListToGameEventHandler();
connectMessageLogToGameEventHandler(); connectMessageLogToGameEventHandler();
connectMessageLogToPlayerHandler();
retranslateUi(); retranslateUi();
connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this, connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
@ -206,16 +204,13 @@ void TabGame::connectMessageLogToGameEventHandler()
connect(game->getGameEventHandler(), &GameEventHandler::logTurnReversed, messageLog, connect(game->getGameEventHandler(), &GameEventHandler::logTurnReversed, messageLog,
&MessageLogWidget::logReverseTurn); &MessageLogWidget::logReverseTurn);
connect(game->getGameEventHandler(), &GameEventHandler::logConcede, messageLog, &MessageLogWidget::logConcede);
connect(game->getGameEventHandler(), &GameEventHandler::logUnconcede, messageLog, &MessageLogWidget::logUnconcede);
connect(game->getGameEventHandler(), &GameEventHandler::logGameClosed, messageLog, connect(game->getGameEventHandler(), &GameEventHandler::logGameClosed, messageLog,
&MessageLogWidget::logGameClosed); &MessageLogWidget::logGameClosed);
} }
void TabGame::connectMessageLogToPlayerHandler()
{
connect(game->getPlayerManager(), &PlayerManager::playerConceded, messageLog, &MessageLogWidget::logConcede);
connect(game->getPlayerManager(), &PlayerManager::playerUnconceded, messageLog, &MessageLogWidget::logUnconcede);
}
void TabGame::connectPlayerListToGameEventHandler() void TabGame::connectPlayerListToGameEventHandler()
{ {
connect(game->getGameEventHandler(), &GameEventHandler::playerJoined, playerListWidget, connect(game->getGameEventHandler(), &GameEventHandler::playerJoined, playerListWidget,

1
cockatrice/src/tabs/tab_game.h
View file

@ -168,7 +168,6 @@ public:
void connectToPlayerManager(); void connectToPlayerManager();
void connectToGameEventHandler(); void connectToGameEventHandler();
void connectMessageLogToGameEventHandler(); void connectMessageLogToGameEventHandler();
void connectMessageLogToPlayerHandler();
void connectPlayerListToGameEventHandler(); void connectPlayerListToGameEventHandler();
TabGame(TabSupervisor *_tabSupervisor, GameReplay *replay); TabGame(TabSupervisor *_tabSupervisor, GameReplay *replay);
~TabGame() override; ~TabGame() override;