Changeset 5014 in orxonox.OLD for orxonox/trunk/src/lib/event

Timestamp:

Aug 14, 2005, 4:29:29 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: implemented a new kind of ini-parser
this parser first reads the file, and then one can search through without accessing the file anymore

Location:

orxonox/trunk/src/lib/event

Files:

• key_mapper.cc (modified) (3 diffs)
• key_mapper.h (modified) (1 diff)

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

@@ -121 +121 @@
 void KeyMapper::loadKeyBindings(IniParser* iniParser)
 {
-  if( iniParser->getSection (CONFIG_SECTION_PLAYER "1") == -1)
+  if( !iniParser->getSection (CONFIG_SECTION_PLAYER "1"))
   {
     PRINTF(1)("Could not find key bindings " CONFIG_SECTION_PLAYER"1\n");
     return;
   }
-  // allocate empty lookup table
-
-  char namebuf[256];
-  char valuebuf[256];
-  memset (namebuf, 0, 256);
-  memset (valuebuf, 0, 256);
   int* index;
 
-  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;
-  }
-      */
-    memset (namebuf, 0, 256);
-    memset (valuebuf, 0, 256);
+  while(iniParser->nextVar())
+  {
+    PRINTF(3)("Keys: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
+    index = nameToIndex (iniParser->getCurrentValue());
+    this->mapKeys(iniParser->getCurrentName(), index[1]);
   }
 
 
   // PARSE MISC SECTION
-  if( iniParser->getSection (CONFIG_SECTION_MISC_KEYS) == -1)
-  {
-    PRINTF(1)("Could not find key bindings\n");
+  if( !iniParser->getSection (CONFIG_SECTION_MISC_KEYS))
+  {
+    PRINTF(1)("Could not find key bindings" CONFIG_SECTION_MISC_KEYS "\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;
-  }
-      */
-    memset (namebuf, 0, 256);
-    memset (valuebuf, 0, 256);
+  while( iniParser->nextVar())
+  {
+    PRINTF(3)("MISC: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
+    index = nameToIndex (iniParser->getCurrentValue());
+    this->mapKeys(iniParser->getCurrentName(), index[1]);
   }
 }
@@ -192 +155 @@
  * @param the name of the button
 */
-int* KeyMapper::nameToIndex (char* name)
+int* KeyMapper::nameToIndex (const char* name)
 {
   coord[0] = -1;
@@ -216 +179 @@
  * @param id of the key
 */
-void KeyMapper::mapKeys(char* name, int keyID)
+void KeyMapper::mapKeys(const char* name, int keyID)
 {
   for(int i = 0; map[i].pValue != NULL; ++i )

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

@@ -35 +35 @@
 
  private:
-  int* nameToIndex (char* name);
-  void mapKeys(char* name, int keyID);
+  int* nameToIndex (const char* name);
+  void mapKeys(const char* name, int keyID);
 
  public: