From 12d5b69ebc445030435965c9e2bc3d46c136f894 Mon Sep 17 00:00:00 2001 From: James Brown Date: Sun, 17 Feb 2002 10:50:34 +0000 Subject: [PATCH] Indy3 charset crash fix. svn-id: r3600 --- resource.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resource.cpp b/resource.cpp index 6764039bbf9..adae2dd4c02 100644 --- a/resource.cpp +++ b/resource.cpp @@ -24,7 +24,7 @@ /* Open a room */ void Scumm::openRoom(int room) { - uint room_offs; + uint room_offs, roomlimit; char buf[256]; debug(9, "openRoom(%d)",room); @@ -48,7 +48,8 @@ void Scumm::openRoom(int room) { #if REAL_CODE room_offs = _roomFileOffsets[room]; #else - if(_features & GF_EXTERNAL_CHARSET && room>=900) + if( _features & GF_SMALL_NAMES) roomlimit = 98; else roomlimit=900; + if(_features & GF_EXTERNAL_CHARSET && room>=roomlimit) room_offs = 0; else room_offs = room ? _roomFileOffsets[room] : 0;