From 4890b74f3716eb4e427f04ae58a543d5bab851b3 Mon Sep 17 00:00:00 2001
From: PlatinumSkink <niklas.cullberg@hotmail.com>
Date: Thu, 10 Sep 2015 22:32:09 +0200
Subject: [PATCH] Random Commit to get Viktor's stuff

---
 include/Game/PadSystem.h    | 17 ++++++++++++++---
 src/game/Game/PadSystem.cpp |  5 +++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/include/Game/PadSystem.h b/include/Game/PadSystem.h
index 8364c8b..e2a62a1 100644
--- a/include/Game/PadSystem.h
+++ b/include/Game/PadSystem.h
@@ -11,10 +11,13 @@
 #include "Core/EKeyDown.h"
 #include "Core/EKeyUp.h"
 #include "Input/EBindKey.h"
+//#include "Core/EContact.h"
 #include "Core/CTransform.h"
 #include "Rendering/CSprite.h"
+#include "Game/CBall.h"
 #include "Core/Component.h"
 
+
 namespace dd
 {
 
@@ -33,13 +36,21 @@ public:
 private:
     dd::EventRelay<PadSystem, dd::Events::KeyDown> m_EKeyDown;
     dd::EventRelay<PadSystem, dd::Events::KeyUp> m_EKeyUp;
-
-    class PadSteeringInputController;
-    std::array<std::shared_ptr<PadSteeringInputController>, 4> m_PadInputControllers;
+    //dd::EventRelay<LevelSystem, dd::Events::Contact> m_EContact;
 
     bool OnKeyDown(const dd::Events::KeyDown &event);
     bool OnKeyUp(const dd::Events::KeyUp &event);
 
+
+    bool OnContact(/*const dd::Events::Contact &event*/);
+
+
+
+
+
+    class PadSteeringInputController;
+    std::array<std::shared_ptr<PadSteeringInputController>, 4> m_PadInputControllers;
+
     EntityID ent;
     std::shared_ptr<Components::Transform> transform;
     std::shared_ptr<Components::Sprite> sprite;
diff --git a/src/game/Game/PadSystem.cpp b/src/game/Game/PadSystem.cpp
index f9c6129..15c3df5 100644
--- a/src/game/Game/PadSystem.cpp
+++ b/src/game/Game/PadSystem.cpp
@@ -111,6 +111,11 @@ bool dd::Systems::PadSystem::OnKeyUp(const dd::Events::KeyUp &event)
     return true;
 }
 
+bool dd::Systems::PadSystem::OnContact(/*const dd::Events::Contact &event,*/)
+{
+
+}
+
 bool dd::Systems::PadSystem::PadSteeringInputController::OnCommand(const Events::InputCommand &event)
 {
     std::string command = event.Command;