diff options
| author | Johannes Schickel | 2005-10-13 21:12:47 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2005-10-13 21:12:47 +0000 |
| commit | 7664cbcc7434ebd3e349b7ffc60b38381b7750d3 (patch) | |
| tree | 3f49713502342598bba9a1ca58a912f10a866730 /kyra/resource.cpp | |
| parent | eef92cb7e7f0e3fe39e1d468fabce58bfc8f6faf (diff) | |
| download | scummvm-rg350-7664cbcc7434ebd3e349b7ffc60b38381b7750d3.tar.gz scummvm-rg350-7664cbcc7434ebd3e349b7ffc60b38381b7750d3.tar.bz2 scummvm-rg350-7664cbcc7434ebd3e349b7ffc60b38381b7750d3.zip | |
Committed patch #1325945 ( KYRA: md5 game detection ) with a few changes
and added the story picture in the intro.
svn-id: r19068
Diffstat (limited to 'kyra/resource.cpp')
| -rw-r--r-- | kyra/resource.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kyra/resource.cpp b/kyra/resource.cpp index ce066dd842..e138c82b4f 100644 --- a/kyra/resource.cpp +++ b/kyra/resource.cpp @@ -30,7 +30,7 @@ Resource::Resource(KyraEngine* engine) { _engine = engine; // No PAK files in the demo version - if (_engine->game() == KYRA1DEMO) + if (_engine->features() & GF_DEMO) return; // prefetches all PAK Files @@ -63,9 +63,9 @@ Resource::Resource(KyraEngine* engine) { const char** usedFilelist = 0; - if (_engine->game() == KYRA1) + if (_engine->features() & GF_FLOPPY) usedFilelist = kyra1Filelist; - else if (_engine->game() == KYRA1CD) + else if (_engine->features() & GF_TALKIE) usedFilelist = kyra1CDFilelist; else error("no filelist found for this game"); @@ -155,7 +155,7 @@ uint8* Resource::fileData(const char* file, uint32* size) { if (!(*size)) continue; - + buffer = new uint8[*size]; assert(buffer); |