bugfix: fixed crash on startup on x86_64 platform

BlitterStudio · Nov 1, 2023 · 9e69a80 · 9e69a80
1 parent e0ed44d
commit 9e69a80
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/osdep/amiberry_input.cpp b/src/osdep/amiberry_input.cpp
@@ -50,7 +50,7 @@ static void fixbuttons(struct didata* did)
 	write_log(_T("'%s' has no buttons, adding single default button\n"), did->name.c_str());
 	did->buttonmappings[0] = 0;
 	did->buttonsort[0] = 0;
-	did->buttonname[0] ="Button";
+	did->buttonname[0] = "Button";
 	did->buttons++;
 }
 

diff --git a/src/osdep/amiberry_input.h b/src/osdep/amiberry_input.h
@@ -1,7 +1,11 @@
 #pragma once
 #include "options.h"
 
+#ifdef AMIBERRY
+#define MAX_MAPPINGS 128
+#else
 #define MAX_MAPPINGS 256
+#endif
 
 #define AXISTYPE_NORMAL 0
 #define AXISTYPE_POV_X 1
@@ -49,18 +53,18 @@ struct didata {
 	uae_s16 axles{};
 	uae_s16 buttons{}, buttons_real{};
 
-	uae_s16 axismappings[MAX_MAPPINGS]{};
-	std::string axisname[MAX_MAPPINGS]{};
-	uae_s16 axissort[MAX_MAPPINGS]{};
-	uae_s16 axistype[MAX_MAPPINGS]{};
+	std::array<uae_s16, MAX_MAPPINGS> axismappings;
+	std::array<std::string, MAX_MAPPINGS> axisname;
+	std::array<uae_s16, MAX_MAPPINGS> axissort;
+	std::array<uae_s16, MAX_MAPPINGS> axistype;
 	bool analogstick{};
 
-	uae_s16 buttonmappings[MAX_MAPPINGS]{};
-	std::string buttonname[MAX_MAPPINGS]{};
-	uae_s16 buttonsort[MAX_MAPPINGS]{};
-	uae_s16 buttonaxisparent[MAX_MAPPINGS]{};
-	uae_s16 buttonaxisparentdir[MAX_MAPPINGS]{};
-	uae_s16 buttonaxistype[MAX_MAPPINGS]{};
+	std::array<uae_s16, MAX_MAPPINGS> buttonmappings;
+	std::array<std::string, MAX_MAPPINGS> buttonname;
+	std::array<uae_s16, MAX_MAPPINGS> buttonsort;
+	std::array<uae_s16, MAX_MAPPINGS> buttonaxisparent;
+	std::array<uae_s16, MAX_MAPPINGS> buttonaxisparentdir;
+	std::array<uae_s16, MAX_MAPPINGS> buttonaxistype;
 };
 
 //Analog joystick dead zone