Changeset 1747 for code/trunk/src/orxonox/overlays/console

Timestamp:

Sep 9, 2008, 4:25:52 AM (16 years ago)

Author:

landauf

Message:

merged core3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/console/InGameConsole.cc (modified) (1 diff)
• src/orxonox/overlays/console/InGameConsole.h (modified) (1 diff)

code/trunk/src/orxonox/overlays/console/InGameConsole.cc

@@ -41 +41 @@
 #include "util/Math.h"
 #include "util/Convert.h"
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"

code/trunk/src/orxonox/overlays/console/InGameConsole.h

@@ -50 +50 @@
             void setConfigValues();
 
-            void tick(float dt);
+            virtual void tick(float dt);
 
             static InGameConsole& getInstance();