[Scummvm-cvs-logs] SF.net SVN: scummvm:[46092] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 46092
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46092&view=rev
Author:   lordhoto
Date:     2009-11-22 18:17:05 +0000 (Sun, 22 Nov 2009)

Log Message:
-----------
Remove dead code.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/resource.h
    scummvm/trunk/engines/kyra/staticres.cpp

Modified: scummvm/trunk/engines/kyra/resource.h
===================================================================
--- scummvm/trunk/engines/kyra/resource.h	2009-11-22 18:16:25 UTC (rev 46091)
+++ scummvm/trunk/engines/kyra/resource.h	2009-11-22 18:17:05 UTC (rev 46092)
@@ -427,9 +427,6 @@
 	void freeButtonDefs(void *&ptr, int &size);
 #endif // ENABLE_LOL
 
-	const char *getFilename(const char *name);
-	Common::SeekableReadStream *getFile(const char *name);
-
 	enum ResTypes {
 		kStringList = 0,
 		kRawData = 1,

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2009-11-22 18:16:25 UTC (rev 46091)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2009-11-22 18:17:05 UTC (rev 46092)
@@ -925,41 +925,6 @@
 }
 #endif // ENABLE_LOL
 
-const char *StaticResource::getFilename(const char *name) {
-	static Common::String filename;
-
-	filename = name;
-
-	if (_vm->gameFlags().gameID == GI_KYRA2)
-		filename += ".K2";
-	else if (_vm->gameFlags().gameID == GI_KYRA3)
-		filename += ".K3";
-	else if (_vm->gameFlags().gameID == GI_LOL)
-		filename += ".LOL";
-
-	if (_vm->gameFlags().isTalkie && _vm->gameFlags().isDemo) {
-		filename += ".CD.DEM";
-		return filename.c_str();
-	}
-
-	if (_vm->gameFlags().isTalkie)
-		filename += ".CD";
-	else if (_vm->gameFlags().isDemo)
-		filename += ".DEM";
-	else if (_vm->gameFlags().platform == Common::kPlatformPC98 && (_vm->gameFlags().gameID == GI_KYRA1 || _vm->gameFlags().gameID == GI_LOL))
-		filename += ".98";
-	else if (_vm->gameFlags().platform == Common::kPlatformFMTowns || _vm->gameFlags().platform == Common::kPlatformPC98)
-		filename += ".TNS";
-	else if (_vm->gameFlags().platform == Common::kPlatformAmiga)
-		filename += ".AMG";
-
-	return filename.c_str();
-}
-
-Common::SeekableReadStream *StaticResource::getFile(const char *name) {
-	return _vm->resource()->createReadStream(getFilename(name));
-}
-
 #pragma mark -
 
 void KyraEngine_LoK::initStaticResource() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.