Merge branch 'master' into LevelSystemAndSuch

2015-10-13 13:37:08 +02:00
parent 32bbf282c9 cd64531307
commit 1a070d8ce8
5 changed files with 50 additions and 9 deletions
@@ -16,6 +16,7 @@ namespace Components
 struct Brick : Component
 {
    int Score = 50;
+	//0 = empty, 1 = normal, 2 = multi-brick, 3 = lifebuoy, 4 = sticky, 5 = blaster, 6 = kraken
    int Type = 0;
    bool Removed = false;

@@ -25,6 +25,8 @@
 #include "Physics/CCircleShape.h"
 #include "Physics/CParticleEmitter.h"

+#include "Game/BrickComponents.h"
+
 #include "Transform/TransformSystem.h"
 #include "Transform/TransformSystem.h"