#787: Use Default for Joystick mode in whdload booter

BlitterStudio · Apr 5, 2021 · 724f561 · 724f561
1 parent 5085931
commit 724f561
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/include/options.h b/src/include/options.h
@@ -100,7 +100,7 @@ struct inputdevconfig
 struct jport
 {
 	int id{};
-	int mode{}; // 0=def,1=mouse,2=joy,3=anajoy,4=lightpen
+	int mode{}; // 0=default,1=wheel mouse,2=mouse,3=joystick,4=gamepad,5=analog joystick,6=cdtv,7=cd32
 	int submode;
 	int autofire{};
 	struct inputdevconfig idc{};

diff --git a/src/osdep/amiberry_whdbooter.cpp b/src/osdep/amiberry_whdbooter.cpp
@@ -244,7 +244,7 @@ void symlink_roms(struct uae_prefs* prefs)
 void cd_auto_prefs(struct uae_prefs* prefs, char* filepath)
 {
 	TCHAR game_name[MAX_DPATH];
-	TCHAR* txt2 = nullptr;
+	TCHAR* txt2;
 	TCHAR tmp[MAX_DPATH];
 	char config_path[MAX_DPATH];
 	char whd_config[255];
@@ -782,9 +782,9 @@ void whdload_auto_prefs(struct uae_prefs* prefs, char* filepath)
 
 	// JOY
 	if (strcmpi(game_detail.port0, "joy") == 0)
-		prefs->jports[0].mode = 3;
+		prefs->jports[0].mode = 0;
 	if (strcmpi(game_detail.port1, "joy") == 0)
-		prefs->jports[1].mode = 3;
+		prefs->jports[1].mode = 0;
 
 	// MOUSE
 	if (strcmpi(game_detail.port0, "mouse") == 0)