Changeset 9589 for code/branches/core6/src/libraries/core/input

Timestamp:

Mar 26, 2013, 11:43:43 PM (12 years ago)

Author:

landauf

Message:

interfaces which are part of the framework and only rely on the object list for calling all instances may inherit from Listable

Location:

code/branches/core6/src/libraries/core/input

Files:

• InputManager.cc (modified) (1 diff)
• JoyStickQuantityListener.h (modified) (1 diff)

code/branches/core6/src/libraries/core/input/InputManager.cc

@@ -642 +642 @@
         assert(state && this->activeStates_.find(state->getPriority()) == this->activeStates_.end());
         statesByName_.erase(state->getName());
-        state->destroy();
+        delete state;
     }
 

code/branches/core6/src/libraries/core/input/JoyStickQuantityListener.h

@@ -38 +38 @@
 
 #include <vector>
-#include "core/class/OrxonoxClass.h"
+#include "core/object/Listable.h"
 
 namespace orxonox
 {
     //! Derive from this class to get informed when joy sticks get added/removed
-    class _CoreExport JoyStickQuantityListener : virtual public OrxonoxClass
+    class _CoreExport JoyStickQuantityListener : virtual public Listable
     {
         friend class InputManager;