diff --git a/CMakeLists.txt b/CMakeLists.txt index eb4633d3..d97ef660 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -382,10 +382,12 @@ else() set_source_files_properties(${IMGUI_COLOR_TEXT_EDIT_DIR}/TextEditor.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-variable -Wno-sign-compare") - # Disable G++ format string truncation warning - # warning: ā€˜%sā€™ directive output may be truncated writing up to 31 bytes into a region of size 28 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + # Disable warning: '%s' directive output may be truncated writing up to 31 bytes into a region of size 28 set_source_files_properties(${IMGUI_DIR}/imgui_demo.cpp PROPERTIES COMPILE_FLAGS "-Wno-format-truncation") + + # Disable warning: specified size between ... and ... exceeds maximum object size + set_source_files_properties(${IMGUI_DIR}/imgui_draw.cpp PROPERTIES COMPILE_FLAGS "-Wno-stringop-overflow") endif() # Disable C++ exceptions and RTTI diff --git a/Quake/sv_phys.c b/Quake/sv_phys.c index 36513228..dc11577d 100644 --- a/Quake/sv_phys.c +++ b/Quake/sv_phys.c @@ -247,6 +247,7 @@ int SV_FlyMove (edict_t *ent, float time, trace_t *steptrace) blocked = 0; VectorCopy (ent->v.velocity, original_velocity); VectorCopy (ent->v.velocity, primal_velocity); + VectorCopy (vec3_origin, new_velocity); numplanes = 0; time_left = time;