Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Conflicts: Escape-the-Dawn/Escape-the-Dawn.vcxproj
2014-03-09 20:01:59 +01:00
parent 34889b3b0e e4c443042b
commit bca46de9e1
6 changed files with 81 additions and 10 deletions
@@ -10,7 +10,6 @@ namespace Components

 struct SoundEmitter : Component
 {
-	std::string SoundFile;
 	float Volume;
 	float MaxRange;
 };