Changeset 1416 for code/branches/console/src/core/ConsoleCommand.h

Timestamp:

May 25, 2008, 1:11:51 AM (17 years ago)

Author:

landauf

Message:

• fixed a bug in CommandExecutor
• InGameConsole wraps now too long output lines and does something similar for the input line

File:

• code/branches/console/src/core/ConsoleCommand.h (modified) (3 diffs)

code/branches/console/src/core/ConsoleCommand.h

@@ -42 +42 @@
     SetConsoleCommandGeneric(classname##function##consolecommand__, classname, orxonox::createConsoleCommand(orxonox::createFunctor(&classname::function), #function), bCreateShortcut)
 
-#define SetConsoleCommandGeneric(fakevariable, classname, executor, bCreateShortcut) \
-    Executor& fakevariable = ClassManager<classname>::getIdentifier()->addConsoleCommand((ConsoleCommand*)executor, bCreateShortcut)
+#define SetConsoleCommandGeneric(fakevariable, classname, command, bCreateShortcut) \
+    ConsoleCommand& fakevariable = ClassManager<classname>::getIdentifier()->addConsoleCommand((ConsoleCommand*)command, bCreateShortcut)
 
 
@@ -52 +52 @@
     SetConsoleCommandShortcutGeneric(function##consolecommand__, orxonox::createConsoleCommand(orxonox::createFunctor(&function), #function))
 
-#define SetConsoleCommandShortcutGeneric(fakevariable, executor) \
-    Executor& fakevariable = CommandExecutor::addConsoleCommandShortcut((ConsoleCommand*)executor)
+#define SetConsoleCommandShortcutGeneric(fakevariable, command) \
+    ConsoleCommand& fakevariable = CommandExecutor::addConsoleCommandShortcut((ConsoleCommand*)command)
 
 
@@ -100 +100 @@
                 { return this->accessLevel_; }
 
-            ConsoleCommand& setArgumentCompletionList(unsigned int param, const std::list<std::pair<std::string, std::string> >& (*function) (void));
+            ConsoleCommand& setArgumentCompletionList(unsigned int param, std::list<std::pair<std::string, std::string> > (*function) (void));
 
-            const std::list<std::pair<std::string, std::string> >& getArgumentCompletionList(unsigned int param) const;
-            std::list<std::pair<std::string, std::string> >::const_iterator getArgumentCompletionListBegin(unsigned int param) const;
-            std::list<std::pair<std::string, std::string> >::const_iterator getArgumentCompletionListEnd(unsigned int param) const;
+            const std::list<std::pair<std::string, std::string> >& getArgumentCompletionList(unsigned int param);
+            std::list<std::pair<std::string, std::string> >::const_iterator getArgumentCompletionListBegin(unsigned int param);
+            std::list<std::pair<std::string, std::string> >::const_iterator getArgumentCompletionListEnd(unsigned int param);
 
         private:
             AccessLevel::Level accessLevel_;
-            const std::list<std::pair<std::string, std::string> >& (*autocompletionFunction_[5]) (void);
+            std::list<std::pair<std::string, std::string> > (*autocompletionFunction_[5]) (void);
+            std::list<std::pair<std::string, std::string> > argumentList_;
     };