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

Fixed: Typos (renamed restaure to restore)

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2015-11-08 11:53:46 +01:00
parent 25febfa3bc
commit 3ac728872e
19 changed files with 46 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/3d/index_buffer.h
View file

@ -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<uint32> &dest) const;

2
code/nel/include/nel/3d/vertex_buffer.h
View file

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

4
code/nel/src/3d/cloud.cpp
View file

@ -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

8
code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
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;
// 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())
{

2
code/nel/src/3d/driver/direct3d/driver_direct3d_index.cpp
View file

@ -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);

2
code/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp
View file

@ -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);

2
code/nel/src/3d/driver/direct3d/driver_direct3d_vertex.cpp
View file

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

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

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

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

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

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

@ -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);
}

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

@ -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);

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

@ -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)

14
code/nel/src/3d/index_buffer.cpp
View file

@ -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();
}
}

22
code/nel/src/3d/vertex_buffer.cpp
View file

@ -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();

10
code/ryzom/client/src/connection.cpp
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)
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

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

@ -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);

4
code/ryzom/client/src/interface_v3/music_player.cpp
View file

@ -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
}

2
code/ryzom/client/src/motion/modes/mount_mode.cpp
View file

@ -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.

2
code/ryzom/client/src/user_entity.cpp
View file

@ -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: