From ec34720ad63996ebf22090989b5efdac3bda748a Mon Sep 17 00:00:00 2001 From: milek7 Date: Tue, 29 Jan 2019 23:10:44 +0100 Subject: [PATCH] work --- CMakeLists.txt | 6 +++--- Globals.h | 1 + network/network.cpp | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 665fba2a..719832c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,9 +11,9 @@ include(cotire) set(DEPS_DIR ${DEPS_DIR} "${CMAKE_SOURCE_DIR}/ref") project("eu07") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize=undefined") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize=undefined") -set(CMAKE_LD_FLAGS "${CMAKE_LD_FLAGS} -fsanitize=address -fsanitize=undefined") +#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize=undefined") +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize=undefined") +#set(CMAKE_LD_FLAGS "${CMAKE_LD_FLAGS} -fsanitize=address -fsanitize=undefined") set(CMAKE_CXX_STANDARD 17) include_directories("." diff --git a/Globals.h b/Globals.h index 88b0ec27..16366000 100644 --- a/Globals.h +++ b/Globals.h @@ -28,6 +28,7 @@ struct global_settings { bool altState{ false }; std::mt19937 random_engine; std::mt19937 local_random_engine; + bool ready_to_load { false }; uint32_t random_seed; TDynamicObject *changeDynObj{ nullptr };// info o zmianie pojazdu TCamera pCamera; // parametry kamery diff --git a/network/network.cpp b/network/network.cpp index 5cb1b4a1..ee0ceca0 100644 --- a/network/network.cpp +++ b/network/network.cpp @@ -218,6 +218,7 @@ void network::client::handle_message(std::shared_ptr conn, const mes Global.random_seed = cmd.seed; Global.random_engine.seed(Global.random_seed); + Global.ready_to_load = true; WriteLog("net: accept received", logtype::net); }