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
@@ -17,7 +17,7 @@ class CapturePointSystem : public PureSystem
 {
 public:
    //WARNING: on new map, destroy all info in the vectors, as well as reset all variables (just make new?)
-    CapturePointSystem(World* world, EventBroker* eventBroker);
+    CapturePointSystem(SystemParams params);

    //updatecomponent
    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt) override;