Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-23 04:33:24 +00:00
Code Issues Projects Releases Wiki Activity

- Picasso 96 is given preference over CyberGfx because of P96's CyberGfx

Browse Source 
emulation
This commit is contained in:
cebix 2000-07-13 17:45:33 +00:00
parent b5b6684ff9
commit c03dc99556
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp
View File

@ -1248,19 +1248,19 @@ static void screen_mode_req(struct Window *win, struct LayoutHandle *h)
ULONG id; ULONG id;
if (CyberGfxBase) { if (P96Base) {
id = p96RequestModeIDTags(
P96MA_MinDepth, 8,
P96MA_FormatsAllowed, RGBFF_CLUT | RGBFF_R5G5B5 | RGBFF_A8R8G8B8,
TAG_END
);
} else {
UWORD model_array[] = {PIXFMT_LUT8, PIXFMT_RGB16, PIXFMT_ARGB32, 0, ~0}; UWORD model_array[] = {PIXFMT_LUT8, PIXFMT_RGB16, PIXFMT_ARGB32, 0, ~0};
id = (ULONG) CModeRequestTags(NULL, id = (ULONG) CModeRequestTags(NULL,
CYBRMREQ_MinDepth, 8, CYBRMREQ_MinDepth, 8,
CYBRMREQ_CModelArray, (ULONG)model_array, CYBRMREQ_CModelArray, (ULONG)model_array,
TAG_END TAG_END
); );
} else {
id = p96RequestModeIDTags(
P96MA_MinDepth, 8,
P96MA_FormatsAllowed, RGBFF_CLUT | RGBFF_R5G5B5 | RGBFF_A8R8G8B8,
TAG_END
);
} }
LT_UnlockWindow(win); LT_UnlockWindow(win);

6
BasiliskII/src/AmigaOS/video_amiga.cpp
View File

@ -193,10 +193,10 @@ static bool init_screen(ULONG mode_id)
ADBSetRelMouseMode(true); ADBSetRelMouseMode(true);
// Check whether the mode is a Picasso96 mode or a CyberGfx mode // Check whether the mode is a Picasso96 mode or a CyberGfx mode
if (CyberGfxBase && IsCyberModeID(mode_id)) if (P96Base && p96GetModeIDAttr(mode_id, P96IDA_ISP96))
is_cgfx = true;
else if (P96Base && p96GetModeIDAttr(mode_id, P96IDA_ISP96))
is_p96 = true; is_p96 = true;
else if (CyberGfxBase && IsCyberModeID(mode_id))
is_cgfx = true;
else { else {
ErrorAlert(GetString(STR_NO_P96_MODE_ERR)); ErrorAlert(GetString(STR_NO_P96_MODE_ERR));
return false; return false;