Merge branch 'FMOD'

Conflicts:
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/PhysicsSystem.h
	src/Systems/SoundSystem.cpp
	src/Systems/SoundSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters

src/Events/ComponentCreated.h

@@ -0,0 +1,19 @@
+#ifndef Event_ComponentCreated_h__
+#define Event_ComponentCreated_h__
+
+#include "EventBroker.h"
+#include "Entity.h"
+#include "Component.h"
+
+namespace Events
+{
+
+struct ComponentCreated : Event
+{
+	EntityID Entity;
+	std::shared_ptr<::Component> Component;
+};
+
+}
+
+#endif // Event_ComponentCreated_h__

src/Events/PlayBGM.h

@@ -0,0 +1,18 @@
+#ifndef Event_PlayBGM_h__
+#define Event_PlayBGM_h__
+
+#include "EventBroker.h"
+#include "Entity.h"
+
+namespace Events
+{
+
+	struct PlayBGM : Event
+	{
+		std::string Resource;
+		bool Loop;
+	};
+
+}
+
+#endif // Event_PlayBGM_h__

src/Events/PlaySFX.h

@@ -0,0 +1,19 @@
+#ifndef Event_PlaySFX_h__
+#define Event_PlaySFX_h__
+
+#include "EventBroker.h"
+#include "Entity.h"
+
+namespace Events
+{
+
+struct PlaySFX : Event
+{
+	EntityID Emitter;
+	std::string Resource;
+	bool Loop;
+};
+
+}
+
+#endif // Event_PlaySFX_h__

src/Events/PlaySound.h

@@ -1,17 +0,0 @@
-#ifndef Event_PlaySound_h__
-#define Event_PlaySound_h__
-
-#include "EventBroker.h"
-
-namespace Events
-{
-
-struct PlaySound : Event
-{
-	EntityID Emitter;
-	std::string Resource;
-};
-
-}
-
-#endif // Event_PlaySound_h__

src/Events/StopSound.h

@@ -0,0 +1,17 @@
+#ifndef Event_StopSound_h__
+#define Event_StopSound_h__
+
+#include "EventBroker.h"
+#include "Entity.h"
+
+namespace Events
+{
+
+	struct StopSound : Event
+	{
+		EntityID Emitter;
+	};
+
+}
+
+#endif // Event_StopSound_h__