diff options
| author | Max Horn | 2003-04-28 13:16:37 +0000 |
|---|---|---|
| committer | Max Horn | 2003-04-28 13:16:37 +0000 |
| commit | e13e117976dda789d806818add34773dbdd57bb7 (patch) | |
| tree | 0730ccc72219317e59a8a222b45d00f87c1732fa /scumm | |
| parent | dc7446f46986d396a92566b9c561645bdfa00e65 (diff) | |
| download | scummvm-rg350-e13e117976dda789d806818add34773dbdd57bb7.tar.gz scummvm-rg350-e13e117976dda789d806818add34773dbdd57bb7.tar.bz2 scummvm-rg350-e13e117976dda789d806818add34773dbdd57bb7.zip | |
pedantic checks
svn-id: r7177
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/debugger.cpp | 2 | ||||
| -rw-r--r-- | scumm/resource.cpp | 4 |
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); |