mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-26 00:56:19 +00:00
Merge
This commit is contained in:
commit
3773bb3e6b
3 changed files with 4 additions and 4 deletions
|
@ -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("");
|
||||||
|
|
|
@ -406,7 +406,7 @@ int requestTerminater (HTRequest * request, HTResponse * /* response */,
|
||||||
// the parameter is actually an uint32
|
// the parameter is actually an uint32
|
||||||
if (param != 0)
|
if (param != 0)
|
||||||
{
|
{
|
||||||
CGroupHTML::TGroupHtmlByUIDMap::iterator it= CGroupHTML::_GroupHtmlByUID.find((uint32)param);
|
CGroupHTML::TGroupHtmlByUIDMap::iterator it= CGroupHTML::_GroupHtmlByUID.find((uint32)(size_t)param);
|
||||||
if(it!=CGroupHTML::_GroupHtmlByUID.end())
|
if(it!=CGroupHTML::_GroupHtmlByUID.end())
|
||||||
{
|
{
|
||||||
// get the pointer. NB: the refptr should not be NULL
|
// get the pointer. NB: the refptr should not be NULL
|
||||||
|
|
|
@ -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());
|
||||||
|
|
Loading…
Reference in a new issue