libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 14:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed regression: CINE games crashed when a message box appeared (patch by next_ghost)

Browse Source 
svn-id: r31696
This commit is contained in:
Filippos Karapetis 2008-04-24 17:32:24 +00:00
parent 103e944fa4
commit 5cf618937f
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/cine/various.cpp
View File

@ -1748,14 +1748,15 @@ void drawMessage(const char *messagePtr, int16 x, int16 y, int16 width, int16 co
void drawDialogueMessage(byte msgIdx, int16 x, int16 y, int16 width, int16 color) {
if (msgIdx >= messageTable.size()) {
removeOverlay(msgIdx, 2);
// removeOverlay(msgIdx, 2);
return;
}
_messageLen += messageTable[msgIdx].size();
drawMessage(messageTable[msgIdx].c_str(), x, y, width, color);
removeOverlay(msgIdx, 2);
// this invalidates the iterator in drawOverlays()
// removeOverlay(msgIdx, 2);
}
void drawFailureMessage(byte cmd) {
@ -1777,7 +1778,8 @@ void drawFailureMessage(byte cmd) {
drawMessage(messagePtr, x, y, width, color);
removeOverlay(cmd, 3);
// this invalidates the iterator in drawOverlays()
// removeOverlay(cmd, 3);
}
void drawOverlays(void) {
@ -1901,6 +1903,14 @@ void drawOverlays(void) {
break;
}
}
for (it = overlayList.begin(); it != overlayList.end(); ) {
if (it->type == 2 || it->type == 3) {
it = overlayList.erase(it);
} else {
++it;
}
}
}
uint16 processKeyboard(uint16 param) {