Changeset 7230 for code/branches/consolecommands3/src/libraries/core/input

Timestamp:

Aug 27, 2010, 7:29:49 PM (14 years ago)

Author:

landauf

Message:

re-implemented parameter evaluation in CommandEvaluation and simplified parse() and evaluateParams() in Executor.

Location:

code/branches/consolecommands3/src/libraries/core/input

Files:

• Button.cc (modified) (1 diff)
• InputCommands.cc (modified) (1 diff)

code/branches/consolecommands3/src/libraries/core/input/Button.cc

@@ -175 +175 @@
 
                 // evaluate the command
-                const CommandEvaluation& eval = CommandExecutor::evaluate(commandStr);
-                if (!eval.isValid())
+                CommandEvaluation eval = CommandExecutor::evaluate(commandStr);
+                if (!eval.isValid() || eval.evaluateParams(true))
                 {
                     parseError("Command evaluation of \"" + commandStr + "\"failed.", true);

code/branches/consolecommands3/src/libraries/core/input/InputCommands.cc

@@ -53 +53 @@
         if (this->abs_ != 0.0f || this->rel_ != 0.0f)
         {
-//            evaluation_.setEvaluatedParameter(paramIndex_, Vector2(abs_, rel_));
+            evaluation_.setEvaluatedParameter(paramIndex_, Vector2(abs_, rel_));
             // reset
             rel_ = 0.0;