From f9d13d61fcad9bae12a2bb06053e4d07f4dea4cd Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Thu, 4 Nov 2010 22:22:29 +0100
Subject: [PATCH] Changed: #878 Fix typos in comments/code

---
 code/nel/include/nel/3d/driver.h                          | 1 -
 code/nel/src/3d/driver/direct3d/driver_direct3d.cpp       | 1 +
 code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp    | 8 +++++---
 .../ryzom/client/src/interface_v3/action_handler_misc.cpp | 2 --
 .../client/src/interface_v3/input_handler_manager.cpp     | 2 +-
 code/ryzom/client/src/r2/dmc/client_edition_module.cpp    | 4 ----
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/code/nel/include/nel/3d/driver.h b/code/nel/include/nel/3d/driver.h
index 40367e8ad..aced27f92 100644
--- a/code/nel/include/nel/3d/driver.h
+++ b/code/nel/include/nel/3d/driver.h
@@ -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 ...)
 		  */
 		virtual NLMISC::IInputDeviceManager		*getLowLevelInputDeviceManager() = 0;
-
 	// @}
 
 	/// Get the width and the height of the window
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
index 098e7d1df..5a9aa051b 100644
--- a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
+++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
@@ -2722,6 +2722,7 @@ bool CDriverD3D::fillPresentParameter (D3DPRESENT_PARAMETERS &parameters, D3DFOR
 		D3DFMT_D24FS8,
 		//D3DFMT_D16,
 	};
+
 	const uint zbufferFormatCount = sizeof(zbufferFormats)/sizeof(D3DFORMAT);
 	uint i;
 	for (i=0; i<zbufferFormatCount; i++)
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp
index 7dd9363d1..806391d07 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp
@@ -417,7 +417,7 @@ void CDriverGL::setSystemArrow()
 #endif
 }
 
-// --------------------------------------------------
+// ***************************************************************************
 void CDriverGL::showCursor(bool b)
 {
 	H_AUTO_OGL(CDriverGL_showCursor);
@@ -484,7 +484,7 @@ void CDriverGL::showCursor(bool b)
 #endif // NL_OS_UNIX
 }
 
-// --------------------------------------------------
+// ***************************************************************************
 void CDriverGL::setMousePos(float x, float y)
 {
 	H_AUTO_OGL(CDriverGL_setMousePos)
@@ -538,9 +538,10 @@ void CDriverGL::setMousePos(float x, float y)
 #endif // NL_OS_UNIX
 }
 
+// ***************************************************************************
 void CDriverGL::setCapture (bool b)
 {
-	H_AUTO_OGL(CDriverGL_setCapture )
+	H_AUTO_OGL(CDriverGL_setCapture);
 
 #ifdef NL_OS_WINDOWS
 
@@ -583,6 +584,7 @@ void CDriverGL::setCapture (bool b)
 #endif // NL_OS_UNIX
 }
 
+// ***************************************************************************
 bool CDriverGL::isSystemCursorInClientArea()
 {
 	if (_FullScreen /* || !IsMouseCursorHardware() */)
diff --git a/code/ryzom/client/src/interface_v3/action_handler_misc.cpp b/code/ryzom/client/src/interface_v3/action_handler_misc.cpp
index 565165987..4c7f2ee28 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_misc.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_misc.cpp
@@ -621,8 +621,6 @@ void screenShotPNG()
 	COFile fs(filename);
 	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();
 		CFile::deleteFile(filename);
 		return;
diff --git a/code/ryzom/client/src/interface_v3/input_handler_manager.cpp b/code/ryzom/client/src/interface_v3/input_handler_manager.cpp
index ef235ce60..023bc2246 100644
--- a/code/ryzom/client/src/interface_v3/input_handler_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/input_handler_manager.cpp
@@ -152,7 +152,7 @@ void CInputHandlerManager::operator ()(const NLMISC::CEvent &event)
 		CEventSetFocus *pEvent=(CEventSetFocus *)&event;
 		if (!pEvent->Get)
 		{
-			// Disactive all keys
+			// Deactivate all keys
 			_MouseButtonsDown = noButton;
 			_MouseButtonsReleased = noButton;
 			_MouseButtonsState = noButton;
diff --git a/code/ryzom/client/src/r2/dmc/client_edition_module.cpp b/code/ryzom/client/src/r2/dmc/client_edition_module.cpp
index 4d10f45a4..b9f2aee4c 100644
--- a/code/ryzom/client/src/r2/dmc/client_edition_module.cpp
+++ b/code/ryzom/client/src/r2/dmc/client_edition_module.cpp
@@ -1384,7 +1384,6 @@ bool CClientEditionModule::loadUserComponent(const std::string& filename, bool m
 	uint32 timeStamp = 0;
 	if (! compressed)
 	{
-
 		FILE* file = fopen(filename.c_str(),"rb");
 		if (!file)
 		{
@@ -1488,9 +1487,6 @@ bool CClientEditionModule::loadUserComponent(const std::string& filename, bool m
 		uncompressedFile = new uint8[ data.size() ];
 		memcpy(uncompressedFile, data.c_str(), data.size());
 		uncompressedFileLength = (uint32)data.size();
-
-
-
 	}
 	else
 	{