fixed possible crash

SushiTee · Aug 1, 2011 · c8c2211 · c8c2211
1 parent fe4bdf3
commit c8c2211
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/game/collision.cpp b/src/game/collision.cpp
@@ -24,6 +24,10 @@ CCollision::CCollision()
 
 void CCollision::Init(class CLayers *pLayers)
 {
+	// reset race specific pointers
+	m_pTele = 0;
+	m_pSpeedup = 0;
+
 	m_pLayers = pLayers;
 	m_Width = m_pLayers->GameLayer()->m_Width;
 	m_Height = m_pLayers->GameLayer()->m_Height;

diff --git a/src/game/layers.cpp b/src/game/layers.cpp
@@ -17,6 +17,10 @@ CLayers::CLayers()
 
 void CLayers::Init(class IKernel *pKernel)
 {
+	// reset pointers to race specific layers
+	m_pTeleLayer = 0;
+	m_pSpeedupLayer = 0;
+
 	m_pMap = pKernel->RequestInterface<IMap>();
 	m_pMap->GetType(MAPITEMTYPE_GROUP, &m_GroupsStart, &m_GroupsNum);
 	m_pMap->GetType(MAPITEMTYPE_LAYER, &m_LayersStart, &m_LayersNum);