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

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
if (_NeedToRestoreGammaRamp)
{
HDC dc = CreateDCA ("DISPLAY", NULL, NULL, NULL);
HDC dc = CreateDCA("DISPLAY", NULL, NULL, NULL);
if (dc)
{
if (!SetDeviceGammaRamp (dc, _GammaRampBackuped))
nlwarning ("(CDriverGL::release): SetDeviceGammaRamp failed");
if (!SetDeviceGammaRamp(dc, _GammaRampBackuped))
nlwarning("(CDriverGL::release): SetDeviceGammaRamp failed");
// Release the DC
ReleaseDC (NULL, dc);
ReleaseDC(NULL, dc);
}
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;
}
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)
{

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;
#endif
{
return (void *) malloc( size ); // TODO: delete
return (void *) malloc( size );
}
#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");
#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
if (!Args.parse(cmdline)) return 1;
#else
if (!Args.parse(argc, argv)) return 1;
#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
std::string sLoginShardId;

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

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