libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't try and manipulate invalid views (i.e. views with view ID -1/65535, which are most likely the currently missing dynamically constructed text views). Torin chapter 1 starts now (and dies shortly afterwards, but that's a different issue)

Browse Source 
svn-id: r47930
This commit is contained in:
Filippos Karapetis 2010-02-06 15:58:59 +00:00
parent 742ddb7979
commit b12437bbfc
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/sci/graphics/compare.cpp
View File

@ -116,6 +116,9 @@ void GfxCompare::kernelSetNowSeen(reg_t objectReference) {
GfxView *view = NULL;
Common::Rect celRect(0, 0);
GuiResourceId viewId = (GuiResourceId)GET_SEL32V(_segMan, objectReference, SELECTOR(view));
if (viewId == 0xFFFF) // invalid view
return;
int16 loopNo = GET_SEL32V(_segMan, objectReference, SELECTOR(loop));
int16 celNo = GET_SEL32V(_segMan, objectReference, SELECTOR(cel));
int16 x = (int16)GET_SEL32V(_segMan, objectReference, SELECTOR(x));
@ -182,6 +185,9 @@ void GfxCompare::kernelBaseSetter(reg_t object) {
int16 loopNo = GET_SEL32V(_segMan, object, SELECTOR(loop));
int16 celNo = GET_SEL32V(_segMan, object, SELECTOR(cel));
if (viewId == 0xFFFF) // invalid view
return;
GfxView *tmpView = _cache->getView(viewId);
Common::Rect celRect;