jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

squash #6156 (#6161)

Browse source 
* move common server files

* update includes with move

* create participant, move code

* fix linker errors

* fix regressions

* mark function as override to make clang happy

* split out spectator to new file

* forgot to add to cmakelists

* autocompleter picking wrong casing for var name

* clean up forwards declarations in player

* fix includes in game
This commit is contained in:
ebbit1q 2025-09-20 14:37:12 +02:00 • committed by GitHub
parent 17dcaf9afa
commit f0c3860032
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
45 changed files with 1283 additions and 866 deletions
Download patch file Download diff file Expand all files Collapse all files

4
servatrice/src/isl_interface.cpp
View file

@ -14,9 +14,9 @@
#include "pb/event_user_left.pb.h"
#include "pb/event_user_message.pb.h"
#include "pb/isl_message.pb.h"
#include "server/server_protocolhandler.h"
#include "server/server_room.h"
#include "server_logger.h"
#include "server_protocolhandler.h"
#include "server_room.h"
#include <QSslSocket>
#include <google/protobuf/descriptor.h>

2
servatrice/src/servatrice.cpp
View file

@ -29,8 +29,8 @@
#include "pb/event_server_shutdown.pb.h"
#include "servatrice_connection_pool.h"
#include "servatrice_database_interface.h"
#include "server/server_room.h"
#include "server_logger.h"
#include "server_room.h"
#include "serversocketinterface.h"
#include "settingscache.h"
#include "smtpclient.h"

4
servatrice/src/servatrice.h
View file

@ -20,7 +20,7 @@
#ifndef SERVATRICE_H
#define SERVATRICE_H
#include "server.h"
#include "server/server.h"
#include <QHostAddress>
#include <QMetaType>
@ -284,4 +284,4 @@ public:
QList<ServerProperties> getServerList() const;
};
#endif
#endif

4
servatrice/src/servatrice_database_interface.h
View file

@ -1,8 +1,8 @@
#ifndef SERVATRICE_DATABASE_INTERFACE_H
#define SERVATRICE_DATABASE_INTERFACE_H
#include "server.h"
#include "server_database_interface.h"
#include "server/server.h"
#include "server/server_database_interface.h"
#include <QChar>
#include <QHash>

6
servatrice/src/serversocketinterface.cpp
View file

@ -65,10 +65,10 @@
#include "pb/serverinfo_user.pb.h"
#include "servatrice.h"
#include "servatrice_database_interface.h"
#include "server/game/server_player.h"
#include "server/server_response_containers.h"
#include "server/server_room.h"
#include "server_logger.h"
#include "server_player.h"
#include "server_response_containers.h"
#include "server_room.h"
#include "settingscache.h"
#include "trice_limits.h"
#include "version_string.h"

2
servatrice/src/serversocketinterface.h
View file

@ -20,7 +20,7 @@
#ifndef SERVERSOCKETINTERFACE_H
#define SERVERSOCKETINTERFACE_H
#include "server_protocolhandler.h"
#include "server/server_protocolhandler.h"
#include <QHostAddress>
#include <QMutex>