Merge branch 'master' into BoxModelCollision

2016-01-21 17:42:58 +01:00
parent 9f6fa40448 41f0daaf3f
commit d2984c6ae4
5 changed files with 10 additions and 11 deletions
@@ -18,9 +18,9 @@
 class WeaponSystem : public ImpureSystem
 {
 public:
-    WeaponSystem(EventBroker* eventBroker, IRenderer* renderer);
+    WeaponSystem(World* world, EventBroker* eventBroker, IRenderer* renderer);

-    virtual void Update(World* world, double dt) override;
+    virtual void Update(double dt) override;

 private:
    //methods which will take care of specific events