Fixed recognition of input controls passed from the command line.

punesemu · Feb 17, 2024 · be0c260 · be0c260
1 parent b464c23
commit be0c260
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/src/core/jstick.c b/src/core/jstick.c
@@ -563,7 +563,13 @@ void js_jdev_update(_js *js, BYTE enable_decode, BYTE port_index) {
 					js->jdev = &jstick.jdd.devices[i];
 					js->inited = TRUE;
 					if (enable_decode) {
-						memcpy(p->input[JOYSTICK], JSJDEV->stdctrl, js_jdev_sizeof_stdctrl());
+						for (size_t btn = 0; btn < MAX_STD_PAD_BUTTONS ; btn++) {
+							if (js->stdctrl_from_cmdline[btn]) {
+								JSJDEV->stdctrl[btn] = js->stdctrl_from_cmdline[btn];
+								js->stdctrl_from_cmdline[btn] = 0;
+							}
+							p->input[JOYSTICK][btn] = JSJDEV->stdctrl[btn];
+						}
 						js->input_decode_event = pf->input_decode_event;
 					}
 					break;

diff --git a/src/core/jstick.h b/src/core/jstick.h
@@ -198,6 +198,7 @@ typedef struct _js {
 	BYTE inited;
 	thread_mutex_t lock;
 	_input_guid guid;
+	DBWORD stdctrl_from_cmdline[MAX_STD_PAD_BUTTONS];
 	void *jdev;
 	BYTE (*input_decode_event)(BYTE mode, BYTE autorepeat, DBWORD event, BYTE type, _port *prt);
 } _js;

diff --git a/src/core/main.c b/src/core/main.c
@@ -61,6 +61,7 @@ int main(int argc, char **argv) {
 	memset(&chrrom, 0x00, sizeof(chrrom));
 	memset(&wram, 0x00, sizeof(wram));
 	memset(&miscrom, 0x00, sizeof(miscrom));
+	memset(&jsp, 0x00, sizeof(jsp));
 
 	info.number_of_nes = 1;
 

diff --git a/src/gui/cmd_line.cpp b/src/gui/cmd_line.cpp
@@ -272,7 +272,7 @@ BYTE cmd_line_parse(int argc, uTCHAR **argv) {
 										port[range[r].port].input[KEYBOARD][i - range[r].start] =
 											settings_inp_wr_port((void *)&value, i, KEYBOARD);
 									} else if (type == "j") {
-										port[range[r].port].input[JOYSTICK][i - range[r].start] =
+										jsp[range[r].port].stdctrl_from_cmdline[i - range[r].start] =
 											settings_inp_wr_port((void *)&value, i, JOYSTICK);
 									}
 								}