diff blastem.c @ 195:c615061f7914

Fix 6-button controller emulation
author Mike Pavone <pavone@retrodev.com>
date Wed, 16 Jan 2013 22:50:02 -0800
parents 02e25abe2dcd
children 7c227a8ec53d
line wrap: on
line diff
--- a/blastem.c	Wed Jan 16 22:40:56 2013 -0800
+++ b/blastem.c	Wed Jan 16 22:50:02 2013 -0800
@@ -276,15 +276,15 @@
 		printf("io_data_read | control: %X, TH: %X, GAMEPAD_TH0: %X, GAMEPAD_TH1: %X, TH Counter: %d, Timeout: %d, Cycle: %d\n", control, th, pad->input[GAMEPAD_TH0], pad->input[GAMEPAD_TH1], pad->th_counter,pad->timeout_cycle, context->current_cycle);
 	}*/
 	if (th) {
-		if (pad->th_counter == 2) {
+		if (pad->th_counter == 3) {
 			input = pad->input[GAMEPAD_EXTRA];
 		} else {
 			input = pad->input[GAMEPAD_TH1];
 		}
 	} else {
-		if (pad->th_counter == 2) {
+		if (pad->th_counter == 3) {
 			input = pad->input[GAMEPAD_TH0] | 0xF;
-		} else if(pad->th_counter == 3) {
+		} else if(pad->th_counter == 4) {
 			input = pad->input[GAMEPAD_TH0]  & 0x30;
 		} else {
 			input = pad->input[GAMEPAD_TH0] | 0xC;