Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/gamestates3/src/external/ois/changes_orxonox.diff @ 8586

Last change on this file since 8586 was 5929, checked in by rgrieder, 15 years ago

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder ;)
  • Property svn:eol-style set to native
File size: 798 bytes

  • linux/EventHelpers.cpp

     
    3535# include <iostream>
    3636#endif
    3737
     38// Fixes for missing macros in input.h
     39#ifndef FF_EFFECT_MIN
     40#define FF_EFFECT_MIN FF_RUMBLE
     41#endif
     42#ifndef FF_EFFECT_MAX
     43#define FF_EFFECT_MAX FF_RAMP
     44#endif
     45#ifndef FF_WAVEFORM_MIN
     46#define FF_WAVEFORM_MIN FF_SQUARE
     47#endif
     48#ifndef FF_WAVEFORM_MAX
     49#define FF_WAVEFORM_MAX FF_CUSTOM
     50#endif
     51
    3852using namespace std;
    3953using namespace OIS;
    4054

  • win32/Win32ForceFeedback.cpp

     
    2525#include <Math.h>
    2626
    2727// 0 = No trace; 1 = Important traces; 2 = Debug traces
    28 #define OIS_WIN32_JOYFF_DEBUG 1
     28#define OIS_WIN32_JOYFF_DEBUG 0
    2929
    3030#if (defined (_DEBUG) || defined(OIS_WIN32_JOYFF_DEBUG))
    3131  #include <iostream>
Note: See TracBrowser for help on using the repository browser.