[Scummvm-git-logs] scummvm master -> 4e0ad1b33719f31828046ee1590bffcf0ce19bb5

[dreammaster]

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

Summary:
4e0ad1b337 MADS: FOREST: Use ScummVM save filenames in original dialog. Bug #17288


Commit: 4e0ad1b33719f31828046ee1590bffcf0ce19bb5
    https://github.com/scummvm/scummvm/commit/4e0ad1b33719f31828046ee1590bffcf0ce19bb5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-10-07T17:04:41+11:00

Commit Message:
MADS: FOREST: Use ScummVM save filenames in original dialog. Bug #17288

Changed paths:
    engines/mads/core/game.cpp
    engines/mads/core/game.h
    engines/mads/dragonsphere/main.cpp
    engines/mads/forest/main.cpp
    engines/mads/nebular/main.cpp
    engines/mads/phantom/main.cpp


diff --git a/engines/mads/core/game.cpp b/engines/mads/core/game.cpp
index 3a581c06910..b59a4634bf5 100644
--- a/engines/mads/core/game.cpp
+++ b/engines/mads/core/game.cpp
@@ -107,7 +107,6 @@ void (*debugger_update)() = NULL;     /* Debugger update routine */
 int selected_intro = false;
 long correction_clock;
 
-char save_game_key[8];
 char restart_game_key[40];
 char save_game_buf[20];
 
@@ -414,9 +413,8 @@ static void game_fix_save_name() {
 }
 
 void game_save_name(int id) {
-	Common::strcpy_s(save_game_buf, save_game_key);
-	env_catint(save_game_buf, id, 3);
-	game_fix_save_name();
+	Common::String name = g_engine->getSaveStateName(id);
+	Common::strcpy_s(save_game_buf, name.c_str());
 }
 
 static void game_player_status() {
@@ -2627,7 +2625,6 @@ void init_game() {
 	debugger_update = NULL;
 	selected_intro = false;
 	correction_clock = 0;
-	memset(save_game_key, 0, sizeof(save_game_key));
 	memset(restart_game_key, 0, sizeof(restart_game_key));
 	memset(save_game_buf, 0, sizeof(save_game_buf));
 	last_keypressed = -1;
diff --git a/engines/mads/core/game.h b/engines/mads/core/game.h
index 54dd866c22e..5fd59a87466 100644
--- a/engines/mads/core/game.h
+++ b/engines/mads/core/game.h
@@ -185,7 +185,6 @@ extern long correction_clock;
 
 
 extern char config_file_name[20];
-extern char save_game_key[8];
 extern char restart_game_key[40];
 extern char save_game_buf[20];
 extern int last_keypressed;
diff --git a/engines/mads/dragonsphere/main.cpp b/engines/mads/dragonsphere/main.cpp
index 068dca0cfcf..3502c1276ce 100644
--- a/engines/mads/dragonsphere/main.cpp
+++ b/engines/mads/dragonsphere/main.cpp
@@ -130,7 +130,6 @@ static void main_cold_data_init() {
 	game.difficulty = g_engine->isDemo() ? 0 : -1;
 
 	Common::strcpy_s(config_file_name, "config.dra");
-	Common::strcpy_s(save_game_key, "drag");
 	Common::strcpy_s(restart_game_key, "dragon");
 
 	Common::strcpy_s(player.series_name, "RAL");
diff --git a/engines/mads/forest/main.cpp b/engines/mads/forest/main.cpp
index 508ab3d109a..96819a02065 100644
--- a/engines/mads/forest/main.cpp
+++ b/engines/mads/forest/main.cpp
@@ -54,7 +54,6 @@ static void main_cold_data_init() {
 	game_emergency_save = global_emergency_save;
 
 	Common::strcpy_s(config_file_name, "config.for");
-	Common::strcpy_s(save_game_key, "oauf");
 	Common::strcpy_s(restart_game_key, "oauf");
 
 	Common::strcpy_s(player.series_name, "B");
diff --git a/engines/mads/nebular/main.cpp b/engines/mads/nebular/main.cpp
index 2cb427817a6..08e96f720a9 100644
--- a/engines/mads/nebular/main.cpp
+++ b/engines/mads/nebular/main.cpp
@@ -224,7 +224,6 @@ static void main_cold_data_init() {
 	game_emergency_save = global_emergency_save;
 
 	Common::strcpy_s(config_file_name, "config.rex");
-	Common::strcpy_s(save_game_key, "rex");
 	Common::strcpy_s(restart_game_key, "rex");
 
 	*player.series_name = '\0';
diff --git a/engines/mads/phantom/main.cpp b/engines/mads/phantom/main.cpp
index 897e266b4cd..22490b7f636 100644
--- a/engines/mads/phantom/main.cpp
+++ b/engines/mads/phantom/main.cpp
@@ -147,7 +147,6 @@ static void main_cold_data_init() {
 	game_emergency_save = global_emergency_save;
 
 	Common::strcpy_s(config_file_name, "config.pha");
-	Common::strcpy_s(save_game_key, "phan");
 	Common::strcpy_s(restart_game_key, "phantom");
 
 	Common::strcpy_s(player.series_name, "RAL");