Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-08-08 12:25:22 +00:00
Code Issues Projects Releases Wiki Activity

fix menu masking

Browse Source
This commit is contained in:
Jesús A. Álvarez
2019-11-05 21:50:02 +01:00
parent f32c6b66e0
commit 6f453b6184
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
BasiliskII/src/SDL/video_rootless.cpp
View File

@@ -246,13 +246,14 @@ static void MaskMenus(uint32 expandMem, uint32 lowMemPtr, std::vector<SDL_Rect>
return;
}
inMenuSelect = true;
uint16 mbEntryOffset = ReadMacInt16(mbSaveLoc);
if (lastMenuEntry == menuEntries && *lastMenuEntry == 0) {
if (mbEntryOffset == 0) {
inMenuSelect = false;
return;
} else if (lastMenuEntry == menuEntries && *lastMenuEntry == 0) {
// first menu
*lastMenuEntry = mbEntryOffset;
} else if (mbEntryOffset > *lastMenuEntry) {
} else if (mbEntryOffset > *lastMenuEntry && lastMenuEntry < &menuEntries[16]) {
// added menu
*(++lastMenuEntry) = mbEntryOffset;
} else if (mbEntryOffset < *lastMenuEntry) {
@@ -260,6 +261,8 @@ static void MaskMenus(uint32 expandMem, uint32 lowMemPtr, std::vector<SDL_Rect>
lastMenuEntry--;
}
inMenuSelect = true;
// mask all menus
for (uint16 *entry = menuEntries; entry <= lastMenuEntry; entry++) {
rects.push_back(MaskMenu(mbSaveLoc + *entry));