Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4864 in orxonox.OLD for orxonox


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed

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

    r4836 r4864  
    2121#include "key_mapper.h"
    2222
     23#include "globals.h"
    2324#include "ini_parser.h"
    2425#include "key_names.h"
    … …  
    7071  {&KeyMapper::PEV_FIRE1,                "Fire1"},
    7172  {&KeyMapper::PEV_FIRE2,                "Fire2"},
    72   {&KeyMapper::PEV_NEXT_WEAPON,          "Next"},
    73   {&KeyMapper::PEV_PREVIOUS_WEAPON,      "Prev"},
     73  {&KeyMapper::PEV_NEXT_WEAPON,          CONFIG_NAME_PLAYER_NEXT_WEAPON},
     74  {&KeyMapper::PEV_PREVIOUS_WEAPON,      CONFIG_NAME_PLAYER_PREV_WEAPON},
    7475
    7576

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

    r4862 r4864  
    291291   if (steal)
    292292     SDL_WM_GrabInput(SDL_GRAB_ON);
    293    else SDL_WM_GrabInput(SDL_GRAB_OFF);
     293   else
     294     SDL_WM_GrabInput(SDL_GRAB_OFF);
    294295#endif
    295296}

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

    r4862 r4864  
    175175  this->setAbsCoor(objX, objY, objZ);
    176176
    177 
     177  this->positioning();
    178178}
    179179
Note: See TracChangeset for help on using the changeset viewer.