From 6f9d96aedf44ac528d3b52ea89f6cd4e19286b8f Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sun, 18 Jan 2015 18:50:01 +0000
Subject: Fixup gui.c enough to make it compile for OS3

---
 amiga/gui.c        | 16 +++++++++++++---
 amiga/os3support.h |  4 ++++
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'amiga')

diff --git a/amiga/gui.c b/amiga/gui.c
index 9bea295a6..61904079e 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1676,7 +1676,7 @@ static void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon)
 				warn_user("NoMemory", "");
 				return;
 			}
-
+#ifdef __amigaos4__
 			BltBitMapTags(BLITA_SrcX, 0,
 						BLITA_SrcY, 0,
 						BLITA_DestX, bbox->Left,
@@ -1690,7 +1690,11 @@ static void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon)
 						BLITA_Minterm, minterm,
 						tag, tag_data,
 						TAG_DONE);
-
+#else
+			/*\todo we are assuming we are always masking here, which might not be true */
+			BltMaskBitMapRastPort(bm, 0, 0, g->shared->win->RPort,
+						bbox->Left, bbox->Top, 16, 16, tag_data, minterm);
+#endif
 			ami_gui_free_space_box(bbox);
 		}
 	}
@@ -4319,7 +4323,7 @@ static void ami_do_redraw_tiled(struct gui_window_2 *gwin, bool busy,
 				&clip, ctx))
 			{
 				ami_clearclipreg(&browserglob);
-
+#ifdef __amigaos4__
 				BltBitMapTags(BLITA_SrcType, BLITT_BITMAP, 
 					BLITA_Source, browserglob.bm,
 					BLITA_SrcX, 0,
@@ -4331,6 +4335,12 @@ static void ami_do_redraw_tiled(struct gui_window_2 *gwin, bool busy,
 					BLITA_Width, (int)(clip.x1),
 					BLITA_Height, (int)(clip.y1),
 					TAG_DONE);
+#else
+				BltBitMapRastPort(browserglob.bm, 0, 0, gwin->win->RPort,
+					bbox->Left + (int)((x - sx) * gwin->gw->scale),
+					bbox->Top + (int)((y - sy) * gwin->gw->scale),
+					(int)(clip.x1), (int)(clip.y1), 0xC0);
+#endif
 			}
 		}
 	}
diff --git a/amiga/os3support.h b/amiga/os3support.h
index 805e1a137..d0979e063 100644
--- a/amiga/os3support.h
+++ b/amiga/os3support.h
@@ -48,7 +48,10 @@
 #define MEMF_SHARED	MEMF_ANY
 
 /* Ignore unsupported tags */
+#define ASO_NoTrack				TAG_IGNORE
 #define BITMAP_DisabledSourceFile	TAG_IGNORE
+#define BLITA_UseSrcAlpha		TAG_IGNORE
+#define BLITA_MaskPlane			TAG_IGNORE
 #define CLICKTAB_CloseImage		TAG_IGNORE
 #define CLICKTAB_FlagImage		TAG_IGNORE
 #define CLICKTAB_LabelTruncate	TAG_IGNORE
@@ -101,6 +104,7 @@
 #define ObtainCharsetInfo(A,B,C) (const char *)"ISO-8859-1"
 
 /* DOS */
+#define AllocSysObjectTags(A,B,C,D) CreateMsgPort() /* Assume ASOT_PORT for now */
 #define FOpen(A,B,C) Open(A,B)
 #define FClose(A) Close(A)
 #define CreateDirTree(D) CreateDir(D) /*\todo This isn't quite right */
-- 
cgit v1.2.3