diff options
| author | twinaphex | 2012-11-28 06:35:30 +0100 |
|---|---|---|
| committer | twinaphex | 2012-11-28 06:35:30 +0100 |
| commit | b194a2ecd43debbb3724e332b660b993725acd52 (patch) | |
| tree | a41deacfa7a6841e97d67fce60bb7f39b54b12be /plugins/dfinput/guncon.c | |
| parent | b6514bd168106e978a0af0f5043d5da6fd35800a (diff) | |
| parent | 06d2e1a58b6eb7fb449f79f7e807343bd8d39b59 (diff) | |
| download | pcsx_rearmed-b194a2ecd43debbb3724e332b660b993725acd52.tar.gz pcsx_rearmed-b194a2ecd43debbb3724e332b660b993725acd52.tar.bz2 pcsx_rearmed-b194a2ecd43debbb3724e332b660b993725acd52.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'plugins/dfinput/guncon.c')
| -rw-r--r-- | plugins/dfinput/guncon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/dfinput/guncon.c b/plugins/dfinput/guncon.c index b4f103c..981a757 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; |