Changeset 9667 for code/trunk/src/libraries/core/command/Shell.h

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/command/Shell.h (modified) (3 diffs)

code/trunk/src/libraries/core/command/Shell.h

@@ -50 +50 @@
 #include "util/output/BaseWriter.h"
 #include "core/Core.h"
-#include "core/OrxonoxClass.h"
 
 namespace orxonox
@@ -110 +109 @@
             };
 
-            Shell(const std::string& consoleName, bool bScrollable);
+            Shell(const std::string& consoleName = "", bool bScrollable = true);
             ~Shell();
 
@@ -200 +199 @@
             unsigned int              historyOffset_;       ///< The command history is a circular buffer, this variable defines the current write-offset
             std::vector<std::string>  commandHistory_;      ///< The history of commands that were entered by the user
-            static unsigned int       cacheSize_s;          ///< The maximum cache size of the CommandExecutor - this is stored here for better readability of the config file and because CommandExecutor is no OrxonoxClass
+            static unsigned int       cacheSize_s;          ///< The maximum cache size of the CommandExecutor - this is stored here for better readability of the config file and because CommandExecutor is not configurable
     };
 }