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

Changed: #878 Fix typos in comments/code

Browse source
This commit is contained in:
kervala 2010-11-04 22:22:29 +01:00
parent 78984475bb
commit f9d13d61fc
6 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/include/nel/3d/driver.h
View file

@ -762,7 +762,6 @@ public:
* From this interface you can deal with mouse and keyboard as above, but you can also manage game device (joysticks, joypads ...) * From this interface you can deal with mouse and keyboard as above, but you can also manage game device (joysticks, joypads ...)
*/ */
virtual NLMISC::IInputDeviceManager *getLowLevelInputDeviceManager() = 0; virtual NLMISC::IInputDeviceManager *getLowLevelInputDeviceManager() = 0;
// @} // @}
/// Get the width and the height of the window /// Get the width and the height of the window

1
code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
View file

@ -2722,6 +2722,7 @@ bool CDriverD3D::fillPresentParameter (D3DPRESENT_PARAMETERS &parameters, D3DFOR
D3DFMT_D24FS8, D3DFMT_D24FS8,
//D3DFMT_D16, //D3DFMT_D16,
}; };
const uint zbufferFormatCount = sizeof(zbufferFormats)/sizeof(D3DFORMAT); const uint zbufferFormatCount = sizeof(zbufferFormats)/sizeof(D3DFORMAT);
uint i; uint i;
for (i=0; i<zbufferFormatCount; i++) for (i=0; i<zbufferFormatCount; i++)

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

@ -417,7 +417,7 @@ void CDriverGL::setSystemArrow()
#endif #endif
} }
// -------------------------------------------------- // ***************************************************************************
void CDriverGL::showCursor(bool b) void CDriverGL::showCursor(bool b)
{ {
H_AUTO_OGL(CDriverGL_showCursor); H_AUTO_OGL(CDriverGL_showCursor);
@ -484,7 +484,7 @@ void CDriverGL::showCursor(bool b)
#endif // NL_OS_UNIX #endif // NL_OS_UNIX
} }
// -------------------------------------------------- // ***************************************************************************
void CDriverGL::setMousePos(float x, float y) void CDriverGL::setMousePos(float x, float y)
{ {
H_AUTO_OGL(CDriverGL_setMousePos) H_AUTO_OGL(CDriverGL_setMousePos)
@ -538,9 +538,10 @@ void CDriverGL::setMousePos(float x, float y)
#endif // NL_OS_UNIX #endif // NL_OS_UNIX
} }
// ***************************************************************************
void CDriverGL::setCapture (bool b) void CDriverGL::setCapture (bool b)
{ {
H_AUTO_OGL(CDriverGL_setCapture ) H_AUTO_OGL(CDriverGL_setCapture);
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
@ -583,6 +584,7 @@ void CDriverGL::setCapture (bool b)
#endif // NL_OS_UNIX #endif // NL_OS_UNIX
} }
// ***************************************************************************
bool CDriverGL::isSystemCursorInClientArea() bool CDriverGL::isSystemCursorInClientArea()
{ {
if (_FullScreen /* || !IsMouseCursorHardware() */) if (_FullScreen /* || !IsMouseCursorHardware() */)

2
code/ryzom/client/src/interface_v3/action_handler_misc.cpp
View file

@ -621,8 +621,6 @@ void screenShotPNG()
COFile fs(filename); COFile fs(filename);
if (!btm.writePNG(fs, 24)) if (!btm.writePNG(fs, 24))
{ {
// PNG file has been incorrectly written (mainly because libpng1x.dll was not found)
// so close and delete it
fs.close(); fs.close();
CFile::deleteFile(filename); CFile::deleteFile(filename);
return; return;

2
code/ryzom/client/src/interface_v3/input_handler_manager.cpp
View file

@ -152,7 +152,7 @@ void CInputHandlerManager::operator ()(const NLMISC::CEvent &event)
CEventSetFocus *pEvent=(CEventSetFocus *)&event; CEventSetFocus *pEvent=(CEventSetFocus *)&event;
if (!pEvent->Get) if (!pEvent->Get)
{ {
// Disactive all keys // Deactivate all keys
_MouseButtonsDown = noButton; _MouseButtonsDown = noButton;
_MouseButtonsReleased = noButton; _MouseButtonsReleased = noButton;
_MouseButtonsState = noButton; _MouseButtonsState = noButton;

4
code/ryzom/client/src/r2/dmc/client_edition_module.cpp
View file

@ -1384,7 +1384,6 @@ bool CClientEditionModule::loadUserComponent(const std::string& filename, bool m
uint32 timeStamp = 0; uint32 timeStamp = 0;
if (! compressed) if (! compressed)
{ {
FILE* file = fopen(filename.c_str(),"rb"); FILE* file = fopen(filename.c_str(),"rb");
if (!file) if (!file)
{ {
@ -1488,9 +1487,6 @@ bool CClientEditionModule::loadUserComponent(const std::string& filename, bool m
uncompressedFile = new uint8[ data.size() ]; uncompressedFile = new uint8[ data.size() ];
memcpy(uncompressedFile, data.c_str(), data.size()); memcpy(uncompressedFile, data.c_str(), data.size());
uncompressedFileLength = (uint32)data.size(); uncompressedFileLength = (uint32)data.size();
} }
else else
{ {