From 3fa369e73c2f8626ccf2ba9f447e1863d1218b9f Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 8 Nov 2015 11:53:46 +0100 Subject: [PATCH] Fixed: Typos (renamed restaure to restore) --- code/nel/include/nel/3d/index_buffer.h | 2 +- code/nel/include/nel/3d/vertex_buffer.h | 2 +- code/nel/src/3d/cloud.cpp | 4 ++-- .../3d/driver/direct3d/driver_direct3d.cpp | 8 +++---- .../driver/direct3d/driver_direct3d_index.cpp | 2 +- .../direct3d/driver_direct3d_material.cpp | 2 +- .../direct3d/driver_direct3d_vertex.cpp | 2 +- .../src/3d/driver/opengl/driver_opengl.cpp | 2 +- code/nel/src/3d/driver/opengl/driver_opengl.h | 2 +- .../driver/opengl/driver_opengl_material.cpp | 2 +- .../3d/driver/opengl/driver_opengl_vertex.cpp | 2 +- .../3d/driver/opengl/driver_opengl_window.cpp | 6 ++--- code/nel/src/3d/index_buffer.cpp | 14 ++++++------ code/nel/src/3d/vertex_buffer.cpp | 22 +++++++++---------- code/ryzom/client/src/connection.cpp | 10 ++++----- .../src/interface_v3/interface_3d_scene.cpp | 2 +- .../client/src/interface_v3/music_player.cpp | 4 ++-- .../client/src/motion/modes/mount_mode.cpp | 2 +- code/ryzom/client/src/user_entity.cpp | 2 +- 19 files changed, 46 insertions(+), 46 deletions(-) diff --git a/code/nel/include/nel/3d/index_buffer.h b/code/nel/include/nel/3d/index_buffer.h index d5872f5e9..3d9c289ee 100644 --- a/code/nel/include/nel/3d/index_buffer.h +++ b/code/nel/include/nel/3d/index_buffer.h @@ -429,7 +429,7 @@ private: void resetTouchFlags() {_InternalFlags &= (uint16)(~TouchedAll);} // Force non resident memory - void restaureNonResidentMemory(); + void restoreNonResidentMemory(); // Convert current index to a serializable vector void buildSerialVector(std::vector &dest) const; diff --git a/code/nel/include/nel/3d/vertex_buffer.h b/code/nel/include/nel/3d/vertex_buffer.h index 6c269ec6c..1f1c789ae 100644 --- a/code/nel/include/nel/3d/vertex_buffer.h +++ b/code/nel/include/nel/3d/vertex_buffer.h @@ -653,7 +653,7 @@ private: void resetTouchFlags() {_InternalFlags &= (uint16)(~TouchedAll);} // Force non resident memory - void restaureNonResidentMemory(); + void restoreNonResidentMemory(); private: diff --git a/code/nel/src/3d/cloud.cpp b/code/nel/src/3d/cloud.cpp index 2606f9ad5..eb53589ce 100644 --- a/code/nel/src/3d/cloud.cpp +++ b/code/nel/src/3d/cloud.cpp @@ -178,7 +178,7 @@ void CCloud::generate (CNoise3d &noise) _Driver->activeVertexBuffer (rVB); _Driver->renderRawQuads (_CloudTexClamp->ToClamp, 0, 1); - // Restaure render target + // Restore render target _Driver->setRenderTarget (NULL); _CloudTexTmp->Tex->setFilterMode (ITexture::Nearest, ITexture::NearestMipMapOff); @@ -685,7 +685,7 @@ void CCloud::genBill (CCamera *pCam, uint32 nBillSize) dispXYZ (&_CloudTexTmp->ToBill); - // Restaure render target + // Restore render target _Driver->setRenderTarget (NULL); // This is the end of render to texture like so reset all stuff diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp index 8a7be80d2..5ffaceda6 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp @@ -1912,7 +1912,7 @@ bool CDriverD3D::clear2D(CRGBA rgba) bool result = _DeviceInterface->Clear( 0, NULL, D3DCLEAR_TARGET, NL_D3DCOLOR_RGBA(rgba), 1.0f, 0 ) == D3D_OK; - // Restaure the old viewport + // Restore the old viewport setupViewport (oldViewport); return result; } @@ -1931,7 +1931,7 @@ bool CDriverD3D::clearZBuffer(float zval) bool result = _DeviceInterface->Clear( 0, NULL, D3DCLEAR_ZBUFFER, D3DCOLOR_ARGB(0,0,0,0), zval, 0 ) == D3D_OK; - // Restaure the old viewport + // Restore the old viewport setupViewport (oldViewport); // NVidia driver 56.72 needs to reset the vertex buffer after a clear Z @@ -1954,7 +1954,7 @@ bool CDriverD3D::clearStencilBuffer(float stencilval) bool result = _DeviceInterface->Clear( 0, NULL, D3DCLEAR_STENCIL, D3DCOLOR_ARGB(0,0,0,0), 1.0f, (unsigned long)stencilval ) == D3D_OK; - // Restaure the old viewport + // Restore the old viewport setupViewport (oldViewport); return result; @@ -2526,7 +2526,7 @@ bool CDriverD3D::reset (const GfxMode& mode) _CurrentMaterial = NULL; _CurrentMaterialInfo = NULL; - // Restaure non managed vertex buffer in system memory + // Restore non managed vertex buffer in system memory ItVBDrvInfoPtrList iteVb = _VBDrvInfos.begin(); while (iteVb != _VBDrvInfos.end()) { diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_index.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d_index.cpp index b75a21d9d..dfdc48670 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d_index.cpp +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d_index.cpp @@ -49,7 +49,7 @@ uint indexCount=0; CIBDrvInfosD3D::~CIBDrvInfosD3D() { H_AUTO_D3D(CIBDrvInfosD3D_CIBDrvInfosD3DDtor); - // Restaure non resident memory + // Restore non resident memory if (IndexBufferPtr) { IndexBufferPtr->setLocation(CIndexBuffer::NotResident); diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp index f22cba111..1e8878fb9 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp @@ -818,7 +818,7 @@ bool CDriverD3D::setupMaterial(CMaterial &mat) if (_CurrentMaterial != &mat) { // Material has changed ? - // Restaure fog state to its current value + // Restore fog state to its current value { H_AUTO_D3D(CDriverD3D_setupMaterial_updateFog) setRenderState (D3DRS_FOGENABLE, _FogEnabled?TRUE:FALSE); diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_vertex.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d_vertex.cpp index d37c272a2..ad5bb04b9 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d_vertex.cpp +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d_vertex.cpp @@ -63,7 +63,7 @@ CVBDrvInfosD3D::~CVBDrvInfosD3D() { H_AUTO_D3D(CVBDrvInfosD3D_CVBDrvInfosD3D) CDriverD3D *driver = static_cast(_Driver); - // Restaure non resident memory + // Restore non resident memory if (VertexBufferPtr) { VertexBufferPtr->setLocation(CVertexBuffer::NotResident); diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.cpp b/code/nel/src/3d/driver/opengl/driver_opengl.cpp index 35cf9c094..3539948ac 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl.cpp @@ -234,7 +234,7 @@ CDriverGL::CDriverGL() _CursorScale = 1.f; _MouseCaptured = false; - _NeedToRestaureGammaRamp = false; + _NeedToRestoreGammaRamp = false; _win = EmptyWindow; _WindowX = 0; diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.h b/code/nel/src/3d/driver/opengl/driver_opengl.h index c4540b9da..1a7ca6825 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl.h +++ b/code/nel/src/3d/driver/opengl/driver_opengl.h @@ -1558,7 +1558,7 @@ private: // Monitor color parameters backup - bool _NeedToRestaureGammaRamp; + bool _NeedToRestoreGammaRamp; uint16 _GammaRampBackuped[3*256]; diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp index 95c8e61f2..e5375a49c 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp @@ -532,7 +532,7 @@ bool CDriverGL::setupMaterial(CMaterial& mat) } else { - // Restaure fog state to its current value + // Restore fog state to its current value _DriverGLStates.enableFog(_FogEnabled); } diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp index cab62f094..39f71d77a 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp @@ -71,7 +71,7 @@ CVBDrvInfosGL::CVBDrvInfosGL(CDriverGL *drv, ItVBDrvInfoPtrList it, CVertexBuffe CVBDrvInfosGL::~CVBDrvInfosGL() { H_AUTO_OGL(CVBDrvInfosGL_CVBDrvInfosGLDtor) - // Restaure non resident memory + // Restore non resident memory if (VertexBufferPtr) { VertexBufferPtr->setLocation(CVertexBuffer::NotResident); diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp index 55e94bb4f..c76f2943b 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp @@ -329,7 +329,7 @@ bool CDriverGL::init (uintptr_t windowIcon, emptyProc exitFunc) HDC dc = CreateDC ("DISPLAY", NULL, NULL, NULL); if (dc) { - _NeedToRestaureGammaRamp = GetDeviceGammaRamp (dc, _GammaRampBackuped) != FALSE; + _NeedToRestoreGammaRamp = GetDeviceGammaRamp (dc, _GammaRampBackuped) != FALSE; // Release the DC ReleaseDC (NULL, dc); @@ -465,8 +465,8 @@ bool CDriverGL::unInit() } _Registered = 0; - // Restaure monitor color parameters - if (_NeedToRestaureGammaRamp) + // Restore monitor color parameters + if (_NeedToRestoreGammaRamp) { HDC dc = CreateDC ("DISPLAY", NULL, NULL, NULL); if (dc) diff --git a/code/nel/src/3d/index_buffer.cpp b/code/nel/src/3d/index_buffer.cpp index b9e1356dc..7bb2e1cd5 100644 --- a/code/nel/src/3d/index_buffer.cpp +++ b/code/nel/src/3d/index_buffer.cpp @@ -106,7 +106,7 @@ CIndexBuffer::~CIndexBuffer() // Single value if (DrvInfos) - DrvInfos->IndexBufferPtr = NULL; // Tell the driver info to not restaure memory when it will die + DrvInfos->IndexBufferPtr = NULL; // Tell the driver info to not restore memory when it will die // Must kill the drv mirror of this VB. DrvInfos.kill(); @@ -144,7 +144,7 @@ void CIndexBuffer::setPreferredMemory (TPreferredMemory preferredMemory, bool ke _KeepLocalMemory = keepLocalMemory; // Force non resident - restaureNonResidentMemory(); + restoreNonResidentMemory(); } } @@ -159,7 +159,7 @@ void CIndexBuffer::reserve(uint32 n) _NbIndexes=std::min (_NbIndexes,_Capacity); // Force non resident - restaureNonResidentMemory(); + restoreNonResidentMemory(); } } @@ -206,7 +206,7 @@ void CIndexBuffer::deleteAllIndexes() } // Force non resident - restaureNonResidentMemory(); + restoreNonResidentMemory(); // Delete driver info nlassert (DrvInfos == NULL); @@ -276,12 +276,12 @@ void CIndexBuffer::setLocation (TLocation newLocation) // *************************************************************************** -void CIndexBuffer::restaureNonResidentMemory() +void CIndexBuffer::restoreNonResidentMemory() { setLocation (NotResident); if (DrvInfos) - DrvInfos->IndexBufferPtr = NULL; // Tell the driver info to not restaure memory when it will die + DrvInfos->IndexBufferPtr = NULL; // Tell the driver info to not restore memory when it will die // Must kill the drv mirror of this VB. DrvInfos.kill(); @@ -407,7 +407,7 @@ void CIndexBuffer::serial(NLMISC::IStream &f) if (f.isReading()) { // Force non resident - restaureNonResidentMemory(); + restoreNonResidentMemory(); } } diff --git a/code/nel/src/3d/vertex_buffer.cpp b/code/nel/src/3d/vertex_buffer.cpp index ea3ec5100..fc09dc956 100644 --- a/code/nel/src/3d/vertex_buffer.cpp +++ b/code/nel/src/3d/vertex_buffer.cpp @@ -166,7 +166,7 @@ CVertexBuffer::~CVertexBuffer() * ***********************************************/ if (DrvInfos) - DrvInfos->VertexBufferPtr = NULL; // Tell the driver info to not restaure memory when it will die + DrvInfos->VertexBufferPtr = NULL; // Tell the driver info to not restore memory when it will die // Must kill the drv mirror of this VB. DrvInfos.kill(); @@ -302,7 +302,7 @@ bool CVertexBuffer::setVertexFormat(uint32 flags) initEx (); // Force non resident - restaureNonResidentMemory(); + restoreNonResidentMemory(); return (true); } @@ -468,7 +468,7 @@ void CVertexBuffer::initEx () _Capacity = 0; // Force non resident - restaureNonResidentMemory(); + restoreNonResidentMemory(); } // -------------------------------------------------- @@ -482,7 +482,7 @@ void CVertexBuffer::reserve(uint32 n) _NbVerts=std::min (_NbVerts,_Capacity); // Force non resident - restaureNonResidentMemory(); + restoreNonResidentMemory(); } } @@ -518,7 +518,7 @@ void CVertexBuffer::deleteAllVertices() } // Force non resident - restaureNonResidentMemory(); + restoreNonResidentMemory(); // Delete driver info nlassert (DrvInfos == NULL); @@ -725,7 +725,7 @@ void CVertexBuffer::serialOldV1Minus(NLMISC::IStream &f, sint ver) if(f.isReading()) { // Force non resident - restaureNonResidentMemory(); + restoreNonResidentMemory(); } } @@ -979,7 +979,7 @@ void CVertexBuffer::serialSubset(NLMISC::IStream &f, uint vertexStart, uint ver if(f.isReading()) { // Force non resident - restaureNonResidentMemory(); + restoreNonResidentMemory(); } } @@ -1029,7 +1029,7 @@ bool CVertexBuffer::setVertexColorFormat (TVertexColorType format) _VertexColorFormat = (uint8)format; // Force non resident - restaureNonResidentMemory(); + restoreNonResidentMemory(); } return true; } @@ -1044,7 +1044,7 @@ void CVertexBuffer::setPreferredMemory (TPreferredMemory preferredMemory, bool k _KeepLocalMemory = keepLocalMemory; // Force non resident - restaureNonResidentMemory(); + restoreNonResidentMemory(); } } @@ -1110,12 +1110,12 @@ void CVertexBuffer::setLocation (TLocation newLocation) } // -------------------------------------------------- -void CVertexBuffer::restaureNonResidentMemory() +void CVertexBuffer::restoreNonResidentMemory() { setLocation (NotResident); if (DrvInfos) - DrvInfos->VertexBufferPtr = NULL; // Tell the driver info to not restaure memory when it will die + DrvInfos->VertexBufferPtr = NULL; // Tell the driver info to not restore memory when it will die // Must kill the drv mirror of this VB. DrvInfos.kill(); diff --git a/code/ryzom/client/src/connection.cpp b/code/ryzom/client/src/connection.cpp index 3f3a3d809..6c24bcd8d 100644 --- a/code/ryzom/client/src/connection.cpp +++ b/code/ryzom/client/src/connection.cpp @@ -187,7 +187,7 @@ bool hasPrivilegeEG() { return (UserPrivileges.find(":EG:") != std::string::npos // Restore the video mode (fullscreen for example) after the connection (done in a window) -void connectionRestaureVideoMode () +void connectionRestoreVideoMode () { // Setup full screen if we have to UDriver::CMode mode; @@ -342,7 +342,7 @@ bool connection (const string &cookie, const string &fsaddr) // init the string manager cache. STRING_MANAGER::CStringManagerClient::instance()->initCache("", ClientCfg.LanguageCode); // VOIR BORIS #endif - connectionRestaureVideoMode (); + connectionRestoreVideoMode (); return true; } @@ -513,7 +513,7 @@ bool reconnection() // init the string manager cache. STRING_MANAGER::CStringManagerClient::instance()->initCache("", ClientCfg.LanguageCode); // VOIR BORIS #endif - connectionRestaureVideoMode (); + connectionRestoreVideoMode (); return true; } */ @@ -1266,10 +1266,10 @@ TInterfaceState globalMenu() } - // Restaure video mode + // Restore video mode if (ClientCfg.SelectCharacter == -1) { - connectionRestaureVideoMode (); + connectionRestoreVideoMode (); } // Skip intro next time diff --git a/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp b/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp index 6acc2a17b..f17270143 100644 --- a/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp +++ b/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp @@ -539,7 +539,7 @@ void CInterface3DScene::draw () Driver->setViewport(oldVP); Driver->setFrustum(oldFrustum); - // Restaure render states + // Restore render states CViewRenderer::getInstance()->setRenderStates(); restoreClip (oldSciX, oldSciY, oldSciW, oldSciH); diff --git a/code/ryzom/client/src/interface_v3/music_player.cpp b/code/ryzom/client/src/interface_v3/music_player.cpp index cfa23540f..c53dad13c 100644 --- a/code/ryzom/client/src/interface_v3/music_player.cpp +++ b/code/ryzom/client/src/interface_v3/music_player.cpp @@ -291,11 +291,11 @@ public: Driver->endDialogMode(); } - // Restaure mouse + // Restore mouse InitMouseWithCursor (wasHardware); Driver->showCursor (wasHardware); - // Restaure current path + // Restore current path CPath::setCurrentPath (currentPath.c_str()); #endif // NL_OS_WINDOWS } diff --git a/code/ryzom/client/src/motion/modes/mount_mode.cpp b/code/ryzom/client/src/motion/modes/mount_mode.cpp index d2c808fe2..f52d5c9ba 100644 --- a/code/ryzom/client/src/motion/modes/mount_mode.cpp +++ b/code/ryzom/client/src/motion/modes/mount_mode.cpp @@ -93,7 +93,7 @@ void CUserControls::mountModeStart() //----------------------------------------------- void CUserControls::mountModeStop() { - // Restaure la hauteur des yeux. + // Restore eyes height. UserEntity->eyesHeight(ClientCfg.EyesHeight); // \todo GUIGUI : remove this after the UBI Demo. diff --git a/code/ryzom/client/src/user_entity.cpp b/code/ryzom/client/src/user_entity.cpp index 62d45f330..dcf0ccf41 100644 --- a/code/ryzom/client/src/user_entity.cpp +++ b/code/ryzom/client/src/user_entity.cpp @@ -755,7 +755,7 @@ bool CUserEntity::mode(MBEHAV::EMode m) break; // Leave DEATH Mode case MBEHAV::DEATH: - // Restaure the last view. + // Restore the last view. viewMode(viewMode()); break; case MBEHAV::SWIM: