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

[bluegr]

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:
9fc1a19d9f SAGA: Remove dead code


Commit: 9fc1a19d9fe082858c657d676ed9948d613af1a5
    https://github.com/scummvm/scummvm/commit/9fc1a19d9fe082858c657d676ed9948d613af1a5
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-07-01T16:29:49+03:00

Commit Message:
SAGA: Remove dead code

Some of this code is for SAGA2 games and some is just unused

Changed paths:
    engines/saga/actor.h
    engines/saga/console.cpp
    engines/saga/detection.h
    engines/saga/interface.cpp
    engines/saga/saga.cpp
    engines/saga/scene.h


diff --git a/engines/saga/actor.h b/engines/saga/actor.h
index 4a8d6fbde7..812b8cb0d6 100644
--- a/engines/saga/actor.h
+++ b/engines/saga/actor.h
@@ -269,16 +269,6 @@ struct Location {
 		y = stream.readUint16LE();
 		z = stream.readUint16LE();
 	}
-
-#if 0
-	// Obsolete function, throws warnings in older versions of GCC
-	// (warning: int format, int32 arg)
-	// Keeping it around for debug purposes
-	void debugPrint(int debuglevel = 0, const char *loc = "Loc:") const {
-		debug(debuglevel, "%s %d, %d, %d", loc, x, y, z);
-	}
-#endif
-
 };
 
 class CommonObjectData {
diff --git a/engines/saga/console.cpp b/engines/saga/console.cpp
index 8ad7fd5aaa..3a916d191c 100644
--- a/engines/saga/console.cpp
+++ b/engines/saga/console.cpp
@@ -52,20 +52,6 @@ Console::Console(SagaEngine *vm) : GUI::Debugger() {
 	registerCmd("play_sound",	WRAP_METHOD(Console, cmdPlaySound));
 	registerCmd("play_voice",	WRAP_METHOD(Console, cmdPlayVoice));
 
-	// Game stuff
-
-#if 0
-	#define MAXPATH 512
-
-	// Register "g_language" cfg cvar
-	strncpy(GameModule.game_language, "us", MAXPATH);
-
-	CVAR_Register_S(GameModule.game_language, "g_language", NULL, CVAR_CFG, GAME_LANGSTR_LIMIT);
-
-	// Register "g_skipintro" cfg cvar
-	CVAR_Register_I(&GameModule.g_skipintro, "g_skipintro", NULL, CVAR_CFG, 0, 1);
-#endif
-
 	// Scene commands
 	registerCmd("current_scene",		WRAP_METHOD(Console, cmdCurrentScene));
 	registerCmd("current_chapter",	WRAP_METHOD(Console, cmdCurrentChapter));
diff --git a/engines/saga/detection.h b/engines/saga/detection.h
index 4d9aed08ac..3dbaeba6c9 100644
--- a/engines/saga/detection.h
+++ b/engines/saga/detection.h
@@ -84,10 +84,7 @@ enum GameFileTypes {
 	// IHNM specific
 	GAME_MUSICFILE_FM     = 1 << 8,    // IHNM
 	GAME_MUSICFILE_GM     = 1 << 9,    // IHNM, ITE Mac CD Guild
-	GAME_PATCHFILE        = 1 << 10,   // IHNM patch file (patch.re_/patch.res)
-	// SAGA 2 (Dinotopia, FTA2)
-	GAME_IMAGEFILE        = 1 << 11,   // Game images
-	GAME_OBJRESOURCEFILE  = 1 << 12    // Game object data
+	GAME_PATCHFILE        = 1 << 10    // IHNM patch file (patch.re_/patch.res)
 };
 
 struct SAGAGameDescription {
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index 06dfd6fef7..a167f8745e 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -124,23 +124,6 @@ Interface::Interface(SagaEngine *vm) : _vm(vm) {
 	ByteArray resourceData;
 	int i;
 
-#if 0
-	// FTA2 related test code
-
-	// TODO: this will probably have to be moved to a new class
-	// It's left here for now till the code differences are figured out
-	if (_vm->getGameId() == GID_FTA2) {
-		_interfaceContext = _vm->_resource->getContext(GAME_IMAGEFILE);
-		_vm->_resource->loadResource(_interfaceContext, 22, resource, resourceLength);	// Julian's portrait
-
-		_vm->decodeBGImage(resource, resourceLength, &_mainPanel.image,
-			&_mainPanel.imageLength, &_mainPanel.imageWidth, &_mainPanel.imageHeight);
-
-		free(resource);
-		return;
-	}
-#endif
-
 	// Load interface module resource file context
 	_interfaceContext = _vm->_resource->getContext(GAME_RESOURCEFILE);
 	if (_interfaceContext == NULL) {
diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp
index 727d803f17..b01b5541a1 100644
--- a/engines/saga/saga.cpp
+++ b/engines/saga/saga.cpp
@@ -128,12 +128,6 @@ SagaEngine::SagaEngine(OSystem *syst, const SAGAGameDescription *gameDesc)
 	// Mac CD Wyrmkeep
 	SearchMan.addSubDirectoryMatching(gameDataDir, "patch");
 
-	// Dinotopia
-	SearchMan.addSubDirectoryMatching(gameDataDir, "smack");
-
-	// FTA2
-	SearchMan.addSubDirectoryMatching(gameDataDir, "video");
-
 	_displayClip.left = _displayClip.top = 0;
 }
 
diff --git a/engines/saga/scene.h b/engines/saga/scene.h
index a9e1e3fad8..a3700004df 100644
--- a/engines/saga/scene.h
+++ b/engines/saga/scene.h
@@ -55,15 +55,6 @@ enum SceneFlags {
 	kSceneFlagShowCursor = 2
 };
 
-// FTA2 possible endings
-enum FTA2Endings {
-	kFta2BadEndingLaw = 0,
-	kFta2BadEndingChaos = 1,
-	kFta2GoodEnding1 = 2,
-	kFta2GoodEnding2 = 3,
-	kFta2BadEndingDeath = 4
-};
-
 struct BGInfo {
 	Rect bounds;
 	byte *buffer;
@@ -364,10 +355,6 @@ class Scene {
 	int ITEStartProc();
 	int IHNMStartProc();
 	int IHNMCreditsProc();
-	int DinoStartProc();
-	int FTA2StartProc();
-	int FTA2EndProc(FTA2Endings whichEnding);
-	void playMovie(const char *filename);
 
 	void IHNMLoadCutaways();
 	bool checkKey();
@@ -375,18 +362,6 @@ class Scene {
 	bool playTitle(int title, int time, int mode = kPanelVideo);
 	bool playLoopingTitle(int title, int seconds);
 
- public:
-	static int SC_IHNMIntroMovieProc1(int param, void *refCon);
-	static int SC_IHNMIntroMovieProc2(int param, void *refCon);
-	static int SC_IHNMIntroMovieProc3(int param, void *refCon);
-	static int SC_IHNMCreditsMovieProc(int param, void *refCon);
-
- private:
-	int IHNMIntroMovieProc1(int param);
-	int IHNMIntroMovieProc2(int param);
-	int IHNMIntroMovieProc3(int param);
-	int IHNMCreditsMovieProc(int param);
-
  public:
 	static int SC_ITEIntroAnimProc(int param, void *refCon);
 	static int SC_ITEIntroCave1Proc(int param, void *refCon);