[Scummvm-cvs-logs] SF.net SVN: scummvm: [23421] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sat Jul 8 14:23:51 CEST 2006
Revision: 23421
Author: lordhoto
Date: 2006-07-08 05:23:44 -0700 (Sat, 08 Jul 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23421&view=rev
Log Message:
-----------
Adds a message dialog if kyra.dat is missing which tells the user to download the kyra.dat file.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra.cpp
scummvm/trunk/engines/kyra/resource.cpp
scummvm/trunk/engines/kyra/staticres.cpp
Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp 2006-07-08 11:42:07 UTC (rev 23420)
+++ scummvm/trunk/engines/kyra/kyra.cpp 2006-07-08 12:23:44 UTC (rev 23421)
@@ -177,12 +177,12 @@
}
_sound->setVolume(255);
- _res = new Resource(this);
- assert(_res);
_screen = new Screen(this, _system);
assert(_screen);
if (!_screen->init())
error("_screen->init() failed");
+ _res = new Resource(this);
+ assert(_res);
_sprites = new Sprites(this, _system);
assert(_sprites);
_seq = new SeqPlayer(this, _system);
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp 2006-07-08 11:42:07 UTC (rev 23420)
+++ scummvm/trunk/engines/kyra/resource.cpp 2006-07-08 12:23:44 UTC (rev 23421)
@@ -23,6 +23,9 @@
#include "common/stdafx.h"
#include "common/endian.h"
#include "common/file.h"
+
+#include "gui/message.h"
+
#include "kyra/resource.h"
#include "kyra/script.h"
#include "kyra/wsamovie.h"
@@ -118,10 +121,10 @@
if (_engine->game() == GI_KYRA1) {
/*if (_engine->features() & GF_AMIGA)
usedFilelist = kyra1AmigaFilelist;
- else*/ if (_engine->features() & GF_FLOPPY)
- usedFilelist = kyra1Filelist;
- else if (_engine->features() & GF_TALKIE)
- usedFilelist = kyra1CDFilelist;
+ else*/ if (_engine->features() & GF_FLOPPY)
+ usedFilelist = kyra1Filelist;
+ else if (_engine->features() & GF_TALKIE)
+ usedFilelist = kyra1CDFilelist;
} else if (_engine->game() == GI_KYRA2) {
// TODO: add kyra2 floppy file list
usedFilelist = kyra2CDFilelist;
@@ -132,6 +135,8 @@
// we're loading KYRA.DAT here too (but just for Kyrandia 1)
if (_engine->game() == GI_KYRA1) {
if (!loadPakFile("KYRA.DAT")) {
+ GUI::MessageDialog errorMsg("You're missing the 'KYRA.DAT' file, get it from the ScummVM website");
+ errorMsg.runModal();
error("couldn't open Kyrandia resource file ('KYRA.DAT') make sure you got one file for your version");
}
}
@@ -171,7 +176,9 @@
if (isInPakList(filename))
return true;
PAKFile *file = new PAKFile(filename.c_str());
- if (!file) {
+ if (!file)
+ return false;
+ if (!file->isValid()) {
warning("couldn't load file: '%s'", filename.c_str());
return false;
}
Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp 2006-07-08 11:42:07 UTC (rev 23420)
+++ scummvm/trunk/engines/kyra/staticres.cpp 2006-07-08 12:23:44 UTC (rev 23421)
@@ -149,7 +149,8 @@
int tempSize = 0;
uint8 *temp = getFile("INDEX", tempSize);
if (!temp) {
- error("no matching INDEX file found");
+ warning("no matching INDEX file found");
+ return false;
}
uint32 version = READ_BE_UINT32(temp);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list