[Scummvm-git-logs] scummvm master -> 9bb72735ff2c81cc3d51f974a0192684de016c8b

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9bb72735ff AMIGAOS: Enhance stack cookie and set more default .ini values


Commit: 9bb72735ff2c81cc3d51f974a0192684de016c8b
    https://github.com/scummvm/scummvm/commit/9bb72735ff2c81cc3d51f974a0192684de016c8b
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-05-04T00:19:03+02:00

Commit Message:
AMIGAOS: Enhance stack cookie and set more default .ini values

Changed paths:
    backends/platform/sdl/amigaos/amigaos-main.cpp
    backends/platform/sdl/amigaos/amigaos.cpp


diff --git a/backends/platform/sdl/amigaos/amigaos-main.cpp b/backends/platform/sdl/amigaos/amigaos-main.cpp
index 7a5dddf6772..93e9a5d4410 100644
--- a/backends/platform/sdl/amigaos/amigaos-main.cpp
+++ b/backends/platform/sdl/amigaos/amigaos-main.cpp
@@ -57,7 +57,7 @@ int main(int argc, char *argv[]) {
 	}
 
 	// Set a stack cookie to avoid crashes from a too low stack.
-	static const char *stack_cookie __attribute__((used)) = "$STACK: 2048000";
+	static const char *stack_cookie __attribute__((used)) = "$STACK: 4096000";
 
 	// Create our OSystem instance.
 	g_system = new OSystem_AmigaOS();
diff --git a/backends/platform/sdl/amigaos/amigaos.cpp b/backends/platform/sdl/amigaos/amigaos.cpp
index ca3e99af216..42664321527 100644
--- a/backends/platform/sdl/amigaos/amigaos.cpp
+++ b/backends/platform/sdl/amigaos/amigaos.cpp
@@ -123,6 +123,9 @@ void OSystem_AmigaOS::initBackend() {
 	ConfMan.registerDefault("gui_theme", "scummremastered");
 	ConfMan.registerDefault("gui_scale", "125");
 	ConfMan.registerDefault("extrapath", Common::Path("extras/"));
+	ConfMan.registerDefault("iconspath", Common::Path("icons/"));
+	ConfMan.registerDefault("pluginspath", Common::Path("plugins/"));
+	ConfMan.registerDefault("savepath", Common::Path("saves/"));
 	ConfMan.registerDefault("themepath", Common::Path("themes/"));
 	// First time .ini defaults
 	if (!ConfMan.hasKey("audio_buffer_size")) {
@@ -149,6 +152,15 @@ void OSystem_AmigaOS::initBackend() {
 	if (!ConfMan.hasKey("extrapath")) {
 		ConfMan.setPath("extrapath", "extras/");
 	}
+	if (!ConfMan.hasKey("iconspath")) {
+		ConfMan.setPath("iconspath", "icons/");
+	}
+	if (!ConfMan.hasKey("pluginspath")) {
+		ConfMan.setPath("pluginspath", "plugins/");
+	}
+	if (!ConfMan.hasKey("savepath")) {
+		ConfMan.setPath("savepath", "saves/");
+	}
 	if (!ConfMan.hasKey("themepath")) {
 		ConfMan.setPath("themepath", "themes/");
 	}