aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/debugger.cpp2
-rw-r--r--scumm/resource.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp
index 6118d03caa..7956943471 100644
--- a/scumm/debugger.cpp
+++ b/scumm/debugger.cpp
@@ -433,7 +433,7 @@ bool ScummDebugger::Cmd_ImportRes(int argc, const char** argv) {
uint32 size;
int resnum;
- if (argc < 3) {
+ if (argc != 3) {
Debug_Printf("Syntax: importres <restype> <filename> <resnum>\n");
return true;
}
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index ea83040139..c2726b74b7 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -1236,7 +1236,9 @@ void Scumm::nukeResource(int type, int idx) {
}
byte *Scumm::findResourceData(uint32 tag, byte *ptr) {
- if (_features & GF_SMALL_HEADER)
+ if (_features & GF_OLD_BUNDLE)
+ error("findResourceData must not be used in GF_OLD_BUNDLE games");
+ else if (_features & GF_SMALL_HEADER)
ptr = findResourceSmall(tag, ptr, 0);
else
ptr = findResource(tag, ptr, 0);