From 5c73c61aa2c80c7266a0526e1564700edb15836a Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Tue, 3 Feb 2015 19:49:09 +0000
Subject: [PATCH 1/2] Remove extra debug list padding

---
 amiga/object.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/amiga/object.c b/amiga/object.c
index f071cceb8..3ccd50b60 100755
--- a/amiga/object.c
+++ b/amiga/object.c
@@ -31,16 +31,9 @@
 
 struct MinList *NewObjList(void)
 {
-
-	struct MinList *objlist;
-
-	objlist = (struct MinList *)AllocVecTagList(sizeof(struct MinList)    + 10, NULL);
-#warning List structure allocation is larger than necessary for debugging ^^^^
-
+	struct MinList *objlist = (struct MinList *)AllocVecTagList(sizeof(struct MinList), NULL);
 	NewMinList(objlist);
-
 	return(objlist);
-
 }
 
 struct nsObject *AddObject(struct MinList *objlist, ULONG otype)

From 36bc32b87bcfb9ed7ece8ddaab8962ee7c01d37f Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Tue, 3 Feb 2015 23:58:35 +0000
Subject: [PATCH 2/2] Re-disable P96 on OS3 pending a fix

---
 amiga/plotters.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/amiga/plotters.c b/amiga/plotters.c
index 5077614b6..9455d1cde 100644
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -106,8 +106,10 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
 	} else {
 		palette_mapped = false;
 	}
-#if 0
-	palette_mapped = true; /* only supporting palette mapped screens on OS3 for now */
+
+#ifndef __amigaos4__
+#warning OS3 locked to palette-mapped modes
+	palette_mapped = true;
 	if(depth > 8) depth = 8;
 #endif