jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-28 00:42:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Rebase.

Browse source 
Took 2 minutes

Took 13 seconds
This commit is contained in:
Lukas Brübach 2026-08-23 18:35:43 +02:00
parent 0e81bf5529
commit 40a8862b5b
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
View file

@ -63,8 +63,9 @@ Server_Game::Server_Game(const GameConfig &config, Server_Room *_room)
startingLifeTotal(config.startingLifeTotal), shareDecklistsOnLoad(config.shareDecklistsOnLoad), startingLifeTotal(config.startingLifeTotal), shareDecklistsOnLoad(config.shareDecklistsOnLoad),
inactivityCounter(0), startTimeOfThisGame(0), secondsElapsed(0), firstGameStarted(false), inactivityCounter(0), startTimeOfThisGame(0), secondsElapsed(0), firstGameStarted(false),
turnOrderReversed(false), startTime(QDateTime::currentDateTime()), pingClock(nullptr), turnOrderReversed(false), startTime(QDateTime::currentDateTime()), pingClock(nullptr),
deckValidationStrategy(new Server_DefaultDeckValidationStrategy), lifecycleStrategy(new Server_DefaultLifecycleStrategy), matchResultStrategy(new Server_NullMatchResultStrategy), deckValidationStrategy(new Server_DefaultDeckValidationStrategy),
gameMutex() lifecycleStrategy(new Server_DefaultLifecycleStrategy), matchResultStrategy(new Server_NullMatchResultStrategy),
gameMutex()
{ {
currentReplay = new GameReplay; currentReplay = new GameReplay;
currentReplay->set_replay_id(room->getServer()->getDatabaseInterface()->getNextReplayId()); currentReplay->set_replay_id(room->getServer()->getDatabaseInterface()->getNextReplayId());

6
libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
View file

@ -22,9 +22,9 @@
#include "../server_response_containers.h" #include "../server_response_containers.h"
#include "game_config.h" #include "game_config.h"
#include "server_match_result_strategy.h"
#include "server_deck_validation_strategy.h" #include "server_deck_validation_strategy.h"
#include "server_game_lifecycle_strategy.h" #include "server_game_lifecycle_strategy.h"
#include "server_match_result_strategy.h"
#include <QDateTime> #include <QDateTime>
#include <QMap> #include <QMap>
@ -83,12 +83,12 @@ private:
QList<GameReplay *> replayList; QList<GameReplay *> replayList;
GameReplay *currentReplay; GameReplay *currentReplay;
QScopedPointer<Server_MatchResultStrategy> matchResultStrategy;
QScopedPointer<Server_DeckValidationStrategy> deckValidationStrategy; QScopedPointer<Server_DeckValidationStrategy> deckValidationStrategy;
QScopedPointer<Server_GameLifecycleStrategy> lifecycleStrategy; QScopedPointer<Server_GameLifecycleStrategy> lifecycleStrategy;
QScopedPointer<Server_MatchResultStrategy> matchResultStrategy;
void createGameStateChangedEvent(Event_GameStateChanged *event, void createGameStateChangedEvent(Event_GameStateChanged *event,
Server_AbstractParticipant *recipient, Server_AbstractParticipant *recipient,
bool omniscient, bool omniscient,