aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-24 18:08:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More VS2015 fixes

Browse source 
--HG--
branch : develop
This commit is contained in:
kaetemi 2016-01-15 12:04:06 +01:00
parent 3632ae4e64
commit da02779588
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/nel/src/3d/dru.cpp
View file

@ -99,7 +99,7 @@ IDriver *CDRU::createGlDriver() throw (EDru)
throw EDruOpenglDriverNotFound(); throw EDruOpenglDriverNotFound();
} }
nlinfo ("Using the library '"NL3D_GL_DLL_NAME"' that is in the directory: '%s'", driverLib.getLibFileName().c_str()); nlinfo ("Using the library '" NL3D_GL_DLL_NAME "' that is in the directory: '%s'", driverLib.getLibFileName().c_str());
createDriver = (IDRV_CREATE_PROC) driverLib.getSymbolAddress(IDRV_CREATE_PROC_NAME); createDriver = (IDRV_CREATE_PROC) driverLib.getSymbolAddress(IDRV_CREATE_PROC_NAME);
if (createDriver == NULL) if (createDriver == NULL)
@ -153,7 +153,7 @@ IDriver *CDRU::createGlEsDriver() throw (EDru)
throw EDruOpenglEsDriverNotFound(); throw EDruOpenglEsDriverNotFound();
} }
nlinfo ("Using the library '"NL3D_GLES_DLL_NAME"' that is in the directory: '%s'", driverLib.getLibFileName().c_str()); nlinfo ("Using the library '" NL3D_GLES_DLL_NAME "' that is in the directory: '%s'", driverLib.getLibFileName().c_str());
createDriver = (IDRV_CREATE_PROC) driverLib.getSymbolAddress(IDRV_CREATE_PROC_NAME); createDriver = (IDRV_CREATE_PROC) driverLib.getSymbolAddress(IDRV_CREATE_PROC_NAME);
if (createDriver == NULL) if (createDriver == NULL)
@ -206,7 +206,7 @@ IDriver *CDRU::createD3DDriver() throw (EDru)
throw EDruDirect3dDriverNotFound(); throw EDruDirect3dDriverNotFound();
} }
nlinfo ("Using the library '"NL3D_D3D_DLL_NAME"' that is in the directory: '%s'", driverLib.getLibFileName().c_str()); nlinfo ("Using the library '" NL3D_D3D_DLL_NAME "' that is in the directory: '%s'", driverLib.getLibFileName().c_str());
createDriver = (IDRV_CREATE_PROC) driverLib.getSymbolAddress(IDRV_CREATE_PROC_NAME); createDriver = (IDRV_CREATE_PROC) driverLib.getSymbolAddress(IDRV_CREATE_PROC_NAME);
if (createDriver == NULL) if (createDriver == NULL)

2
code/nel/src/3d/texture_dlm.cpp
View file

@ -385,7 +385,7 @@ void CTextureDLM::releaseLightMap(uint x, uint y)
// Free this bit in the block. // Free this bit in the block.
nlassert(block->FreeSpace & mask); nlassert(block->FreeSpace & mask);
block->FreeSpace&= ~mask; block->FreeSpace&= (~mask & std::numeric_limits<uint>::max());
// Free the block if necessary. // Free the block if necessary.

4
code/nel/src/net/service.cpp
View file

@ -838,7 +838,7 @@ sint IService::main (const char *serviceShortName, const char *serviceLongName,
} }
} }
nlinfo ("SERVICE: Starting Service '%s' using NeL ("__DATE__" "__TIME__") compiled %s", _ShortName.c_str(), CompilationDate.c_str()); nlinfo ("SERVICE: Starting Service '%s' using NeL (" __DATE__ " " __TIME__ ") compiled %s", _ShortName.c_str(), CompilationDate.c_str());
nlinfo ("SERVICE: On OS: %s", CSystemInfo::getOS().c_str()); nlinfo ("SERVICE: On OS: %s", CSystemInfo::getOS().c_str());
setExitStatus (EXIT_SUCCESS); setExitStatus (EXIT_SUCCESS);
@ -1802,7 +1802,7 @@ NLMISC_CATEGORISED_COMMAND(nel, serviceInfo, "display information about this ser
if(args.size() != 0) return false; if(args.size() != 0) return false;
log.displayNL ("Service %s '%s' using NeL ("__DATE__" "__TIME__")", IService::getInstance()->getServiceLongName().c_str(), IService::getInstance()->getServiceUnifiedName().c_str()); log.displayNL ("Service %s '%s' using NeL (" __DATE__ " " __TIME__ ")", IService::getInstance()->getServiceLongName().c_str(), IService::getInstance()->getServiceUnifiedName().c_str());
log.displayNL ("Service listening port: %d", IService::getInstance()->ListeningPort.get()); log.displayNL ("Service listening port: %d", IService::getInstance()->ListeningPort.get());
log.displayNL ("Service running directory: '%s'", IService::getInstance()->RunningDirectory.c_str()); log.displayNL ("Service running directory: '%s'", IService::getInstance()->RunningDirectory.c_str());
log.displayNL ("Service log directory: '%s'", IService::getInstance()->LogDirectory.c_str()); log.displayNL ("Service log directory: '%s'", IService::getInstance()->LogDirectory.c_str());