diff options
| author | Johannes Schickel | 2009-11-22 18:17:05 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-11-22 18:17:05 +0000 |
| commit | fa849494798c5df5f74d2895a6155093cd90b2cb (patch) | |
| tree | 0bb6e368701bd2a161964d07ab14e3d6ac60f16c /engines/kyra | |
| parent | d2d3a9a9eb821346632c46c26b0d750fea0d575e (diff) | |
| download | scummvm-rg350-fa849494798c5df5f74d2895a6155093cd90b2cb.tar.gz scummvm-rg350-fa849494798c5df5f74d2895a6155093cd90b2cb.tar.bz2 scummvm-rg350-fa849494798c5df5f74d2895a6155093cd90b2cb.zip | |
Remove dead code.
svn-id: r46092
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/resource.h | 3 | ||||
| -rw-r--r-- | engines/kyra/staticres.cpp | 35 |
2 files changed, 0 insertions, 38 deletions
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index 81987306e0..0081e96af6 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -427,9 +427,6 @@ private: 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, diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 0b3979f570..69ed6ea46f 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -925,41 +925,6 @@ void StaticResource::freeButtonDefs(void *&ptr, int &size) { } #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() { |