From c863ea76442e50ec8cfc87c4eae043efb16dc65e Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 8 May 2010 15:26:22 +0200 Subject: [PATCH] Changed: #851 misc linux patches (patches provided by ratmice) --- code/ryzom/client/src/connection.cpp | 4 ++-- code/ryzom/client/src/login_patch.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/ryzom/client/src/connection.cpp b/code/ryzom/client/src/connection.cpp index 167283fa3..dea96674c 100644 --- a/code/ryzom/client/src/connection.cpp +++ b/code/ryzom/client/src/connection.cpp @@ -981,7 +981,7 @@ TInterfaceState globalMenu() while (PlayerWantToGoInGame == false) { - #ifdef NL_DEBUG + #if defined(NL_OS_WINDOWS) && defined(NL_DEBUG) // tmp for debug if (::GetAsyncKeyState(VK_SPACE)) { @@ -1064,7 +1064,7 @@ TInterfaceState globalMenu() nlSleep(ClientCfg.Sleep); } - #ifdef NL_DEBUG + #if defined(NL_OS_WINDOWS) && defined(NL_DEBUG) if (::GetAsyncKeyState(VK_CONTROL)) { pIM->displayUIViewBBoxs(""); diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index 343945446..47a75d97f 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -1197,7 +1197,7 @@ void CPatchManager::downloadFileWithCurl (const string &source, const string &de // file not found, delete local file throw Exception ("curl init failed"); } - curl_easy_setopt(curl, CURLOPT_NOPROGRESS, FALSE); + curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0); curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, downloadProgressFunc); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *) progress); curl_easy_setopt(curl, CURLOPT_URL, source.c_str());