Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jun 20, 2006, 1:39:01 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8230:HEAD https://svn.orxonox.net/orxonox/branches/network .
conflicts resolved in favour of the network branche (conflicts were in network)

Location:
trunk/src/lib/event
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/event/event_handler.cc

    r8619 r8623  
    503503
    504504
     505int EventHandler::releaseMouse(void* p)
     506{
     507  SDL_WM_GrabInput(SDL_GRAB_OFF);
     508  SDL_ShowCursor(SDL_DISABLE);
     509  return 0;
     510}
     511
     512
    505513/**
    506514 * @param state The State to get the Name of.
  • trunk/src/lib/event/event_handler.h

    r8148 r8623  
    5656  static elState StringToELState(const std::string& stateName);
    5757
     58  static int releaseMouse(void* p);
     59
    5860private:
    5961  EventHandler();
Note: See TracChangeset for help on using the changeset viewer.