From a7b866e824f7ce4fd7fa1ec9945ce670a8681dd9 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Mon, 2 Feb 2015 23:45:49 +0000 Subject: Always use a friend bitmap on OS3 --- amiga/misc.c | 2 +- amiga/plotters.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/amiga/misc.c b/amiga/misc.c index 73a87e78d..850382617 100755 --- a/amiga/misc.c +++ b/amiga/misc.c @@ -39,7 +39,7 @@ void *ami_misc_allocvec_clear(int size, UBYTE value) #ifdef __amigaos4__ return AllocVecTags(size, AVT_ClearWithValue, value, TAG_DONE); #else - void *mem = AllocVec(size, MEMF_CLEAR); + void *mem = AllocVec(size, MEMF_CLEAR | MEMF_ANY); if (mem && (value != 0)) { memset(mem, value, size); } diff --git a/amiga/plotters.c b/amiga/plotters.c index 405e512f0..b50e9a091 100644 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -118,13 +118,16 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height) gg->areabuf = AllocVecTagList(AREA_SIZE, NULL); gg->tmprasbuf = AllocVecTagList(width * height, NULL); - if(palette_mapped == true) { #ifndef __amigaos4__ - friend = scrn->RastPort.BitMap; + friend = scrn->RastPort.BitMap; #endif + + if(palette_mapped == true) { gg->bm = AllocBitMap(width, height, depth, 0, friend); } else { +#ifdef __amigaos4__ if(depth == 32) friend = scrn->RastPort.BitMap; +#endif gg->bm = ami_rtg_allocbitmap(width, height, 32, 0, friend, RGBFB_A8R8G8B8); } -- cgit v1.2.3