Changeset 1327

Timestamp:

May 19, 2008, 9:00:17 PM (17 years ago)

Author:

landauf

Message:

sync with notebook

Location:

code/branches/console/src

Files:

• core/ConfigValueContainer.cc (modified) (1 diff)
• core/Shell.cc (modified) (1 diff)
• orxonox/console/InGameConsole.cc (modified) (1 diff)

code/branches/console/src/core/ConfigValueContainer.cc

@@ -289 +289 @@
                 else
                 {
-                    this->value_.fromString(ConfigFileManager::getSingleton()->getValue(this->type_, this->sectionname_, this->varname_, i, "abc", this->value_.isA(MT_string)));
+                    this->value_.fromString(ConfigFileManager::getSingleton()->getValue(this->type_, this->sectionname_, this->varname_, i, MultiTypeMath(), this->value_.isA(MT_string)));
                 }
 

code/branches/console/src/core/Shell.cc

@@ -204 +204 @@
 
                 this->finishedLastLine_ = newline;
-                SHELL_UPDATE_LISTENERS(lineAdded);
+
+                if (!this->scrollPosition_)
+                {
+                    SHELL_UPDATE_LISTENERS(lineAdded);
+                }
             }
             else

code/branches/console/src/orxonox/console/InGameConsole.cc

@@ -140 +140 @@
     {
         this->linesChanged();
+        for (unsigned int i = LINES - 1; i > 1; --i)
+            this->consoleOverlayTextAreas_[i]->setCaption(this->consoleOverlayTextAreas_[i - 1]->getCaption());
+
+        this->onlyLastLineChanged();
     }