diff --git a/app/src/DnaStore.cpp b/app/src/DnaStore.cpp index 1959676..102a90f 100644 --- a/app/src/DnaStore.cpp +++ b/app/src/DnaStore.cpp @@ -14,12 +14,12 @@ void DnaStore::load(DnaManagerData *data) { if (sys::fileExists(ID_FILE_NAME)) { - sys::loadDataFromFile(ID_FILE_NAME, &data->id, sizeof(uint64_t)); + sys::loadDataFromFile(ID_FILE_NAME, &data->id, sizeof(int64_t)); } else { data->id = time(nullptr); - sys::saveDataToFile(ID_FILE_NAME, &data->id, sizeof(uint64_t)); + sys::saveDataToFile(ID_FILE_NAME, &data->id, sizeof(int64_t)); } if (sys::fileExists(DATA_FILE_NAME)) diff --git a/server/src/server.cpp b/server/src/server.cpp index b7ab261..5f9f87d 100644 --- a/server/src/server.cpp +++ b/server/src/server.cpp @@ -18,7 +18,7 @@ void call(int sock, sockaddr_in newSocketInfo) { std::cout << "new User" << std::endl; - uint64_t conf, id; + int64_t conf, id; Message message; TcpSocket::recvt(sock, &conf, sizeof(conf)); diff --git a/shared/inc/NetConst.hpp b/shared/inc/NetConst.hpp index a0e0807..bd43a23 100644 --- a/shared/inc/NetConst.hpp +++ b/shared/inc/NetConst.hpp @@ -1,6 +1,6 @@ #include -constexpr uint64_t StartHeader = 1737720524UL; +constexpr int64_t StartHeader = 1737720524UL; enum Mess { diff --git a/shared/inc/values/DnaManager.hpp b/shared/inc/values/DnaManager.hpp index 1f432d9..5676c29 100644 --- a/shared/inc/values/DnaManager.hpp +++ b/shared/inc/values/DnaManager.hpp @@ -32,7 +32,7 @@ struct DnaManagerData { int generation; uint128 randSeed; - uint64_t id; + int64_t id; int queued; int showed; std::vector vector; diff --git a/shared/inc/values/mrand.hpp b/shared/inc/values/mrand.hpp index 04b4cbc..a7c8b8d 100644 --- a/shared/inc/values/mrand.hpp +++ b/shared/inc/values/mrand.hpp @@ -10,7 +10,7 @@ struct uint128 namespace mrand { - uint128 getState(unsigned long long seed); + uint128 getState(unsigned long seed); float getFloat(uint128 *state); int getValue(int min, int max, uint128 *state); unsigned int computeCRC32(void *data, int dataSize); diff --git a/shared/src/values/mrand.cpp b/shared/src/values/mrand.cpp index 1bacff2..4c57348 100644 --- a/shared/src/values/mrand.cpp +++ b/shared/src/values/mrand.cpp @@ -34,10 +34,8 @@ uint64_t rprand_splitmix64(uint64_t &rprand_seed) namespace mrand { - uint128 getState(unsigned long long seed) + uint128 getState(unsigned long rprand_seed) { - uint64_t rprand_seed = (uint64_t)seed; // Set SplitMix64 seed for further use - uint128 rprand_state; // To generate the Xoshiro128** state, we use SplitMix64 generator first