diff options
| author | Norbert Lange | 2009-08-24 17:51:47 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-24 17:51:47 +0000 |
| commit | 917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5 (patch) | |
| tree | e652563203a00f8acecfaafbf93c64dbfbd13f25 /engines/made/resource.cpp | |
| parent | 5f87d5090cfcb34cda3c1f5d430e0865344d7366 (diff) | |
| parent | dd7868acc2512c9761d892e67a4837f4dc38bdc0 (diff) | |
| download | scummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.tar.gz scummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.tar.bz2 scummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.zip | |
Merge with trunk
svn-id: r43701
Diffstat (limited to 'engines/made/resource.cpp')
| -rw-r--r-- | engines/made/resource.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/made/resource.cpp b/engines/made/resource.cpp index c7d15dae73..72aa006c68 100644 --- a/engines/made/resource.cpp +++ b/engines/made/resource.cpp @@ -525,7 +525,10 @@ bool ResourceReader::loadResource(ResourceSlot *slot, byte *&buffer, uint32 &siz ResourceSlot *ResourceReader::getResourceSlot(uint32 resType, uint index) { ResourceSlots *slots = _resSlots[resType]; - assert(slots); + + if (!slots) + return NULL; + if (index >= 1 && index < slots->size()) { return &(*slots)[index]; } else { |