Changeset 1662 for code/branches/gui/src/orxonox/overlays/console/InGameConsole.h

Timestamp:

Aug 19, 2008, 8:12:15 PM (16 years ago)

Author:

rgrieder

Message:

• Changed static Executor/Functor in ConsoleCommand to generic one that enables console commands for member functions. (This is more of a temporary solution, but can be made permanent with right adjustments)
• The whole GameState thing seems to works so far. But I there's only standalone mode at the moment
• Console now shows in GUI too. I will have to implement a master InputState in the InputManager (little bit of a break with the concept, but probably necessary)

File:

• code/branches/gui/src/orxonox/overlays/console/InGameConsole.h (modified) (2 diffs)

code/branches/gui/src/orxonox/overlays/console/InGameConsole.h

@@ -37 +37 @@
 
 #include "core/Shell.h"
-#include "objects/Tickable.h"
+#include "core/OrxonoxClass.h"
 #include "tools/WindowEventListener.h"
 
@@ -43 +43 @@
 namespace orxonox
 {
-    class _OrxonoxExport InGameConsole : public TickableReal, public ShellListener, public WindowEventListener
+    class _OrxonoxExport InGameConsole : virtual public OrxonoxClass, public ShellListener, public WindowEventListener
     {
     public: // functions