Merge remote-tracking branch 'origin/LevelSystemAndSuch' into Physics

2015-10-08 23:53:59 +02:00
parent 3609ca9123 c222383b6f
commit 46fca005bf
6 changed files with 112 additions and 4 deletions
@@ -26,6 +26,7 @@
 #include "Game/ELifebuoy.h"
 #include "Game/EStickyPad.h"
 #include "Game/EInkBlaster.h"
+#include "Game/EKrakenAttack.h"
 #include "Game/EMultiBall.h"
 #include "Game/EMultiBallLost.h"
 #include "Game/EPause.h"
@@ -133,6 +134,7 @@ private:
 	const int LifebuoyBrick = 3;
 	const int StickyBrick = 4;
 	const int InkBlasterBrick = 5;
+	const int KrakenAttackBrick = 6;

    EntityID m_BrickTemplate;