notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cdrom: allow resetting with lid open
[pcsx_rearmed.git]
/
frontend
/
pl_gun_ts.c
diff --git
a/frontend/pl_gun_ts.c
b/frontend/pl_gun_ts.c
index
315c70c
..
6c05b7c
100644
(file)
--- a/
frontend/pl_gun_ts.c
+++ b/
frontend/pl_gun_ts.c
@@
-15,8
+15,6
@@
#include "plugin_lib.h"
#include "pl_gun_ts.h"
#include "menu.h"
#include "plugin_lib.h"
#include "pl_gun_ts.h"
#include "menu.h"
-#include "../plugins/dfinput/externals.h"
-#include "../plugins/dfinput/main.h"
#ifdef MAEMO
#define N900_TSMAX_X 4096
#ifdef MAEMO
#define N900_TSMAX_X 4096
@@
-57,9
+55,9
@@
int pl_gun_ts_update_raw(struct tsdev *ts, int *x, int *y, int *p)
limit(gun_x, 0, 1023);
limit(gun_y, 0, 1023);
if (sp && !(g_opts & OPT_TSGUN_NOTRIGGER))
limit(gun_x, 0, 1023);
limit(gun_y, 0, 1023);
if (sp && !(g_opts & OPT_TSGUN_NOTRIGGER))
- gun_in |=
GUNIN_TRIGGER
;
+ gun_in |=
1
;
else
else
- gun_in &= ~
GUNIN_TRIGGER
;
+ gun_in &= ~
1
;
}
}
}
}