X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fpl_gun_ts.c;h=6e7fa9401950e9dc98d1dc1ab6e80331e60a2bb3;hb=HEAD;hp=315c70c108cba870ca68a21aa527ccef7a87c3e2;hpb=a76fd9535db9b36dd4d8f2e6bc9d804db807907f;p=pcsx_rearmed.git diff --git a/frontend/pl_gun_ts.c b/frontend/pl_gun_ts.c index 315c70c1..6e7fa940 100644 --- 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 "../plugins/dfinput/externals.h" -#include "../plugins/dfinput/main.h" #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); - if (sp && !(g_opts & OPT_TSGUN_NOTRIGGER)) - gun_in |= GUNIN_TRIGGER; + if (sp) + gun_in |= 1; 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; - *in = gun_in | in_state_gun; + *in = gun_in; } void pl_set_gun_rect(int x, int y, int w, int h)