diff --git a/source/glest_game/global/config.cpp b/source/glest_game/global/config.cpp index 43151d5a..a9eb71c6 100644 --- a/source/glest_game/global/config.cpp +++ b/source/glest_game/global/config.cpp @@ -183,6 +183,9 @@ Config::Config(std::pair type, std::pair f } #if defined(WIN32) + //string test = "C:\\Code\\megaglest\\mk\\windoze\\.\\..\\..\\data\\glest_game\\glest.ini"; + //updatePathClimbingParts(test); + updatePathClimbingParts(fileName.first); #endif diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp index ab73fe5e..26d0816b 100644 --- a/source/glest_game/graphics/renderer.cpp +++ b/source/glest_game/graphics/renderer.cpp @@ -9548,7 +9548,7 @@ void Renderer::renderVideoLoading(int progressPercent) { } } else { - anim -= 0.1; + anim -= 0.1f; if(anim < 0.f) { anim= 0.f; cycle.reset(); diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index 20fdf859..809540f6 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -5267,7 +5267,7 @@ int glestMainWrapper(int argc, char** argv) { #if defined(WIN32) wstring dumpfilepath = utf8_decode("."); //google_breakpad::ExceptionHandler handler(dumpfilepath, NULL, MinidumpCallback, NULL, true); - errorHandlerPtr.reset(new google_breakpad::ExceptionHandler(dumpfilepath, NULL, MinidumpCallback, NULL, true)); + errorHandlerPtr.reset(new google_breakpad::ExceptionHandler(dumpfilepath, NULL, MinidumpCallback, NULL, google_breakpad::ExceptionHandler::HANDLER_ALL)); #else google_breakpad::MinidumpDescriptor descriptor("."); errorHandlerPtr.reset(new google_breakpad::ExceptionHandler(descriptor, NULL, MinidumpCallback, NULL, true,-1));