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

Timestamp:

Dec 4, 2005, 3:34:36 PM (20 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

File:

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

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
 };