TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Moved joy_*_handler declarations to joy.h - patch by Kp

Browse source
This commit is contained in:
zicodxx 2013-01-03 16:37:49 +01:00
parent f85e5def8d
commit 88de21684d
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.txt
View file

@ -8,6 +8,8 @@ editor/med.c: Deleted unnecessary drop-to-shell feature; commented out unused Re
main/bmread.c, main/hostage.c, main/piggy.h: Moved remove_char declaration to piggy.h - patch by Kp
main/multi.h, main/net_udp.c: Moved multi_* declarations to multi.h - patch by Kp
maths/rand.c: Included maths.h in rand.c to get d_rand prototype - patch by Kp
arch/include/joy.h, arch/sdl/event.c, arch/sdl/joy.c: Moved joy_*_handler declarations to joy.h - patch by Kp
20121102
--------

4
arch/include/joy.h
View file

@ -9,6 +9,7 @@
#include "pstypes.h"
#include "fix.h"
#include <SDL/SDL.h>
struct d_event;
@ -25,5 +26,8 @@ extern void joy_close();
extern void event_joystick_get_axis(struct d_event *event, int *axis, int *value);
extern void joy_flush();
extern int event_joystick_get_button(struct d_event *event);
extern void joy_button_handler(SDL_JoyButtonEvent *jbe);
extern void joy_hat_handler(SDL_JoyHatEvent *jhe);
extern int joy_axis_handler(SDL_JoyAxisEvent *jae);
#endif // _JOY_H

5
arch/sdl/event.c
View file

@ -15,14 +15,11 @@
#include "timer.h"
#include "config.h"
#include <SDL/SDL.h>
#include "joy.h"
extern void key_handler(SDL_KeyboardEvent *event);
extern void mouse_button_handler(SDL_MouseButtonEvent *mbe);
extern void mouse_motion_handler(SDL_MouseMotionEvent *mme);
extern void joy_button_handler(SDL_JoyButtonEvent *jbe);
extern void joy_hat_handler(SDL_JoyHatEvent *jhe);
extern int joy_axis_handler(SDL_JoyAxisEvent *jae);
extern void mouse_cursor_autohide();
static int initialised=0;

1
arch/sdl/joy.c
View file

@ -5,7 +5,6 @@
*/
#include <string.h> // for memset
#include <SDL/SDL.h>
#include "joy.h"
#include "error.h"