From e540237288f8918b482f9437e3ee10fb605c7d33 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 9 Apr 2004 04:28:37 +0000 Subject: [PATCH] fix crashes due to there being two RageModelVertexArraySW classes --- stepmania/src/RageDisplay_D3D.cpp | 8 ++++---- stepmania/src/RageDisplay_OGL.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp index 5d36c8523a..bfdb3bccda 100644 --- a/stepmania/src/RageDisplay_D3D.cpp +++ b/stepmania/src/RageDisplay_D3D.cpp @@ -734,10 +734,10 @@ RageDisplay::VideoModeParams RageDisplay_D3D::GetVideoModeParams() const { retur g_pd3dDevice->SetTransform( D3DTS_WORLD, (D3DMATRIX*)&m ); -class RageModelVertexArraySW : public RageModelVertexArray +class RageModelVertexArraySWD3D : public RageModelVertexArray { public: - RageModelVertexArraySW() + RageModelVertexArraySWD3D() { m_sizeVerts = 0; m_sizeTriangles = 0; @@ -745,7 +745,7 @@ public: m_pTriangles = NULL; } - ~RageModelVertexArraySW() + ~RageModelVertexArraySWD3D() { m_sizeVerts = 0; m_sizeTriangles = 0; @@ -814,7 +814,7 @@ protected: RageModelVertexArray* RageDisplay_D3D::CreateRageModelVertexArray() { - return new RageModelVertexArraySW; + return new RageModelVertexArraySWD3D; } void RageDisplay_D3D::DeleteRageModelVertexArray( RageModelVertexArray* p ) diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index 0fb7553798..e8c29f35fa 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -894,10 +894,10 @@ void RageDisplay_OGL::SendCurrentMatrices() glLoadMatrixf( (const float*)&modelView ); } -class RageModelVertexArraySW : public RageModelVertexArray +class RageModelVertexArraySWOGL : public RageModelVertexArray { public: - RageModelVertexArraySW() + RageModelVertexArraySWOGL() { m_sizeVerts = 0; m_sizeTriangles = 0; @@ -908,7 +908,7 @@ public: m_pTriangles = NULL; } - ~RageModelVertexArraySW() + ~RageModelVertexArraySWOGL() { m_sizeVerts = 0; m_sizeTriangles = 0; @@ -982,7 +982,7 @@ protected: RageModelVertexArray* RageDisplay_OGL::CreateRageModelVertexArray() { - return new RageModelVertexArraySW; + return new RageModelVertexArraySWOGL; } void RageDisplay_OGL::DeleteRageModelVertexArray( RageModelVertexArray* p )