diff options
| -rw-r--r-- | engines/lab/engine.cpp | 6 | ||||
| -rw-r--r-- | engines/lab/labfile.cpp | 1 | ||||
| -rw-r--r-- | engines/lab/resource.cpp | 7 |
3 files changed, 13 insertions, 1 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp index edf23f307a..7af3719ae7 100644 --- a/engines/lab/engine.cpp +++ b/engines/lab/engine.cpp @@ -230,6 +230,9 @@ bool LabEngine::setUpScreens() { /* Loads in the graphics for the movement control panel */ Common::File file; file.open(translateFileName("P:Control")); + if (!file.isOpen()) + warning("setUpScreens couldn't open %s", translateFileName("P:Control")); + if (file.err() || file.size() == 0) return false; @@ -290,6 +293,9 @@ bool LabEngine::setUpScreens() { } file.open(translateFileName("P:Inv")); + if (!file.isOpen()) + warning("setUpScreens couldn't open %s", translateFileName("P:Inv")); + if (file.err() || file.size() == 0) return false; diff --git a/engines/lab/labfile.cpp b/engines/lab/labfile.cpp index fb6b17e759..31d10905d1 100644 --- a/engines/lab/labfile.cpp +++ b/engines/lab/labfile.cpp @@ -289,6 +289,7 @@ Common::File *openPartial(const char *name) { f->open(translateFileName(name)); if (!f->isOpen()) { + warning("openPartial skipped %s", translateFileName(name)); delete f; return 0; } diff --git a/engines/lab/resource.cpp b/engines/lab/resource.cpp index 180152e218..2f11515db2 100644 --- a/engines/lab/resource.cpp +++ b/engines/lab/resource.cpp @@ -48,6 +48,8 @@ Resource::Resource() { void Resource::readStaticText() { Common::File labTextFile; labTextFile.open(translateFileName("Lab:Rooms/LabText")); + if (!labTextFile.isOpen()) + error("Unable to open file %s (Lab:Rooms/LabText)", translateFileName("Lab:Rooms/LabText")); for (int i = 0; i < 48; i++) _staticText[i] = labTextFile.readLine(); @@ -151,9 +153,12 @@ bool Resource::readViews(uint16 roomNum) { Common::File *Resource::openDataFile(const char *fileName, uint32 fileHeader) { Common::File *dataFile = new Common::File(); dataFile->open(translateFileName(fileName)); + if (!dataFile->isOpen()) + error("openDataFile couldn't open %s (%s)", translateFileName(fileName), fileName); + if (dataFile->readUint32BE() != fileHeader) { dataFile->close(); - return NULL; + return nullptr; } return dataFile; |