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

2016-02-08 10:22:35 +01:00
parent 4103c878ec 40788c7400
commit f8e514d21e
9 changed files with 33 additions and 72 deletions
@@ -2,16 +2,16 @@
 #define EPlayerHealthPickup_h__

 #include "EventBroker.h"
-#include "../Core/Entity.h"
+#include "../Core/EntityWrapper.h"

 namespace Events
 {

-struct PlayerHealthPickup : Event
-{
-    double HealthAmount;
-    EntityID PlayerHealedID;
-};
+    struct PlayerHealthPickup : Event
+    {
+        EntityWrapper Player;
+        double HealthAmount;
+    };

 }