Changed: #851 misc linux patches (patches provided by ratmice)

This commit is contained in:
kervala 2010-05-08 15:26:22 +02:00
parent bac9d3f6ff
commit c863ea7644
2 changed files with 3 additions and 3 deletions

View file

@ -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("");

View file

@ -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());