Changeset 1446 for code/branches/network/src/core/KeyBinder.cc

Timestamp:

May 28, 2008, 5:30:11 AM (16 years ago)

Author:

landauf

Message:

merged console branch into network branch

after several heavy troubles it compiles, but there is still a bug I couldn't fix: orxonox crashes as soon as one presses a key after opening the console… maybe someone else sees the problem?

File:

• code/branches/network/src/core/KeyBinder.cc (modified) (9 diffs)

code/branches/network/src/core/KeyBinder.cc

@@ -42 +42 @@
 #include "CoreIncludes.h"
 #include "CommandExecutor.h"
+#include "ConsoleCommand.h"
 #include "Executor.h"
 // TODO: only needed by the CalibratorCallback class; move to new file
@@ -66 +67 @@
       cmd.nValuesAdded_ = 0;
       cmd.value_ = 0;
-      return CommandExecutor::execute(cmd.evaluation_);
+      return cmd.evaluation_.execute();
     }
     else
@@ -82 +83 @@
   bool SimpleCommand::execute(float abs, float rel)
   {
-    return CommandExecutor::execute(evaluation_);
+    return evaluation_.execute();
   }
 
@@ -183 +184 @@
         SubString tokens(commandStrings[iCommand], " ", SubString::WhiteSpaces, false,
             '\\', false, '"', false, '(', ')', false, '\0');
-        
+
         unsigned int iToken = 0;
 
@@ -238 +239 @@
 
         // check for param command
-        int paramIndex = eval.getEvaluatedExecutor()->getAxisParamIndex();
+        int paramIndex = eval.getConsoleCommand()->getAxisParamIndex();
         if (paramIndex >= 0)
         {
@@ -244 +245 @@
           ParamCommand* cmd = new ParamCommand();
           cmd->paramModifier_ = paramModifier;
-          cmd->bRelative_ = eval.getEvaluatedExecutor()->getIsAxisRelative();
+          cmd->bRelative_ = eval.getConsoleCommand()->getIsAxisRelative();
 
           // add command to the buffer if not yet existing
           for (unsigned int iParamCmd = 0; iParamCmd < paramCommandBuffer.size(); iParamCmd++)
           {
-            if (getLowercase(paramCommandBuffer[iParamCmd]->evaluation_.getCommandString())
+            if (getLowercase(paramCommandBuffer[iParamCmd]->evaluation_.getOriginalCommand())
                 == getLowercase(commandStr))
             {
@@ -271 +272 @@
             if (!addParamCommand(cmd))
             {
-              mode = eval.getEvaluatedExecutor()->getKeybindMode();
+              mode = eval.getConsoleCommand()->getKeybindMode();
               commands[mode].push_back(cmd);
             }
@@ -282 +283 @@
 
           if (mode == KeybindMode::None)
-            mode = eval.getEvaluatedExecutor()->getKeybindMode();
+            mode = eval.getConsoleCommand()->getKeybindMode();
 
           commands[mode].push_back(cmd);
@@ -331 +332 @@
     }
   }
-  
+
   bool HalfAxis::addParamCommand(ParamCommand* command)
   {