Fixed: Typos (renamed restaure to restore)

This commit is contained in:
kervala 2015-11-08 11:53:46 +01:00
parent b6decfd325
commit e1eea14dcb
19 changed files with 46 additions and 46 deletions

View file

@ -429,7 +429,7 @@ private:
void resetTouchFlags() {_InternalFlags &= (uint16)(~TouchedAll);} void resetTouchFlags() {_InternalFlags &= (uint16)(~TouchedAll);}
// Force non resident memory // Force non resident memory
void restaureNonResidentMemory(); void restoreNonResidentMemory();
// Convert current index to a serializable vector // Convert current index to a serializable vector
void buildSerialVector(std::vector<uint32> &dest) const; void buildSerialVector(std::vector<uint32> &dest) const;

View file

@ -653,7 +653,7 @@ private:
void resetTouchFlags() {_InternalFlags &= (uint16)(~TouchedAll);} void resetTouchFlags() {_InternalFlags &= (uint16)(~TouchedAll);}
// Force non resident memory // Force non resident memory
void restaureNonResidentMemory(); void restoreNonResidentMemory();
private: private:

View file

@ -178,7 +178,7 @@ void CCloud::generate (CNoise3d &noise)
_Driver->activeVertexBuffer (rVB); _Driver->activeVertexBuffer (rVB);
_Driver->renderRawQuads (_CloudTexClamp->ToClamp, 0, 1); _Driver->renderRawQuads (_CloudTexClamp->ToClamp, 0, 1);
// Restaure render target // Restore render target
_Driver->setRenderTarget (NULL); _Driver->setRenderTarget (NULL);
_CloudTexTmp->Tex->setFilterMode (ITexture::Nearest, ITexture::NearestMipMapOff); _CloudTexTmp->Tex->setFilterMode (ITexture::Nearest, ITexture::NearestMipMapOff);
@ -685,7 +685,7 @@ void CCloud::genBill (CCamera *pCam, uint32 nBillSize)
dispXYZ (&_CloudTexTmp->ToBill); dispXYZ (&_CloudTexTmp->ToBill);
// Restaure render target // Restore render target
_Driver->setRenderTarget (NULL); _Driver->setRenderTarget (NULL);
// This is the end of render to texture like so reset all stuff // This is the end of render to texture like so reset all stuff

View file

@ -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; 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); setupViewport (oldViewport);
return result; 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; 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); setupViewport (oldViewport);
// NVidia driver 56.72 needs to reset the vertex buffer after a clear Z // 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; 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); setupViewport (oldViewport);
return result; return result;
@ -2526,7 +2526,7 @@ bool CDriverD3D::reset (const GfxMode& mode)
_CurrentMaterial = NULL; _CurrentMaterial = NULL;
_CurrentMaterialInfo = NULL; _CurrentMaterialInfo = NULL;
// Restaure non managed vertex buffer in system memory // Restore non managed vertex buffer in system memory
ItVBDrvInfoPtrList iteVb = _VBDrvInfos.begin(); ItVBDrvInfoPtrList iteVb = _VBDrvInfos.begin();
while (iteVb != _VBDrvInfos.end()) while (iteVb != _VBDrvInfos.end())
{ {

View file

@ -49,7 +49,7 @@ uint indexCount=0;
CIBDrvInfosD3D::~CIBDrvInfosD3D() CIBDrvInfosD3D::~CIBDrvInfosD3D()
{ {
H_AUTO_D3D(CIBDrvInfosD3D_CIBDrvInfosD3DDtor); H_AUTO_D3D(CIBDrvInfosD3D_CIBDrvInfosD3DDtor);
// Restaure non resident memory // Restore non resident memory
if (IndexBufferPtr) if (IndexBufferPtr)
{ {
IndexBufferPtr->setLocation(CIndexBuffer::NotResident); IndexBufferPtr->setLocation(CIndexBuffer::NotResident);

View file

@ -818,7 +818,7 @@ bool CDriverD3D::setupMaterial(CMaterial &mat)
if (_CurrentMaterial != &mat) if (_CurrentMaterial != &mat)
{ {
// Material has changed ? // Material has changed ?
// Restaure fog state to its current value // Restore fog state to its current value
{ {
H_AUTO_D3D(CDriverD3D_setupMaterial_updateFog) H_AUTO_D3D(CDriverD3D_setupMaterial_updateFog)
setRenderState (D3DRS_FOGENABLE, _FogEnabled?TRUE:FALSE); setRenderState (D3DRS_FOGENABLE, _FogEnabled?TRUE:FALSE);

View file

@ -63,7 +63,7 @@ CVBDrvInfosD3D::~CVBDrvInfosD3D()
{ {
H_AUTO_D3D(CVBDrvInfosD3D_CVBDrvInfosD3D) H_AUTO_D3D(CVBDrvInfosD3D_CVBDrvInfosD3D)
CDriverD3D *driver = static_cast<CDriverD3D*>(_Driver); CDriverD3D *driver = static_cast<CDriverD3D*>(_Driver);
// Restaure non resident memory // Restore non resident memory
if (VertexBufferPtr) if (VertexBufferPtr)
{ {
VertexBufferPtr->setLocation(CVertexBuffer::NotResident); VertexBufferPtr->setLocation(CVertexBuffer::NotResident);

View file

@ -234,7 +234,7 @@ CDriverGL::CDriverGL()
_CursorScale = 1.f; _CursorScale = 1.f;
_MouseCaptured = false; _MouseCaptured = false;
_NeedToRestaureGammaRamp = false; _NeedToRestoreGammaRamp = false;
_win = EmptyWindow; _win = EmptyWindow;
_WindowX = 0; _WindowX = 0;

View file

@ -1558,7 +1558,7 @@ private:
// Monitor color parameters backup // Monitor color parameters backup
bool _NeedToRestaureGammaRamp; bool _NeedToRestoreGammaRamp;
uint16 _GammaRampBackuped[3*256]; uint16 _GammaRampBackuped[3*256];

View file

@ -532,7 +532,7 @@ bool CDriverGL::setupMaterial(CMaterial& mat)
} }
else else
{ {
// Restaure fog state to its current value // Restore fog state to its current value
_DriverGLStates.enableFog(_FogEnabled); _DriverGLStates.enableFog(_FogEnabled);
} }

View file

@ -71,7 +71,7 @@ CVBDrvInfosGL::CVBDrvInfosGL(CDriverGL *drv, ItVBDrvInfoPtrList it, CVertexBuffe
CVBDrvInfosGL::~CVBDrvInfosGL() CVBDrvInfosGL::~CVBDrvInfosGL()
{ {
H_AUTO_OGL(CVBDrvInfosGL_CVBDrvInfosGLDtor) H_AUTO_OGL(CVBDrvInfosGL_CVBDrvInfosGLDtor)
// Restaure non resident memory // Restore non resident memory
if (VertexBufferPtr) if (VertexBufferPtr)
{ {
VertexBufferPtr->setLocation(CVertexBuffer::NotResident); VertexBufferPtr->setLocation(CVertexBuffer::NotResident);

View file

@ -329,7 +329,7 @@ bool CDriverGL::init (uintptr_t windowIcon, emptyProc exitFunc)
HDC dc = CreateDC ("DISPLAY", NULL, NULL, NULL); HDC dc = CreateDC ("DISPLAY", NULL, NULL, NULL);
if (dc) if (dc)
{ {
_NeedToRestaureGammaRamp = GetDeviceGammaRamp (dc, _GammaRampBackuped) != FALSE; _NeedToRestoreGammaRamp = GetDeviceGammaRamp (dc, _GammaRampBackuped) != FALSE;
// Release the DC // Release the DC
ReleaseDC (NULL, dc); ReleaseDC (NULL, dc);
@ -465,8 +465,8 @@ bool CDriverGL::unInit()
} }
_Registered = 0; _Registered = 0;
// Restaure monitor color parameters // Restore monitor color parameters
if (_NeedToRestaureGammaRamp) if (_NeedToRestoreGammaRamp)
{ {
HDC dc = CreateDC ("DISPLAY", NULL, NULL, NULL); HDC dc = CreateDC ("DISPLAY", NULL, NULL, NULL);
if (dc) if (dc)

View file

@ -106,7 +106,7 @@ CIndexBuffer::~CIndexBuffer()
// Single value // Single value
if (DrvInfos) 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. // Must kill the drv mirror of this VB.
DrvInfos.kill(); DrvInfos.kill();
@ -144,7 +144,7 @@ void CIndexBuffer::setPreferredMemory (TPreferredMemory preferredMemory, bool ke
_KeepLocalMemory = keepLocalMemory; _KeepLocalMemory = keepLocalMemory;
// Force non resident // Force non resident
restaureNonResidentMemory(); restoreNonResidentMemory();
} }
} }
@ -159,7 +159,7 @@ void CIndexBuffer::reserve(uint32 n)
_NbIndexes=std::min (_NbIndexes,_Capacity); _NbIndexes=std::min (_NbIndexes,_Capacity);
// Force non resident // Force non resident
restaureNonResidentMemory(); restoreNonResidentMemory();
} }
} }
@ -206,7 +206,7 @@ void CIndexBuffer::deleteAllIndexes()
} }
// Force non resident // Force non resident
restaureNonResidentMemory(); restoreNonResidentMemory();
// Delete driver info // Delete driver info
nlassert (DrvInfos == NULL); nlassert (DrvInfos == NULL);
@ -276,12 +276,12 @@ void CIndexBuffer::setLocation (TLocation newLocation)
// *************************************************************************** // ***************************************************************************
void CIndexBuffer::restaureNonResidentMemory() void CIndexBuffer::restoreNonResidentMemory()
{ {
setLocation (NotResident); setLocation (NotResident);
if (DrvInfos) 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. // Must kill the drv mirror of this VB.
DrvInfos.kill(); DrvInfos.kill();
@ -407,7 +407,7 @@ void CIndexBuffer::serial(NLMISC::IStream &f)
if (f.isReading()) if (f.isReading())
{ {
// Force non resident // Force non resident
restaureNonResidentMemory(); restoreNonResidentMemory();
} }
} }

View file

@ -166,7 +166,7 @@ CVertexBuffer::~CVertexBuffer()
* ***********************************************/ * ***********************************************/
if (DrvInfos) 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. // Must kill the drv mirror of this VB.
DrvInfos.kill(); DrvInfos.kill();
@ -302,7 +302,7 @@ bool CVertexBuffer::setVertexFormat(uint32 flags)
initEx (); initEx ();
// Force non resident // Force non resident
restaureNonResidentMemory(); restoreNonResidentMemory();
return (true); return (true);
} }
@ -468,7 +468,7 @@ void CVertexBuffer::initEx ()
_Capacity = 0; _Capacity = 0;
// Force non resident // Force non resident
restaureNonResidentMemory(); restoreNonResidentMemory();
} }
// -------------------------------------------------- // --------------------------------------------------
@ -482,7 +482,7 @@ void CVertexBuffer::reserve(uint32 n)
_NbVerts=std::min (_NbVerts,_Capacity); _NbVerts=std::min (_NbVerts,_Capacity);
// Force non resident // Force non resident
restaureNonResidentMemory(); restoreNonResidentMemory();
} }
} }
@ -518,7 +518,7 @@ void CVertexBuffer::deleteAllVertices()
} }
// Force non resident // Force non resident
restaureNonResidentMemory(); restoreNonResidentMemory();
// Delete driver info // Delete driver info
nlassert (DrvInfos == NULL); nlassert (DrvInfos == NULL);
@ -725,7 +725,7 @@ void CVertexBuffer::serialOldV1Minus(NLMISC::IStream &f, sint ver)
if(f.isReading()) if(f.isReading())
{ {
// Force non resident // Force non resident
restaureNonResidentMemory(); restoreNonResidentMemory();
} }
} }
@ -979,7 +979,7 @@ void CVertexBuffer::serialSubset(NLMISC::IStream &f, uint vertexStart, uint ver
if(f.isReading()) if(f.isReading())
{ {
// Force non resident // Force non resident
restaureNonResidentMemory(); restoreNonResidentMemory();
} }
} }
@ -1029,7 +1029,7 @@ bool CVertexBuffer::setVertexColorFormat (TVertexColorType format)
_VertexColorFormat = (uint8)format; _VertexColorFormat = (uint8)format;
// Force non resident // Force non resident
restaureNonResidentMemory(); restoreNonResidentMemory();
} }
return true; return true;
} }
@ -1044,7 +1044,7 @@ void CVertexBuffer::setPreferredMemory (TPreferredMemory preferredMemory, bool k
_KeepLocalMemory = keepLocalMemory; _KeepLocalMemory = keepLocalMemory;
// Force non resident // Force non resident
restaureNonResidentMemory(); restoreNonResidentMemory();
} }
} }
@ -1110,12 +1110,12 @@ void CVertexBuffer::setLocation (TLocation newLocation)
} }
// -------------------------------------------------- // --------------------------------------------------
void CVertexBuffer::restaureNonResidentMemory() void CVertexBuffer::restoreNonResidentMemory()
{ {
setLocation (NotResident); setLocation (NotResident);
if (DrvInfos) 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. // Must kill the drv mirror of this VB.
DrvInfos.kill(); DrvInfos.kill();

View file

@ -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) // 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 // Setup full screen if we have to
UDriver::CMode mode; UDriver::CMode mode;
@ -342,7 +342,7 @@ bool connection (const string &cookie, const string &fsaddr)
// init the string manager cache. // init the string manager cache.
STRING_MANAGER::CStringManagerClient::instance()->initCache("", ClientCfg.LanguageCode); // VOIR BORIS STRING_MANAGER::CStringManagerClient::instance()->initCache("", ClientCfg.LanguageCode); // VOIR BORIS
#endif #endif
connectionRestaureVideoMode (); connectionRestoreVideoMode ();
return true; return true;
} }
@ -513,7 +513,7 @@ bool reconnection()
// init the string manager cache. // init the string manager cache.
STRING_MANAGER::CStringManagerClient::instance()->initCache("", ClientCfg.LanguageCode); // VOIR BORIS STRING_MANAGER::CStringManagerClient::instance()->initCache("", ClientCfg.LanguageCode); // VOIR BORIS
#endif #endif
connectionRestaureVideoMode (); connectionRestoreVideoMode ();
return true; return true;
} }
*/ */
@ -1266,10 +1266,10 @@ TInterfaceState globalMenu()
} }
// Restaure video mode // Restore video mode
if (ClientCfg.SelectCharacter == -1) if (ClientCfg.SelectCharacter == -1)
{ {
connectionRestaureVideoMode (); connectionRestoreVideoMode ();
} }
// Skip intro next time // Skip intro next time

View file

@ -539,7 +539,7 @@ void CInterface3DScene::draw ()
Driver->setViewport(oldVP); Driver->setViewport(oldVP);
Driver->setFrustum(oldFrustum); Driver->setFrustum(oldFrustum);
// Restaure render states // Restore render states
CViewRenderer::getInstance()->setRenderStates(); CViewRenderer::getInstance()->setRenderStates();
restoreClip (oldSciX, oldSciY, oldSciW, oldSciH); restoreClip (oldSciX, oldSciY, oldSciW, oldSciH);

View file

@ -291,11 +291,11 @@ public:
Driver->endDialogMode(); Driver->endDialogMode();
} }
// Restaure mouse // Restore mouse
InitMouseWithCursor (wasHardware); InitMouseWithCursor (wasHardware);
Driver->showCursor (wasHardware); Driver->showCursor (wasHardware);
// Restaure current path // Restore current path
CPath::setCurrentPath (currentPath.c_str()); CPath::setCurrentPath (currentPath.c_str());
#endif // NL_OS_WINDOWS #endif // NL_OS_WINDOWS
} }

View file

@ -93,7 +93,7 @@ void CUserControls::mountModeStart()
//----------------------------------------------- //-----------------------------------------------
void CUserControls::mountModeStop() void CUserControls::mountModeStop()
{ {
// Restaure la hauteur des yeux. // Restore eyes height.
UserEntity->eyesHeight(ClientCfg.EyesHeight); UserEntity->eyesHeight(ClientCfg.EyesHeight);
// \todo GUIGUI : remove this after the UBI Demo. // \todo GUIGUI : remove this after the UBI Demo.

View file

@ -755,7 +755,7 @@ bool CUserEntity::mode(MBEHAV::EMode m)
break; break;
// Leave DEATH Mode // Leave DEATH Mode
case MBEHAV::DEATH: case MBEHAV::DEATH:
// Restaure the last view. // Restore the last view.
viewMode(viewMode()); viewMode(viewMode());
break; break;
case MBEHAV::SWIM: case MBEHAV::SWIM: