From d185cc58946922939e41aca7c6440804c83b2fae Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 3 Jul 2019 18:38:55 -0700
Subject: GLK: ALAN3: Remove adventureName variable

---
 engines/glk/alan3/args.cpp |  2 --
 engines/glk/alan3/args.h   |  1 -
 engines/glk/alan3/save.cpp | 16 ----------------
 3 files changed, 19 deletions(-)

(limited to 'engines')

diff --git a/engines/glk/alan3/args.cpp b/engines/glk/alan3/args.cpp
index 5ccf0fc134..5a590687aa 100644
--- a/engines/glk/alan3/args.cpp
+++ b/engines/glk/alan3/args.cpp
@@ -32,8 +32,6 @@ namespace Glk {
 namespace Alan3 {
 
 /* PUBLIC DATA */
-/* The files and filenames */
-char *adventureName;        /* The name of the game */
 char *adventureFileName;
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
diff --git a/engines/glk/alan3/args.h b/engines/glk/alan3/args.h
index 690f67566b..a80c8a4ab9 100644
--- a/engines/glk/alan3/args.h
+++ b/engines/glk/alan3/args.h
@@ -35,7 +35,6 @@ namespace Alan3 {
 #endif
 
 /* DATA */
-extern char *adventureName; /* The name of the game */
 extern char *adventureFileName;
 
 /* FUNCTIONS */
diff --git a/engines/glk/alan3/save.cpp b/engines/glk/alan3/save.cpp
index 935d08f7bd..6e645d0eb4 100644
--- a/engines/glk/alan3/save.cpp
+++ b/engines/glk/alan3/save.cpp
@@ -69,7 +69,6 @@ static void saveSets(Common::WriteStream *saveFile) {
 static void saveGameInfo(Common::WriteStream *saveFile) {
 	saveFile->writeUint32BE(MKTAG('A', 'S', 'A', 'V'));
 	saveFile->write(header->version, 4);
-	saveFile->write(adventureName, strlen(adventureName) + 1);
 	saveFile->writeUint32LE(header->uid);
 }
 
@@ -221,17 +220,6 @@ static void verifyGameId(CONTEXT, Common::SeekableReadStream *saveFile) {
 }
 
 
-/*----------------------------------------------------------------------*/
-static void verifyGameName(CONTEXT, Common::SeekableReadStream *saveFile) {
-	char savedName[256];
-	int i = 0;
-
-	while ((savedName[i++] = saveFile->readByte()) != '\0');
-	if (strcmp(savedName, adventureName) != 0)
-		error(context, M_SAVENAME);
-}
-
-
 /*----------------------------------------------------------------------*/
 static void verifyCompilerVersion(CONTEXT, Common::SeekableReadStream *saveFile) {
 	char savedVersion[4];
@@ -263,10 +251,6 @@ bool restoreGame(Common::SeekableReadStream *saveFile) {
 	verifyCompilerVersion(ctx, saveFile);
 	if (ctx._break) return false;
 
-	// Verify name of game 
-	verifyGameName(ctx, saveFile);
-	if (ctx._break) return false;
-
 	// Verify unique id of game
 	verifyGameId(ctx, saveFile);
 	if (ctx._break) return false;
-- 
cgit v1.2.3