Changeset 5476 in orxonox.OLD

Timestamp:

Nov 3, 2005, 2:27:25 PM (18 years ago)

Author:

patrick

Message:

orxonox/lib/event: also checked the other mouse buttons and removed the debug info

Location:

trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• lib/event/event_handler.cc (modified) (1 diff)
• lib/event/key_names.cc (modified) (2 diffs)

trunk/src/defs/debug.h

@@ -70 +70 @@
   // ENGINES
   #define DEBUG_MODULE_GRAPHICS              2
-  #define DEBUG_MODULE_EVENT                 4
+  #define DEBUG_MODULE_EVENT                 2
   #define DEBUG_MODULE_PHYSICS               2
   #define DEBUG_MODULE_GARBAGE_COLLECTOR     2

trunk/src/lib/event/event_handler.cc

@@ -279 +279 @@
         case SDL_MOUSEBUTTONUP:
           ev.bPressed = false;
-          ev.type = event.button.button + SDLK_LAST -1;
-          printf(">>>>>>>>>>type = %i\n", ev.type);
+          ev.type = event.button.button + SDLK_LAST - 1;
           break;
         case SDL_MOUSEBUTTONDOWN:
           ev.bPressed = true;
-          ev.type = event.button.button + SDLK_LAST -1;
+          ev.type = event.button.button + SDLK_LAST - 1;
           break;
         case SDL_JOYAXISMOTION:

trunk/src/lib/event/key_names.cc

@@ -25 +25 @@
 int buttonnameToSDLB(const char* name)
 {
-        if( !strcmp (name, "BUTTON_LEFT")) 
-          return EV_MOUSE_BUTTON_LEFT;
-        if( !strcmp (name, "BUTTON_MIDDLE")) return SDL_BUTTON_MIDDLE;
-        if( !strcmp (name, "BUTTON_RIGHT")) return SDL_BUTTON_RIGHT;
-        if( !strcmp (name, "BUTTON_WHEELUP")) return SDL_BUTTON_WHEELUP;
-        if( !strcmp (name, "BUTTON_WHEELDOWN")) return SDL_BUTTON_WHEELDOWN;
+        if( !strcmp (name, "BUTTON_LEFT")) return EV_MOUSE_BUTTON_LEFT;
+        if( !strcmp (name, "BUTTON_MIDDLE")) return EV_MOUSE_BUTTON_MIDDLE;
+        if( !strcmp (name, "BUTTON_RIGHT")) return EV_MOUSE_BUTTON_RIGHT;
+        if( !strcmp (name, "BUTTON_WHEELUP")) return EV_MOUSE_BUTTON_WHEELUP;
+        if( !strcmp (name, "BUTTON_WHEELDOWN")) return EV_MOUSE_BUTTON_WHEELDOWN;
         return -1;
 }
@@ -37 +36 @@
 {
         if( button == EV_MOUSE_BUTTON_LEFT) return "BUTTON_LEFT";
-        if( button == SDL_BUTTON_MIDDLE) return "BUTTON_MIDDLE";
-        if( button == SDL_BUTTON_RIGHT) return "BUTTON_RIGHT";
-        if( button == SDL_BUTTON_WHEELUP) return "BUTTON_WHEELUP";
-        if( button == SDL_BUTTON_WHEELDOWN) return "BUTTON_WHEELDOWN";
+        if( button == EV_MOUSE_BUTTON_MIDDLE) return "BUTTON_MIDDLE";
+        if( button == EV_MOUSE_BUTTON_RIGHT) return "BUTTON_RIGHT";
+        if( button == EV_MOUSE_BUTTON_WHEELUP) return "BUTTON_WHEELUP";
+        if( button == EV_MOUSE_BUTTON_WHEELDOWN) return "BUTTON_WHEELDOWN";
         return "UNKNOWN";
 }