Merge branch 'master' of github.com:teamfisk/AgileBreakOut

2015-10-22 17:06:30 +02:00
parent 512f4db1c2 f31f0bb771
commit 1ed52102d1
4 changed files with 50 additions and 49 deletions
@@ -90,8 +90,8 @@ private:
    float m_Edge = 2.8f;
 	float m_PadOriginalHeight = -4.8;
 	float m_PadHeight = m_PadOriginalHeight;
-	EntityID m_KrakenArm = NULL;
-	EntityID m_KrakenArmHitbox = NULL;
+	EntityID m_KrakenArm = 0;
+	EntityID m_KrakenArmHitbox = 0;
 	float m_PadRiseSpeed = 0.2;
    Components::Transform* m_PadTransform = nullptr;
    Components::Pad* m_PadComponent = nullptr;