Ticket #953: Ticket#953.patch

ConfigDB.cpp

@@ -364 +364 @@
     
     // Read file line by line
     char *next=filebuf-1;
+    
     do
     {
         char *pos=next+1;
@@ -395 +396 @@
                     continue;
                 CConfigValue argument;
                 argument.m_String = value;
-                newMap[name].push_back( argument );
-                LOGMESSAGE(L"Loaded config string \"%hs\" = \"%hs\"", name.c_str(), value.c_str());
+
+                // Try to insert into set of used values if value already exist, skip it.
+                // Shift and Ctrl can be used at more places at once.
+                if (name.compare(0, 6, "hotkey") == 0 && value.compare(0, 5, "Shift") != 0 &&
+                    value.compare(0, 4, "Ctrl") != 0 && !usedKeys.insert(value).second)
+                {
+                    LOGMESSAGE(L"Loaded config string \"%hs\" = \"%hs\" is already used", name.c_str(), value.c_str());                 
+                }
+                else
+                {
+                    newMap[name].push_back( argument );
+                    LOGMESSAGE(L"Loaded config string \"%hs\" = \"%hs\"", name.c_str(), value.c_str());
+                }               
             }
         }
     }
     while (next < filebufend);
-    
+
     m_Map[ns].swap(newMap);
 
     return true;
@@ -445 +457 @@
 
     return true;
 }
+
+void CConfigDB::ClearUsedSet()
+{
+    usedKeys.clear();
+}
+

ConfigDB.h

@@ -78 +78 @@
 {
     static std::map <CStr, CConfigValueSet> m_Map[];
     static VfsPath m_ConfigFile[];
+    std::set<std::string> usedKeys;
 
 public:
     // NOTE: Construct the Singleton Object *after* JavaScript init, so that
@@ -162 +163 @@
      *  false:  if an error occurred
      */
     bool WriteFile(EConfigNamespace ns);
+
+    /**
+     *Clear used set afret finishing using of it
+     *Call after using the last call of Reload function
+     *
+     * Returns:
+     *  none
+     */
+    void ClearUsedSet();
 };
 
 

GameSetup/Config.cpp

@@ -157 +157 @@
 
     new CConfigDB;
 
-    // Load the global, default config file
-    g_ConfigDB.SetConfigFile(CFG_DEFAULT, L"config/default.cfg");
-    g_ConfigDB.Reload(CFG_DEFAULT); // 216ms
+    g_ConfigDB.SetConfigFile(CFG_MOD, L"config/mod.cfg");
+    // No point in reloading mod.cfg here - we haven't mounted mods yet
+
+    g_ConfigDB.SetConfigFile(CFG_USER, L"config/user.cfg");
+    g_ConfigDB.Reload(CFG_USER);
+
     // Try loading the local system config file (which doesn't exist by
     // default) - this is designed as a way of letting developers edit the
     // system config without accidentally committing their changes back to SVN.
     g_ConfigDB.SetConfigFile(CFG_SYSTEM, L"config/local.cfg");
     g_ConfigDB.Reload(CFG_SYSTEM);
 
-    g_ConfigDB.SetConfigFile(CFG_USER, L"config/user.cfg");
-    g_ConfigDB.Reload(CFG_USER);
+    // Load the global, default config file
+    g_ConfigDB.SetConfigFile(CFG_DEFAULT, L"config/default.cfg");
+    g_ConfigDB.Reload(CFG_DEFAULT); // 216ms
+    g_ConfigDB.ClearUsedSet();
 
-    g_ConfigDB.SetConfigFile(CFG_MOD, L"config/mod.cfg");
-    // No point in reloading mod.cfg here - we haven't mounted mods yet
-
     ProcessCommandLineArgs(args);
 
     // Initialise console history file