Pantyhose-X/freeminer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
proller 2016-04-04 00:10:53 +03:00
parent 15ad40e859
commit e7e39fefa4
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Modules/FindMsgPack.cmake
View File

@ -50,7 +50,7 @@ elseif(NOT MSGPACK_LIBRARY)
endif()
set(MSGPACK_BUILD_EXAMPLES OFF)
set(MSGPACK_BUILD_TESTS OFF)
#set(MSGPACK_ENABLE_SHARED OFF) # broken disable, todo
set(MSGPACK_ENABLE_SHARED OFF)
add_subdirectory(msgpack-c)
#include_directories(${PROJECT_SOURCE_DIR}/msgpack-c/include)
set(MSGPACK_LIBRARY msgpackc-static) # before 1.4.0 was msgpack-static

7
src/game.cpp
View File

@ -4601,9 +4601,10 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats,
allow = false;
}
if (allow) {
updateDrawList_future = std::async(std::launch::async, [&]{
client->getEnv().getClientMap().updateDrawList(driver, runData->update_draw_list_timer, 1000);
});
updateDrawList_future = std::async(std::launch::async, [=](float dtime) {
client->getEnv().getClientMap().updateDrawList(driver, dtime, 1000);
}, runData->update_draw_list_timer);
}
}
else

2
src/minimap.h
View File

@ -110,7 +110,7 @@ public:
bool popBlockUpdate(QueuedMinimapUpdate *update);
MinimapData *data;
u32 next_update;
std::atomic_uint next_update;
protected:
virtual void doUpdate();

1
util/autotest/auto.pl
View File

@ -549,6 +549,7 @@ our $tasks = {
server_gdb_nd => [{-options_add => 'no_exit'}, 'build_server', ['gdb', 'run_server']],
bot_gdb => ['build_client_debug', ['gdb', 'run_single']],
bot_gdb_nd => ['build_client', ['gdb', 'run_single']],
vtune => sub {
sy 'echo 0|sudo tee /proc/sys/kernel/yama/ptrace_scope';