Changeset 4582 in orxonox.OLD

Timestamp:

Jun 10, 2005, 3:30:52 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: fixed a small bug in the event handling system which caused to display a msg multiple times

File:

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

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

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -12 +12 @@
    main-programmer: Patrick Boenzli
    co-programmer: Christian Meyer
-   
+
    This code was inspired by the command_node.cc code from Christian Meyer in revision
    4386 and earlier.
@@ -45 +45 @@
 int KeyMapper::PEV_VIEW3             = EV_UNKNOWN;
 int KeyMapper::PEV_VIEW4             = EV_UNKNOWN;
-int KeyMapper::PEV_VIEW5             = EV_UNKNOWN; 
+int KeyMapper::PEV_VIEW5             = EV_UNKNOWN;
 
 int KeyMapper::PEV_NEXT_WORLD        = EV_UNKNOWN;
@@ -57 +57 @@
 //! this is the mapping array from names to ids: enter all orxonox.conf keys here
 orxKeyMapping map[] = { {&KeyMapper::PEV_UP, "Up"},
-                        {&KeyMapper::PEV_DOWN, "Down"},
-                        {&KeyMapper::PEV_LEFT, "Left"},
-                        {&KeyMapper::PEV_RIGHT, "Right"},
-                        {&KeyMapper::PEV_STRAFE_LEFT, "StrafeLeft"},
-                        {&KeyMapper::PEV_STRAFE_RIGHT, "StrafeRight"},
-                        
-                        {&KeyMapper::PEV_FIRE1, "Fire"},
-                        {&KeyMapper::PEV_FIRE1, "Fire1"},
-                        {&KeyMapper::PEV_FIRE2, "Fire2"},
-                        {&KeyMapper::PEV_NEXT_WEAPON, "Next"},
-                        {&KeyMapper::PEV_PREVIOUS_WEAPON, "Prev"},
-
-
-                        {&KeyMapper::PEV_VIEW0, "view0"},
-                        {&KeyMapper::PEV_VIEW1, "view1"},
-                        {&KeyMapper::PEV_VIEW2, "view2"},
-                        {&KeyMapper::PEV_VIEW3, "view3"},
-                        {&KeyMapper::PEV_VIEW4, "view4"},
-                        {&KeyMapper::PEV_VIEW5, "view5"},
-
-                        {&KeyMapper::PEV_NEXT_WORLD, "Next-World"},
-                        {&KeyMapper::PEV_PREVIOUS_WORLD, "Prev-World"},
-
-                        {&KeyMapper::PEV_PAUSE, "Pause"},
-                        {&KeyMapper::PEV_QUIT, "Quit"},
+                        {&KeyMapper::PEV_DOWN, "Down"},
+                        {&KeyMapper::PEV_LEFT, "Left"},
+                        {&KeyMapper::PEV_RIGHT, "Right"},
+                        {&KeyMapper::PEV_STRAFE_LEFT, "StrafeLeft"},
+                        {&KeyMapper::PEV_STRAFE_RIGHT, "StrafeRight"},
+
+                        {&KeyMapper::PEV_FIRE1, "Fire"},
+                        {&KeyMapper::PEV_FIRE1, "Fire1"},
+                        {&KeyMapper::PEV_FIRE2, "Fire2"},
+                        {&KeyMapper::PEV_NEXT_WEAPON, "Next"},
+                        {&KeyMapper::PEV_PREVIOUS_WEAPON, "Prev"},
+
+
+                        {&KeyMapper::PEV_VIEW0, "view0"},
+                        {&KeyMapper::PEV_VIEW1, "view1"},
+                        {&KeyMapper::PEV_VIEW2, "view2"},
+                        {&KeyMapper::PEV_VIEW3, "view3"},
+                        {&KeyMapper::PEV_VIEW4, "view4"},
+                        {&KeyMapper::PEV_VIEW5, "view5"},
+
+                        {&KeyMapper::PEV_NEXT_WORLD, "Next-World"},
+                        {&KeyMapper::PEV_PREVIOUS_WORLD, "Prev-World"},
+
+                        {&KeyMapper::PEV_PAUSE, "Pause"},
+                        {&KeyMapper::PEV_QUIT, "Quit"},
                         {NULL, NULL}};
 
@@ -89 +89 @@
    \brief standard constructor
 */
-KeyMapper::KeyMapper () 
-{
-   this->setClassID(CL_KEY_MAPPER, "KeyMapper"); 
+KeyMapper::KeyMapper ()
+{
+   this->setClassID(CL_KEY_MAPPER, "KeyMapper");
 }
 
@@ -98 +98 @@
    \brief standard deconstructor
 */
-KeyMapper::~KeyMapper () 
+KeyMapper::~KeyMapper ()
 {
 }
@@ -110 +110 @@
 {
   FILE* stream;
-  
+
   PRINTF(4)("Loading key bindings from %s\n", fileName);
-  
+
   // create parser
   IniParser parser(fileName);
@@ -121 +121 @@
     }
   // allocate empty lookup table
-  
+
   char namebuf[256];
   char valuebuf[256];
@@ -127 +127 @@
   memset (valuebuf, 0, 256);
   int* index;
-  
+
   while( parser.nextVar (namebuf, valuebuf) != -1)
     {
@@ -136 +136 @@
       /*
       switch( index[0])
-        {
-        case 0:
-          this->mapKeys(namebuf, index[1]);
-          break;
-        case 1:
-          this->mapKeys(namebuf, index[1]);
-          break;
-        default:
-          break;
-        }
+        {
+        case 0:
+          this->mapKeys(namebuf, index[1]);
+          break;
+        case 1:
+          this->mapKeys(namebuf, index[1]);
+          break;
+        default:
+          break;
+        }
       */
       memset (namebuf, 0, 256);
@@ -162 +162 @@
     {
       PRINTF(3)("MISC: Parsing %s, %s now.\n", namebuf, valuebuf);
-      index = nameToIndex (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;
-        }
+        {
+        case 0:
+          this->mapKeys(namebuf, index[1]);
+          break;
+        case 1:
+        this->mapKeys(namebuf, index[1]);
+          break;
+        default:
+          break;
+        }
       */
       memset (namebuf, 0, 256);
@@ -215 +215 @@
   for(int i = 0; map[i].pValue != NULL; ++i )
     {
-      if( !strcmp (name, map[i].pName)) { *map[i].pValue = keyID; break;}
-      PRINTF(0)("Mapping %s to id %i\n", name, keyID);
+      if( !strcmp (name, map[i].pName))
+      {
+        *map[i].pValue = keyID;
+        PRINTF(0)("Mapping %s to id %i\n", name, keyID);
+        break;
+      }
     }
 }
@@ -226 +230 @@
 void KeyMapper::debug()
 {
-  PRINT(0)("\n==========================| KeyMapper::debug() |===\n");  
+  PRINT(0)("\n==========================| KeyMapper::debug() |===\n");
   for(int i = 0; map[i].pValue != NULL; ++i)
     {
       PRINT(0)("%s = %i\n",map[i].pName, *map[i].pValue);
     }
-  PRINT(0)("=======================================================\n");        
-}
+  PRINT(0)("=======================================================\n");
+}