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
gpu_neon: make enh. res. texturing hack optional
[pcsx_rearmed.git]
/
frontend
/
pl_gun_ts.c
diff --git
a/frontend/pl_gun_ts.c
b/frontend/pl_gun_ts.c
index
315c70c
..
6e7fa94
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
@@
-56,10
+54,10
@@
int pl_gun_ts_update_raw(struct tsdev *ts, int *x, int *y, int *p)
gun_y = (sy - ts_offs_y) * ts_multiplier_y >> 10;
limit(gun_x, 0, 1023);
limit(gun_y, 0, 1023);
gun_y = (sy - ts_offs_y) * ts_multiplier_y >> 10;
limit(gun_x, 0, 1023);
limit(gun_y, 0, 1023);
- if (sp
&& !(g_opts & OPT_TSGUN_NOTRIGGER)
)
- gun_in |=
GUNIN_TRIGGER
;
+ if (sp)
+ gun_in |=
1
;
else
else
- gun_in &= ~
GUNIN_TRIGGER
;
+ gun_in &= ~
1
;
}
}
}
}
@@
-80,7
+78,7
@@
void pl_gun_ts_update(struct tsdev *ts, int *x, int *y, int *in)
*x = gun_x;
*y = gun_y;
*x = gun_x;
*y = gun_y;
- *in = gun_in
| in_state_gun
;
+ *in = gun_in;
}
void pl_set_gun_rect(int x, int y, int w, int h)
}
void pl_set_gun_rect(int x, int y, int w, int h)