aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-17 04:51:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Minor changes

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-12-10 18:58:13 +01:00
parent 50b6af6d3d
commit 9a6b3c91b7
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
View file

@ -477,18 +477,18 @@ bool CDriverGL::unInit()
// Restore monitor color parameters // Restore monitor color parameters
if (_NeedToRestoreGammaRamp) if (_NeedToRestoreGammaRamp)
{ {
HDC dc = CreateDCA ("DISPLAY", NULL, NULL, NULL); HDC dc = CreateDCA("DISPLAY", NULL, NULL, NULL);
if (dc) if (dc)
{ {
if (!SetDeviceGammaRamp (dc, _GammaRampBackuped)) if (!SetDeviceGammaRamp(dc, _GammaRampBackuped))
nlwarning ("(CDriverGL::release): SetDeviceGammaRamp failed"); nlwarning("(CDriverGL::release): SetDeviceGammaRamp failed");
// Release the DC // Release the DC
ReleaseDC (NULL, dc); ReleaseDC(NULL, dc);
} }
else else
{ {
nlwarning ("(CDriverGL::release): can't create DC"); nlwarning("(CDriverGL::release): can't create DC");
} }
} }

3
code/nel/src/misc/common.cpp
View file

@ -765,7 +765,8 @@ static bool createProcess(const std::string &programName, const std::string &arg
args = toString("\"%s\" ", programName.c_str()) + arguments; args = toString("\"%s\" ", programName.c_str()) + arguments;
} }
BOOL res = CreateProcessW(sProgramName, utf8ToWide(args), NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE | CREATE_NO_WINDOW, NULL, NULL, &si, &pi); // or 0 for a window
BOOL res = CreateProcessW(sProgramName, utf8ToWide(args), NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE | CREATE_NO_WINDOW, NULL, NULL /* current dir */, &si, &pi);
if (sProgramName) if (sProgramName)
{ {

2
code/nel/src/misc/config_file/cf_lexical.cpp
View file

@ -3221,7 +3221,7 @@ static void *yy_flex_alloc( size )
yy_size_t size; yy_size_t size;
#endif #endif
{ {
return (void *) malloc( size ); // TODO: delete return (void *) malloc( size );
} }
#ifdef YY_USE_PROTOS #ifdef YY_USE_PROTOS

3
code/ryzom/client/src/client.cpp
View file

@ -183,14 +183,13 @@ int main(int argc, char **argv)
Args.addArg("", "release", "", "Crash client after init"); Args.addArg("", "release", "", "Crash client after init");
#endif // TEST_CRASH_COUNTER #endif // TEST_CRASH_COUNTER
// extract the 2 or 3 first param (argv[1], argv[2] and argv[3]) it must be <login> <password> [shardId]
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
if (!Args.parse(cmdline)) return 1; if (!Args.parse(cmdline)) return 1;
#else #else
if (!Args.parse(argc, argv)) return 1; if (!Args.parse(argc, argv)) return 1;
#endif #endif
// extract the 2 or 3 first param (argv[1], argv[2] and argv[3]) it must be <login> <password> [shardId]
// no shard id in ring mode // no shard id in ring mode
std::string sLoginShardId; std::string sLoginShardId;

22
code/ryzom/client/src/release.cpp
View file

@ -569,13 +569,13 @@ void release()
releaseCommands(); releaseCommands();
// Exit config file stuff // Exit config file stuff
ClientCfg.release (); ClientCfg.release();
// Disconnect the client from the server. // Disconnect the client from the server.
NetMngr.disconnect(); NetMngr.disconnect();
// delete the sound manager // delete the sound manager
if(SoundMngr) if (SoundMngr)
{ {
delete SoundMngr; delete SoundMngr;
SoundMngr = NULL; SoundMngr = NULL;
@ -583,16 +583,16 @@ void release()
// Release the Entities Animation Manager // Release the Entities Animation Manager
CEntityAnimationManager::delInstance(); CEntityAnimationManager::delInstance();
EAM= NULL; EAM = NULL;
nldebug("VR [C]: VR Shutting down"); nldebug("VR [C]: VR Shutting down");
releaseStereoDisplayDevice(); releaseStereoDisplayDevice();
// Delete the driver. // Delete the driver.
if(Driver) if (Driver)
{ {
// Release the prim // Release the prim
PrimFiles.release (*Driver); PrimFiles.release(*Driver);
if (TextContext != NULL) if (TextContext != NULL)
Driver->deleteTextContext(TextContext); Driver->deleteTextContext(TextContext);
@ -617,13 +617,13 @@ void release()
EventsListener.removeFromServer(CInputHandlerManager::getInstance()->FilteredEventServer); EventsListener.removeFromServer(CInputHandlerManager::getInstance()->FilteredEventServer);
IDisplayer *clientLogDisplayer = ErrorLog->getDisplayer("CLIENT.LOG"); IDisplayer *clientLogDisplayer = ErrorLog->getDisplayer("CLIENT.LOG");
if( clientLogDisplayer ) if (clientLogDisplayer)
{ {
DebugLog->removeDisplayer (clientLogDisplayer); DebugLog->removeDisplayer(clientLogDisplayer);
InfoLog->removeDisplayer (clientLogDisplayer); InfoLog->removeDisplayer(clientLogDisplayer);
WarningLog->removeDisplayer (clientLogDisplayer); WarningLog->removeDisplayer(clientLogDisplayer);
ErrorLog->removeDisplayer (clientLogDisplayer); ErrorLog->removeDisplayer(clientLogDisplayer);
AssertLog->removeDisplayer (clientLogDisplayer); AssertLog->removeDisplayer(clientLogDisplayer);
delete clientLogDisplayer; delete clientLogDisplayer;
} }