thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disable joystick input by default either command line or config file need to be used to enable it now, ability to choose joystick number to use also added

Browse source 
svn-id: r10518
This commit is contained in:
Jonathan Gray 2003-10-01 10:47:19 +00:00
parent 13773455a4
commit eecdf67c63
6 changed files with 38 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backends/sdl/sdl-common.h
View file

@ -117,7 +117,7 @@ public:
virtual int16 RGBToColor(uint8 r, uint8 g, uint8 b);
virtual void colorToRGB(int16 color, uint8 &r, uint8 &g, uint8 &b);
static OSystem *create(int gfx_mode, bool full_screenm, bool aspect_ratio);
static OSystem *create(int gfx_mode, bool full_screenm, bool aspect_ratio, int joystick_num);
protected:
OSystem_SDL_Common();
@ -125,7 +125,7 @@ protected:
static OSystem_SDL_Common *create_intern();
void init_intern(int gfx_mode, bool full_screen, bool aspect_ratio);
void init_intern(int gfx_mode, bool full_screen, bool aspect_ratio, int joystick_num);
// unseen game screen
SDL_Surface *_screen;
@ -229,7 +229,7 @@ protected:
void setup_icon();
void kbd_mouse();
void init_joystick() { _joystick = SDL_JoystickOpen(0); }
void init_joystick(int joystick_num) { _joystick = SDL_JoystickOpen(joystick_num); }
};
#endif