actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crashes due to there being two RageModelVertexArraySW classes

Browse Source
This commit is contained in:
Glenn Maynard
2004-04-09 04:28:37 +00:00
parent a0efc346bd
commit e540237288
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_D3D.cpp
+4 -4
View File
@@ -734,10 +734,10 @@ RageDisplay::VideoModeParams RageDisplay_D3D::GetVideoModeParams() const { retur
g_pd3dDevice->SetTransform( D3DTS_WORLD, (D3DMATRIX*)&m ); g_pd3dDevice->SetTransform( D3DTS_WORLD, (D3DMATRIX*)&m );
class RageModelVertexArraySW : public RageModelVertexArray class RageModelVertexArraySWD3D : public RageModelVertexArray
{ {
public: public:
RageModelVertexArraySW() RageModelVertexArraySWD3D()
{ {
m_sizeVerts = 0; m_sizeVerts = 0;
m_sizeTriangles = 0; m_sizeTriangles = 0;
@@ -745,7 +745,7 @@ public:
m_pTriangles = NULL; m_pTriangles = NULL;
} }
~RageModelVertexArraySW() ~RageModelVertexArraySWD3D()
{ {
m_sizeVerts = 0; m_sizeVerts = 0;
m_sizeTriangles = 0; m_sizeTriangles = 0;
@@ -814,7 +814,7 @@ protected:
RageModelVertexArray* RageDisplay_D3D::CreateRageModelVertexArray() RageModelVertexArray* RageDisplay_D3D::CreateRageModelVertexArray()
{ {
return new RageModelVertexArraySW; return new RageModelVertexArraySWD3D;
} }
void RageDisplay_D3D::DeleteRageModelVertexArray( RageModelVertexArray* p ) void RageDisplay_D3D::DeleteRageModelVertexArray( RageModelVertexArray* p )
stepmania/src/RageDisplay_OGL.cpp
+4 -4
View File
@@ -894,10 +894,10 @@ void RageDisplay_OGL::SendCurrentMatrices()
glLoadMatrixf( (const float*)&modelView ); glLoadMatrixf( (const float*)&modelView );
} }
class RageModelVertexArraySW : public RageModelVertexArray class RageModelVertexArraySWOGL : public RageModelVertexArray
{ {
public: public:
RageModelVertexArraySW() RageModelVertexArraySWOGL()
{ {
m_sizeVerts = 0; m_sizeVerts = 0;
m_sizeTriangles = 0; m_sizeTriangles = 0;
@@ -908,7 +908,7 @@ public:
m_pTriangles = NULL; m_pTriangles = NULL;
} }
~RageModelVertexArraySW() ~RageModelVertexArraySWOGL()
{ {
m_sizeVerts = 0; m_sizeVerts = 0;
m_sizeTriangles = 0; m_sizeTriangles = 0;
@@ -982,7 +982,7 @@ protected:
RageModelVertexArray* RageDisplay_OGL::CreateRageModelVertexArray() RageModelVertexArray* RageDisplay_OGL::CreateRageModelVertexArray()
{ {
return new RageModelVertexArraySW; return new RageModelVertexArraySWOGL;
} }
void RageDisplay_OGL::DeleteRageModelVertexArray( RageModelVertexArray* p ) void RageDisplay_OGL::DeleteRageModelVertexArray( RageModelVertexArray* p )