Changeset 1446 for code/branches/network/src/core/Shell.h

Timestamp:

May 28, 2008, 5:30:11 AM (17 years ago)

Author:

landauf

Message:

merged console branch into network branch

after several heavy troubles it compiles, but there is still a bug I couldn't fix: orxonox crashes as soon as one presses a key after opening the console… maybe someone else sees the problem?

File:

• code/branches/network/src/core/Shell.h (copied) (copied from code/branches/console/src/core/Shell.h) (4 diffs)

code/branches/network/src/core/Shell.h

@@ -71 +71 @@
             void unregisterListener(ShellListener* listener);
 
+            void setInputBuffer(InputBuffer* buffer);
             inline InputBuffer& getInputBuffer()
-                { return this->inputBuffer_; }
+                { return (*this->inputBuffer_); }
             inline OutputBuffer& getOutputBuffer()
                 { return this->outputBuffer_; }
@@ -78 +79 @@
             void setCursorPosition(unsigned int cursor);
             inline unsigned int getCursorPosition() const
-                { return this->inputBuffer_.getCursorPosition(); }
+                { return this->inputBuffer_->getCursorPosition(); }
 
             void setInput(const std::string& input);
@@ -85 +86 @@
                 { this->setInput(""); }
             inline std::string getInput() const
-                { return this->inputBuffer_.get(); }
+                { return this->inputBuffer_->get(); }
 
             std::list<std::string>::const_iterator getNewestLineIterator() const;
@@ -127 +128 @@
 
             std::list<ShellListener*> listeners_;
-            InputBuffer inputBuffer_;
+            InputBuffer* inputBuffer_;
             OutputBuffer outputBuffer_;
             bool finishedLastLine_;