Changeset 1416 for code/branches/console/src/core/CommandEvaluation.cc

Timestamp:

May 25, 2008, 1:11:51 AM (16 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/CommandEvaluation.cc (modified) (4 diffs)

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

@@ -53 +53 @@
         this->listOfPossibleIdentifiers_.clear();
         this->listOfPossibleFunctions_.clear();
+        this->listOfPossibleArguments_.clear();
 
         this->functionclass_ = 0;
@@ -114 +115 @@
 std::cout << "complete: function != 0" << std::endl;
                     if (this->commandTokens_.size() > 1)
-                        return (this->function_->getName() + " " + this->commandTokens_.subSet(1, this->commandTokens_.size() - 1).join() + " " + CommandEvaluation::getCommonBegin(this->listOfPossibleArguments_));
+                    {
+                        if ((this->commandTokens_.size() - 1) >= this->function_->getParamCount())
+                            return (this->function_->getName() + " " + this->commandTokens_.subSet(1, this->commandTokens_.size()).join());
+                        else
+                            return (this->function_->getName() + " " + this->commandTokens_.subSet(1, this->commandTokens_.size()).join() + " " + CommandEvaluation::getCommonBegin(this->listOfPossibleArguments_));
+                    }
                     else
                         return (this->function_->getName() + " ");
@@ -125 +131 @@
 std::cout << "complete: function != 0" << std::endl;
                     if (this->commandTokens_.size() > 1)
-                        return (this->function_->getName() + " " + this->commandTokens_.subSet(1, this->commandTokens_.size() - 1).join());
+                        return (this->function_->getName() + " " + this->commandTokens_.subSet(1, this->commandTokens_.size()).join());
                     else
                         return (this->function_->getName());
@@ -144 +150 @@
 std::cout << "complete: function und functionclass != 0" << std::endl;
                     if (this->commandTokens_.size() > 2)
-                        return (this->functionclass_->getName() + " " + this->function_->getName() + " " + this->commandTokens_.subSet(2, this->commandTokens_.size()).join() + " " + CommandEvaluation::getCommonBegin(this->listOfPossibleArguments_));
+                    {
+                        if ((this->commandTokens_.size() - 2) >= this->function_->getParamCount())
+                            return (this->functionclass_->getName() + " " + this->function_->getName() + " " + this->commandTokens_.subSet(2, this->commandTokens_.size()).join());
+                        else
+                            return (this->functionclass_->getName() + " " + this->function_->getName() + " " + this->commandTokens_.subSet(2, this->commandTokens_.size()).join() + " " + CommandEvaluation::getCommonBegin(this->listOfPossibleArguments_));
+                    }
                     else
                         return (this->functionclass_->getName() + " " + this->function_->getName() + " ");