mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-03 03:53:56 -07:00
Move game state and event handling out of tab_game and into separate classes (#6090)
* Move game state and event handling out of tab_game and into separate classes. Took 6 hours 38 minutes Took 23 seconds * Meta Info Took 14 hours 36 minutes * Properly respond to game started again. Took 49 minutes * Hook up the message log widgets to game events again. Took 33 minutes Took 7 seconds * Lint. Took 4 minutes * Hook up playerListWidget. Took 1 hour 2 minutes Took 10 seconds * Hook up playerListWidget properly. Took 1 hour 17 minutes * Fix regressions. Took 17 minutes Took 9 seconds * Log the local player joining too. Took 2 minutes * Connect some player signals unrelated to this refactor again. Took 5 minutes --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
parent
5c16f0d027
commit
b8e545bfa4
18 changed files with 1482 additions and 788 deletions
107
cockatrice/src/game/game_meta_info.h
Normal file
107
cockatrice/src/game/game_meta_info.h
Normal file
|
|
@ -0,0 +1,107 @@
|
|||
#ifndef GAME_META_INFO_H
|
||||
#define GAME_META_INFO_H
|
||||
|
||||
#include "pb/serverinfo_game.pb.h"
|
||||
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
|
||||
// Translation layer class to expose protobuf safely and hook it up to Qt Signals.
|
||||
// This class de-couples the domain object (i.e. the GameMetaInfo) from the network object.
|
||||
// If the network object changes, only this class needs to be adjusted.
|
||||
|
||||
class GameMetaInfo : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit GameMetaInfo(QObject *parent = nullptr) : QObject(parent)
|
||||
{
|
||||
}
|
||||
|
||||
QMap<int, QString> roomGameTypes;
|
||||
|
||||
// Populate from protobuf (e.g., after network message)
|
||||
void setFromProto(const ServerInfo_Game &gi)
|
||||
{
|
||||
gameInfo_.CopyFrom(gi);
|
||||
}
|
||||
|
||||
const ServerInfo_Game &proto() const
|
||||
{
|
||||
return gameInfo_;
|
||||
}
|
||||
|
||||
// High-level getters that avoid exposing protobuf directly
|
||||
int gameId() const
|
||||
{
|
||||
return gameInfo_.game_id();
|
||||
}
|
||||
int maxPlayers() const
|
||||
{
|
||||
return gameInfo_.max_players();
|
||||
}
|
||||
QString description() const
|
||||
{
|
||||
return QString::fromStdString(gameInfo_.description());
|
||||
}
|
||||
bool started() const
|
||||
{
|
||||
return gameInfo_.started();
|
||||
}
|
||||
bool spectatorsOmniscient() const
|
||||
{
|
||||
return gameInfo_.spectators_omniscient();
|
||||
}
|
||||
bool spectatorsCanChat() const
|
||||
{
|
||||
return gameInfo_.spectators_can_chat();
|
||||
}
|
||||
int gameTypesSize() const
|
||||
{
|
||||
return gameInfo_.game_types_size();
|
||||
}
|
||||
int gameTypeIdAt(int index) const
|
||||
{
|
||||
return gameInfo_.game_types(index);
|
||||
}
|
||||
|
||||
QMap<int, QString> getRoomGameTypes() const
|
||||
{
|
||||
return roomGameTypes;
|
||||
}
|
||||
|
||||
void setRoomGameTypes(QMap<int, QString> _roomGameTypes)
|
||||
{
|
||||
roomGameTypes = _roomGameTypes;
|
||||
}
|
||||
|
||||
QString findRoomGameType(int index)
|
||||
{
|
||||
return roomGameTypes.find(gameInfo_.game_types(index)).value();
|
||||
}
|
||||
|
||||
public slots:
|
||||
void setStarted(bool s)
|
||||
{
|
||||
if (gameInfo_.started() == s)
|
||||
return;
|
||||
gameInfo_.set_started(s);
|
||||
emit startedChanged(s);
|
||||
}
|
||||
void setSpectatorsOmniscient(bool v)
|
||||
{
|
||||
if (gameInfo_.spectators_omniscient() == v)
|
||||
return;
|
||||
gameInfo_.set_spectators_omniscient(v);
|
||||
emit spectatorsOmniscienceChanged(v);
|
||||
}
|
||||
|
||||
signals:
|
||||
void startedChanged(bool started);
|
||||
void spectatorsOmniscienceChanged(bool omniscient);
|
||||
|
||||
private:
|
||||
ServerInfo_Game gameInfo_;
|
||||
};
|
||||
|
||||
#endif // GAME_META_INFO_H
|
||||
Loading…
Add table
Add a link
Reference in a new issue