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

Timestamp:

Dec 4, 2005, 3:34:36 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/spaceshipControll back to the trunk:
merged with command:
svn merge -r5835:HEAD branches/spaceshipcontroll trunk
conflicts resolved with dynamic indentation methodology algorithms

Location:

trunk/src/lib/event

Files:

• key_mapper.cc (modified) (2 diffs)
• key_mapper.h (modified) (2 diffs)

trunk/src/lib/event/key_mapper.cc

@@ -21 +21 @@
 #include "key_mapper.h"
 
+#include "event_def.h"
+
 #include "globals.h"
 #include "ini_parser.h"
 #include "key_names.h"
 #include "debug.h"
+
 
 using namespace std;
@@ -191 +194 @@
       {
         if( index[0] == 0)
-        {
+        {
           *map[i].pValue = index[1];
           PRINTF(4)("Mapping %s to '%s' (id %i)\n", name, SDLKToKeyname(index[1]), index[1]);
           break;
-        }
-        else { 
+        }
+        else {
           *map[i].pValue = index[1];
           PRINTF(4)("Mapping %s to '%s' (id %i)\n", name, SDLBToButtonname(index[1]), index[1]);
           break;
-        }
+        }
       }
     }

trunk/src/lib/event/key_mapper.h

@@ -10 +10 @@
 
 #include "base_object.h"
-#include "event_def.h"
+//#include "event_def.h"
 
 class IniParser;
@@ -66 +66 @@
 
  private:
-  Sint32     coord[2];              //!< temp place to save variables in nameToIndex() function
+  int         coord[2];              //!< temp place to save variables in nameToIndex() function
 };