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

Changed: #825 Remove all warning when compiling Ryzom

Browse source
This commit is contained in:
kervala 2010-10-17 15:26:57 +02:00
parent d3aec1d246
commit beaeccf2ce
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -363,7 +363,7 @@ bool CDriverGL::setupDisplay()
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
NL3D::registerWGlExtensions(_Extensions, _hDC); NL3D::registerWGlExtensions(_Extensions, _hDC);
#endif // ifdef NL_OS_WINDOWS #endif // NL_OS_WINDOWS
// Check required extensions!! // Check required extensions!!
// ARBMultiTexture is a OpenGL 1.2 required extension. // ARBMultiTexture is a OpenGL 1.2 required extension.
@ -851,7 +851,6 @@ bool CDriverGL::swapBuffers()
} }
} }
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
if (_EventEmitter.getNumEmitters() > 1) // is direct input running ? if (_EventEmitter.getNumEmitters() > 1) // is direct input running ?
{ {

2
code/nel/src/misc/i_xml.cpp
View file

@ -1083,7 +1083,7 @@ int CIXml::getIntProperty(xmlNodePtr node, const char *property, int defaultValu
return defaultValue; return defaultValue;
s=s.strip(); s=s.strip();
int val=s.atoi(); sint val=s.atoi();
if (val==0 && s!="0") if (val==0 && s!="0")
{ {
nlwarning("bad integer value: %s",s.c_str()); nlwarning("bad integer value: %s",s.c_str());

6
code/nel/src/misc/win_event_emitter.cpp
View file

@ -128,11 +128,11 @@ bool CWinEventEmitter::processMessage (HWND hWnd, uint32 msg, WPARAM wParam, LPA
if (_KeyboardEventsEnabled) if (_KeyboardEventsEnabled)
{ {
// Ctrl, shit or alt ? // Ctrl, shit or alt ?
if ((int)wParam==VK_MENU) if ((sint)wParam==VK_MENU)
_AltButton=true; _AltButton=true;
if ((int)wParam==VK_CONTROL) if ((sint)wParam==VK_CONTROL)
_CtrlButton=true; _CtrlButton=true;
if ((int)wParam==VK_SHIFT) if ((sint)wParam==VK_SHIFT)
_ShiftButton=true; _ShiftButton=true;
// Post the message // Post the message