games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

revert uuid

Browse Source
This commit is contained in:
Michael
2023-08-23 20:03:40 +02:00
committed by GitHub
parent d2bbe0f35a
commit 4784ae94b5
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Global.h
View File

@@ -121,7 +121,6 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
#include <optional> #include <optional>
#include <queue> #include <queue>
#include <random> #include <random>
#include <regex>
#include <set> #include <set>
#include <sstream> #include <sstream>
#include <string> #include <string>
@@ -167,9 +166,6 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
#include <boost/range/adaptor/reversed.hpp> #include <boost/range/adaptor/reversed.hpp>
#include <boost/range/algorithm.hpp> #include <boost/range/algorithm.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <boost/uuid/uuid.hpp>
#include <boost/uuid/uuid_generators.hpp>
#include <boost/uuid/uuid_io.hpp>
#ifndef M_PI #ifndef M_PI
# define M_PI 3.14159265358979323846 # define M_PI 3.14159265358979323846

3
client/CServerHandler.cpp
View File

@@ -49,6 +49,9 @@
#include "../lib/serializer/Connection.h" #include "../lib/serializer/Connection.h"
#include "../lib/serializer/CMemorySerializer.h" #include "../lib/serializer/CMemorySerializer.h"
#include <boost/uuid/uuid.hpp>
#include <boost/uuid/uuid_io.hpp>
#include <boost/uuid/uuid_generators.hpp>
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include "../lib/serializer/Cast.h" #include "../lib/serializer/Cast.h"
#include "LobbyClientNetPackVisitors.h" #include "LobbyClientNetPackVisitors.h"

4
lib/StartInfo.h
View File

@@ -83,7 +83,6 @@ struct DLL_LINKAGE StartInfo
ui32 seedToBeUsed; //0 if not sure (client requests server to decide, will be send in reply pack) ui32 seedToBeUsed; //0 if not sure (client requests server to decide, will be send in reply pack)
ui32 seedPostInit; //so we know that game is correctly synced at the start; 0 if not known yet ui32 seedPostInit; //so we know that game is correctly synced at the start; 0 if not known yet
ui32 mapfileChecksum; //0 if not relevant ui32 mapfileChecksum; //0 if not relevant
std::string gameUuid;
std::string startTimeIso8601; std::string startTimeIso8601;
TurnTimerInfo turnTimerInfo; TurnTimerInfo turnTimerInfo;
std::string mapname; // empty for random map, otherwise name of the map or savegame std::string mapname; // empty for random map, otherwise name of the map or savegame
@@ -108,7 +107,6 @@ struct DLL_LINKAGE StartInfo
h & seedToBeUsed; h & seedToBeUsed;
h & seedPostInit; h & seedPostInit;
h & mapfileChecksum; h & mapfileChecksum;
h & gameUuid;
h & startTimeIso8601; h & startTimeIso8601;
h & turnTimerInfo; h & turnTimerInfo;
h & mapname; h & mapname;
@@ -117,7 +115,7 @@ struct DLL_LINKAGE StartInfo
} }
StartInfo() : mode(INVALID), difficulty(1), seedToBeUsed(0), seedPostInit(0), StartInfo() : mode(INVALID), difficulty(1), seedToBeUsed(0), seedPostInit(0),
mapfileChecksum(0), gameUuid(boost::uuids::to_string(boost::uuids::random_generator()())), startTimeIso8601(vstd::getDateTimeISO8601Basic(std::time(0))) mapfileChecksum(0), startTimeIso8601(vstd::getDateTimeISO8601Basic(std::time(0)))
{ {
} }

5
server/CVCMIServer.cpp
View File

@@ -50,6 +50,11 @@
// for applier // for applier
#include "../lib/registerTypes/RegisterTypes.h" #include "../lib/registerTypes/RegisterTypes.h"
// UUID generation
#include <boost/uuid/uuid.hpp>
#include <boost/uuid/uuid_io.hpp>
#include <boost/uuid/uuid_generators.hpp>
#include "../lib/gameState/CGameState.h" #include "../lib/gameState/CGameState.h"
template<typename T> class CApplyOnServer; template<typename T> class CApplyOnServer;