Changeset 7636 in orxonox.OLD for branches/qt_gui/src/lib/event/key_mapper.cc

Timestamp:

May 17, 2006, 10:50:16 AM (18 years ago)

Author:

bensch

Message:

orxonox/qt_gui: more gui-elements

File:

• branches/qt_gui/src/lib/event/key_mapper.cc (modified) (2 diffs)

branches/qt_gui/src/lib/event/key_mapper.cc

@@ -138 +138 @@
 void KeyMapper::loadKeyBindings(IniParser* iniParser)
 {
-  if( !iniParser->getSection (CONFIG_SECTION_PLAYER "1"))
-  {
-    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_PLAYER"1\n");
+  if( !iniParser->getSection (CONFIG_SECTION_CONTROL))
+  {
+    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_CONTROL "\n");
     return;
   }
@@ -158 +158 @@
 
   // PARSE MISC SECTION
-  if( !iniParser->getSection (CONFIG_SECTION_MISC_KEYS))
-  {
-    PRINTF(1)("Could not find key bindings" CONFIG_SECTION_MISC_KEYS "\n");
+//   if( !iniParser->getSection (CONFIG_SECTION_MISC_KEYS))
+//   {
+//     PRINTF(1)("Could not find key bindings" CONFIG_SECTION_MISC_KEYS "\n");
+//     return;
+//   }
+//
+//   iniParser->firstVar();
+//   while( iniParser->getCurrentName() != "" )
+//   {
+//     PRINTF(3)("MISC: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
+//     index = nameToIndex (iniParser->getCurrentValue());
+//     this->mapKeys(iniParser->getCurrentName(), index);
+//     iniParser->nextVar();
+//   }
+}
+
+void KeyMapper::loadKeyBindings()
+{
+  if( !Preferences::getInstance()->sectionExists(CONFIG_SECTION_CONTROL))
+  {
+    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_CONTROL "\n");
     return;
   }
-
-  iniParser->firstVar();
-  while( iniParser->getCurrentName() != "" )
-  {
-    PRINTF(3)("MISC: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
-    index = nameToIndex (iniParser->getCurrentValue());
-    this->mapKeys(iniParser->getCurrentName(), index);
-    iniParser->nextVar();
-  }
-}
-
-void KeyMapper::loadKeyBindings()
-{
-  if( !Preferences::getInstance()->sectionExists(CONFIG_SECTION_PLAYER "1"))
-  {
-    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_PLAYER"1\n");
-    return;
-  }
   int* index;
 
-  std::list<std::string> keys = Preferences::getInstance()->listKeys(CONFIG_SECTION_PLAYER "1");
+  std::list<std::string> keys = Preferences::getInstance()->listKeys(CONFIG_SECTION_CONTROL);
   for ( std::list<std::string>::const_iterator it = keys.begin(); it!=keys.end(); it++ )
   {
-    PRINTF(3)("Keys: Parsing %s, %s now.\n", it->c_str(), Preferences::getInstance()->getString(CONFIG_SECTION_PLAYER "1", *it, "").c_str());
+    PRINTF(3)("Keys: Parsing %s, %s now.\n", it->c_str(), Preferences::getInstance()->getString(CONFIG_SECTION_CONTROL, *it, "").c_str());
     // map the name to an sdl index
-    index = nameToIndex (Preferences::getInstance()->getString(CONFIG_SECTION_PLAYER "1", *it, ""));
+    index = nameToIndex (Preferences::getInstance()->getString(CONFIG_SECTION_CONTROL, *it, ""));
     // map the index to a internal name
-    this->mapKeys(*it, index);
-  }
-
-
-  // PARSE MISC SECTION
-  if( !Preferences::getInstance()->sectionExists (CONFIG_SECTION_MISC_KEYS))
-  {
-    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_MISC_KEYS "\n");
-    return;
-  }
-
-  keys = Preferences::getInstance()->listKeys(CONFIG_SECTION_MISC_KEYS);
-  for ( std::list<std::string>::const_iterator it = keys.begin(); it!=keys.end(); it++ )
-  {
-    PRINTF(3)("MISC: Parsing %s, %s now.\n", it->c_str(), Preferences::getInstance()->getString(CONFIG_SECTION_MISC_KEYS, *it, "").c_str());
-    index = nameToIndex (Preferences::getInstance()->getString(CONFIG_SECTION_MISC_KEYS, *it, ""));
     this->mapKeys(*it, index);
   }