Changeset 4866 in orxonox.OLD for orxonox/trunk/src/lib/event/key_mapper.cc

Timestamp:

Jul 14, 2005, 10:38:21 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: Iniparser is passed on to the EvenetHandler over orxonox

File:

• orxonox/trunk/src/lib/event/key_mapper.cc (modified) (2 diffs)

orxonox/trunk/src/lib/event/key_mapper.cc

@@ -115 +115 @@
 void KeyMapper::loadKeyBindings (const char* fileName)
 {
-  FILE* stream;
-
-  PRINTF(4)("Loading key bindings from %s\n", fileName);
-
-  // create parser
   IniParser parser(fileName);
-  if( parser.getSection (CONFIG_SECTION_PLAYER "1") == -1)
-    {
-      PRINTF(1)("Could not find key bindings " CONFIG_SECTION_PLAYER"1 in %s\n", fileName);
-      return;
-    }
+  this->loadKeyBindings(&parser);
+}
+
+void KeyMapper::loadKeyBindings(IniParser* iniParser)
+{
+  if( iniParser->getSection (CONFIG_SECTION_PLAYER "1") == -1)
+  {
+    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_PLAYER"1\n");
+    return;
+  }
   // allocate empty lookup table
 
@@ -134 +134 @@
   int* index;
 
-  while( parser.nextVar (namebuf, valuebuf) != -1)
-    {
-      PRINTF(3)("Keys: Parsing %s, %s now.\n", namebuf, valuebuf);
-      index = nameToIndex (valuebuf);
-      this->mapKeys(namebuf, index[1]);
+  while( iniParser->nextVar (namebuf, valuebuf) != -1)
+  {
+    PRINTF(3)("Keys: Parsing %s, %s now.\n", namebuf, valuebuf);
+    index = nameToIndex (valuebuf);
+    this->mapKeys(namebuf, index[1]);
 
       /*
-      switch( index[0])
-        {
-        case 0:
-          this->mapKeys(namebuf, index[1]);
-          break;
-        case 1:
-          this->mapKeys(namebuf, index[1]);
-          break;
-        default:
-          break;
-        }
+    switch( index[0])
+    {
+    case 0:
+    this->mapKeys(namebuf, index[1]);
+    break;
+    case 1:
+    this->mapKeys(namebuf, index[1]);
+    break;
+    default:
+    break;
+  }
       */
-      memset (namebuf, 0, 256);
-      memset (valuebuf, 0, 256);
-    }
+    memset (namebuf, 0, 256);
+    memset (valuebuf, 0, 256);
+  }
 
 
   // PARSE MISC SECTION
-  if( parser.getSection (CONFIG_SECTION_MISC_KEYS) == -1)
-    {
-      PRINTF(1)("Could not find key bindings in %s\n", fileName);
-      return;
-    }
-
-  while( parser.nextVar (namebuf, valuebuf) != -1)
-    {
-      PRINTF(3)("MISC: Parsing %s, %s now.\n", namebuf, valuebuf);
-      index = nameToIndex (valuebuf);
-      this->mapKeys(namebuf, index[1]);
+  if( iniParser->getSection (CONFIG_SECTION_MISC_KEYS) == -1)
+  {
+    PRINTF(1)("Could not find key bindings\n");
+    return;
+  }
+
+  while( iniParser->nextVar (namebuf, valuebuf) != -1)
+  {
+    PRINTF(3)("MISC: Parsing %s, %s now.\n", namebuf, valuebuf);
+    index = nameToIndex (valuebuf);
+    this->mapKeys(namebuf, index[1]);
       /*
-      switch( index[0])
-        {
-        case 0:
-          this->mapKeys(namebuf, index[1]);
-          break;
-        case 1:
-        this->mapKeys(namebuf, index[1]);
-          break;
-        default:
-          break;
-        }
+    switch( index[0])
+    {
+    case 0:
+    this->mapKeys(namebuf, index[1]);
+    break;
+    case 1:
+    this->mapKeys(namebuf, index[1]);
+    break;
+    default:
+    break;
+  }
       */
-      memset (namebuf, 0, 256);
-      memset (valuebuf, 0, 256);
-    }
-}
-
+    memset (namebuf, 0, 256);
+    memset (valuebuf, 0, 256);
+  }
+}
 
 /**