Changeset 4864 in orxonox.OLD

Timestamp:

Jul 14, 2005, 3:40:48 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merging minor nice fixes from laptop

Location:

orxonox/trunk/src

Files:

• lib/event/key_mapper.cc (modified) (2 diffs)
• lib/graphics/graphics_engine.cc (modified) (1 diff)
• world_entities/weapons/crosshair.cc (modified) (1 diff)

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

@@ -21 +21 @@
 #include "key_mapper.h"
 
+#include "globals.h"
 #include "ini_parser.h"
 #include "key_names.h"
@@ -70 +71 @@
   {&KeyMapper::PEV_FIRE1,                "Fire1"},
   {&KeyMapper::PEV_FIRE2,                "Fire2"},
-  {&KeyMapper::PEV_NEXT_WEAPON,          "Next"},
-  {&KeyMapper::PEV_PREVIOUS_WEAPON,      "Prev"},
+  {&KeyMapper::PEV_NEXT_WEAPON,          CONFIG_NAME_PLAYER_NEXT_WEAPON},
+  {&KeyMapper::PEV_PREVIOUS_WEAPON,      CONFIG_NAME_PLAYER_PREV_WEAPON},
 
 

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -291 +291 @@
    if (steal)
      SDL_WM_GrabInput(SDL_GRAB_ON);
-   else SDL_WM_GrabInput(SDL_GRAB_OFF);
+   else
+     SDL_WM_GrabInput(SDL_GRAB_OFF);
 #endif
 }

orxonox/trunk/src/world_entities/weapons/crosshair.cc

@@ -175 +175 @@
   this->setAbsCoor(objX, objY, objZ);
 
-
+  this->positioning();
 }