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

# Conflicts: # src/Game/Systems/CapturePointSystem.cpp
2016-02-11 16:09:05 +01:00
parent f11bd24d53 bbbab7b287
commit c9f815fd42
96 changed files with 1584 additions and 910 deletions
@@ -1,8 +1,8 @@
 #include "Systems/CapturePointSystem.h"
 #include <algorithm>

-CapturePointSystem::CapturePointSystem(World* world, EventBroker* eventBroker)
-    : System(world, eventBroker)
+CapturePointSystem::CapturePointSystem(SystemParams params) 
+    : System(params)
    , PureSystem("CapturePoint")
 {
    //subscribe/listenTo playerdamage,healthpickup events (using the eventBroker)