Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

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

Browse source
This commit is contained in:
kervala 2010-05-08 15:26:22 +02:00
parent 61544f1400
commit e77d7dab27
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/client/src/connection.cpp
View file

@ -981,7 +981,7 @@ TInterfaceState globalMenu()
while (PlayerWantToGoInGame == false) while (PlayerWantToGoInGame == false)
{ {
#ifdef NL_DEBUG #if defined(NL_OS_WINDOWS) && defined(NL_DEBUG)
// tmp for debug // tmp for debug
if (::GetAsyncKeyState(VK_SPACE)) if (::GetAsyncKeyState(VK_SPACE))
{ {
@ -1064,7 +1064,7 @@ TInterfaceState globalMenu()
nlSleep(ClientCfg.Sleep); nlSleep(ClientCfg.Sleep);
} }
#ifdef NL_DEBUG #if defined(NL_OS_WINDOWS) && defined(NL_DEBUG)
if (::GetAsyncKeyState(VK_CONTROL)) if (::GetAsyncKeyState(VK_CONTROL))
{ {
pIM->displayUIViewBBoxs(""); pIM->displayUIViewBBoxs("");

2
code/ryzom/client/src/login_patch.cpp
View file

@ -1197,7 +1197,7 @@ void CPatchManager::downloadFileWithCurl (const string &source, const string &de
// file not found, delete local file // file not found, delete local file
throw Exception ("curl init failed"); 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_PROGRESSFUNCTION, downloadProgressFunc);
curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *) progress); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *) progress);
curl_easy_setopt(curl, CURLOPT_URL, source.c_str()); curl_easy_setopt(curl, CURLOPT_URL, source.c_str());