Changeset 7228 for code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.cc

Timestamp:

Aug 27, 2010, 2:41:03 PM (14 years ago)

Author:

landauf

Message:

re-implemented CommandExecutor and CommandEvaluation. parameter evaluation is currently not implemented, will come soon.

File:

• code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.cc (modified) (5 diffs)

code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.cc

@@ -30 +30 @@
 
 #include "util/Convert.h"
+#include "util/StringUtils.h"
 #include "core/Language.h"
 #include "core/GameMode.h"
@@ -398 +399 @@
     }
 
-    /* static */ const _ConsoleCommand* _ConsoleCommand::getCommand(const std::string& group, const std::string& name, bool bPrintError)
+    /* static */ _ConsoleCommand* _ConsoleCommand::getCommand(const std::string& group, const std::string& name, bool bPrintError)
     {
         std::map<std::string, std::map<std::string, _ConsoleCommand*> >::const_iterator it_group = _ConsoleCommand::getCommandMap().find(group);
@@ -419 +420 @@
     }
 
+    /* static */ _ConsoleCommand* _ConsoleCommand::getCommandLC(const std::string& group, const std::string& name, bool bPrintError)
+    {
+        std::string groupLC = getLowercase(group);
+        std::string nameLC = getLowercase(name);
+
+        std::map<std::string, std::map<std::string, _ConsoleCommand*> >::const_iterator it_group = _ConsoleCommand::getCommandMapLC().find(groupLC);
+        if (it_group != _ConsoleCommand::getCommandMapLC().end())
+        {
+            std::map<std::string, _ConsoleCommand*>::const_iterator it_name = it_group->second.find(nameLC);
+            if (it_name != it_group->second.end())
+            {
+                return it_name->second;
+            }
+        }
+        if (bPrintError)
+        {
+            if (group == "")
+                COUT(1) << "Error: Couldn't find console command with shortcut \"" << name << "\"" << std::endl;
+            else
+                COUT(1) << "Error: Couldn't find console command with group \"" << group << "\" and name \"" << name << "\"" << std::endl;
+        }
+        return 0;
+    }
+
     /* static */ std::map<std::string, std::map<std::string, _ConsoleCommand*> >& _ConsoleCommand::getCommandMap()
     {
         static std::map<std::string, std::map<std::string, _ConsoleCommand*> > commandMap;
         return commandMap;
+    }
+
+    /* static */ std::map<std::string, std::map<std::string, _ConsoleCommand*> >& _ConsoleCommand::getCommandMapLC()
+    {
+        static std::map<std::string, std::map<std::string, _ConsoleCommand*> > commandMapLC;
+        return commandMapLC;
     }
 
@@ -440 +471 @@
         {
             _ConsoleCommand::getCommandMap()[group][name] = command;
+            _ConsoleCommand::getCommandMapLC()[getLowercase(group)][getLowercase(name)] = command;
         }
     }
@@ -460 +492 @@
                 ++it_group;
         }
+
+        for (std::map<std::string, std::map<std::string, _ConsoleCommand*> >::iterator it_group = _ConsoleCommand::getCommandMapLC().begin(); it_group != _ConsoleCommand::getCommandMapLC().end(); )
+        {
+            for (std::map<std::string, _ConsoleCommand*>::iterator it_name = it_group->second.begin(); it_name != it_group->second.end(); )
+            {
+                if (it_name->second == command)
+                    it_group->second.erase(it_name++);
+                else
+                    ++it_name;
+            }
+
+            if (it_group->second.empty())
+                _ConsoleCommand::getCommandMapLC().erase(it_group++);
+            else
+                ++it_group;
+        }
     }