diff options
| author | Florian Kagerer | 2008-05-12 13:35:58 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2008-05-12 13:35:58 +0000 |
| commit | 771854bdd93581b1d7898c7ff0abdfc54d67780a (patch) | |
| tree | a1953b16dd1cb80967c606da9207e2d9200c9d07 /engines/kyra/resource.cpp | |
| parent | 4db0bd90465fe74252d8a35751856991b31f7788 (diff) | |
| download | scummvm-rg350-771854bdd93581b1d7898c7ff0abdfc54d67780a.tar.gz scummvm-rg350-771854bdd93581b1d7898c7ff0abdfc54d67780a.tar.bz2 scummvm-rg350-771854bdd93581b1d7898c7ff0abdfc54d67780a.zip | |
move some kyra 3 static resources to kyra.dat
svn-id: r32058
Diffstat (limited to 'engines/kyra/resource.cpp')
| -rw-r--r-- | engines/kyra/resource.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index 58756ca430..9d34c669a1 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -53,13 +53,11 @@ bool Resource::reset() { if (!dir.exists() || !dir.isDirectory()) error("invalid game path '%s'", dir.getPath().c_str()); - if (_vm->game() != GI_KYRA3) { - if (!loadPakFile(StaticResource::staticDataFilename()) || !StaticResource::checkKyraDat()) { - Common::String errorMessage = "You're missing the '" + StaticResource::staticDataFilename() + "' file or it got corrupted, (re)get it from the ScummVM website"; - ::GUI::MessageDialog errorMsg(errorMessage); - errorMsg.runModal(); - error(errorMessage.c_str()); - } + if (!loadPakFile(StaticResource::staticDataFilename()) || !StaticResource::checkKyraDat()) { + Common::String errorMessage = "You're missing the '" + StaticResource::staticDataFilename() + "' file or it got corrupted, (re)get it from the ScummVM website"; + ::GUI::MessageDialog errorMsg(errorMessage); + errorMsg.runModal(); + error(errorMessage.c_str()); } if (_vm->game() == GI_KYRA1) { |