Changeset 6412 for code/branches/pickup2/src/orxonox/overlays/InGameConsole.h

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/InGameConsole.h (modified) (3 diffs)

code/branches/pickup2/src/orxonox/overlays/InGameConsole.h

@@ -52 +52 @@
         void setConfigValues();
 
-        void update(const Clock& time);
+        void preUpdate(const Clock& time);
 
         static void openConsole();
@@ -68 +68 @@
         void inputChanged();
         void cursorChanged();
+        void executed();
         void exit();
 
         void shiftLines();
-        void colourLine(int colourcode, int index);
+        void colourLine(Shell::LineType type, int index);
         void setCursorPosition(unsigned int pos);
-        void print(const std::string& text, int index, bool alwaysShift = false);
+        void print(const std::string& text, Shell::LineType type, int index, bool alwaysShift = false);
 
         void windowResized(unsigned int newWidth, unsigned int newHeight);
@@ -81 +82 @@
 
     private: // variables
+        Shell* shell_;
         bool bActive_;
         int windowW_;