X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfinput%2Fguncon.c;h=981a7574eaa9d6aec1c83db743046f35764e9d17;hp=b4f103cee39955acb2ac5fdd6eef70b6e0ef4a6a;hb=8f2bb0cbd20c00475196d1efb72103b65e57bc66;hpb=4c08b9e7dd350a48fc3e0515913d6ccc8b15e5ae diff --git a/plugins/dfinput/guncon.c b/plugins/dfinput/guncon.c index b4f103ce..981a7574 100644 --- a/plugins/dfinput/guncon.c +++ b/plugins/dfinput/guncon.c @@ -29,17 +29,17 @@ unsigned char PADpoll_guncon(unsigned char value) unsigned char PADstartPoll_guncon(int pad) { - int x, xn = 0, y = 0, in = 0, xres = 256; + int x, y, xn = 0, yn = 0, in = 0, xres = 256, yres = 240; CurByte = 0; buf[2] = buf[3] = 0xff; - pl_update_gun(&xn, &xres, &y, &in); + pl_update_gun(&xn, &yn, &xres, &yres, &in); // while y = const + line counter, what is x? // for 256 mode, hw dumped offsets x, y: 0x5a, 0x20 //x = 0x5a + (356 * xn >> 10); x = 0x5a - (xres - 256) / 3 + (((xres - 256) / 3 + 356) * xn >> 10); - y = 0x20 + y; + y = 0x20 + (yres * yn >> 10); if (in & GUNIN_TRIGGER) buf[3] &= ~0x20;