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

2015-09-29 14:44:50 +02:00
parent c3b54ef030 cb70cdfc5d
commit 45e68c51a3
12 changed files with 280 additions and 110 deletions
@@ -119,7 +119,7 @@ void dd::Systems::LevelSystem::CreateBrick(int row, int line, glm::vec2 spacesBe

    //sound
    auto collisionSound = m_World->AddComponent<Components::CollisionSound>(brick);
-    collisionSound->filePath = "Sounds/Brick/shortbrickbreak.wav";
+    collisionSound->FilePath = "Sounds/Brick/shortbrickbreak.wav";

    m_World->CommitEntity(brick);
    return;