From 878e93d236422e944fe90edab9688da8fa02e087 Mon Sep 17 00:00:00 2001
From: Scott Duensing <scott@kangaroopunch.com>
Date: Tue, 18 Sep 2018 19:59:40 -0500
Subject: [PATCH] Fixed up segments on IIgs.

---
 ansiterm.c         |   7 +++----
 build-IIgs.sh      |  14 ++++++++++++--
 fileio.c           |   2 ++
 joeyio.c           |   3 +++
 main.c             |  33 ++++++++++++++++++++++++++++++---
 nowhere.vec        | Bin 0 -> 28 bytes
 nowhere.vec.source |  30 +++++++++++++++---------------
 quetzal.c          |   2 ++
 8 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/ansiterm.c b/ansiterm.c
index 4d96b32..63040bc 100644
--- a/ansiterm.c
+++ b/ansiterm.c
@@ -2,13 +2,12 @@
 #include <stdarg.h>
 
 #include "joey.h"
-#ifdef JOEY_IIGS
-segment "ansiterm";
-#endif
-
 #include "ansiterm.h"
 
 
+segment "ansiterm";
+
+
 // http://ansi-bbs.org/ansi-bbs-core-server.html
 
 
diff --git a/build-IIgs.sh b/build-IIgs.sh
index f0962b2..9e30aa2 100755
--- a/build-IIgs.sh
+++ b/build-IIgs.sh
@@ -1,7 +1,8 @@
 #!/bin/bash -e
 
 PROJECT=ifengine
-DATA=(8x8thin.sta gamedata.z5)
+DATA=(8x8thin.sta output.z8 gamedata.dat)
+SOURCE=(*.c *.h)
 
 # --- HERE BE DRAGONS ---
 
@@ -38,7 +39,16 @@ for F in "${DATA[@]}"; do
 	${AC}/import.sh ${F} BIN
 done
 
-if [ -z $1 ]; then
+mkdir -p /tmp/IIgs/source
+for S in "${SOURCE[@]}"; do
+	for F in `ls -1 ${S}`; do
+		tr "\n" "\r" < ${F} > /tmp/IIgs/source/${F}
+		${AC}/import.sh /tmp/IIgs/source/${F} TXT
+		rm /tmp/IIgs/source/${F}
+	done
+done
+
+if [ ! -z $1 ]; then
 	pushd ${JOEY}/sdks/iix/gsplus
 	./gsplus -config IIgsTest.cfg || true
 	popd
diff --git a/fileio.c b/fileio.c
index 8a89fae..2f138bf 100644
--- a/fileio.c
+++ b/fileio.c
@@ -1,3 +1,5 @@
+#include "joey.h"
+segment "fileio";
 
 /* $Id: fileio.c,v 1.3 2000/07/05 15:20:34 jholder Exp $
  * --------------------------------------------------------------------
diff --git a/joeyio.c b/joeyio.c
index 2f91836..5b2723a 100644
--- a/joeyio.c
+++ b/joeyio.c
@@ -3,6 +3,9 @@
 #include "ztypes.h"
 
 
+segment "joeyio";
+
+
 #define DISPLAY_MIXED_SIZE   5
 #define COMMAND_BUFFER_SIZE  32
 
diff --git a/main.c b/main.c
index 70d4d55..950f4c5 100644
--- a/main.c
+++ b/main.c
@@ -8,6 +8,9 @@
 #include "ztypes.h"
 
 
+segment "ifengine";
+
+
 extern int GLOBALVER;
 
 
@@ -101,6 +104,8 @@ int main(void) {
 	char game[40];
 	char text[40];
 
+	//asm { brk 0xea }
+
 	in = fopen("gamedata.dat", "rt");
 	if (in != NULL) {
 
@@ -115,28 +120,50 @@ int main(void) {
 		text[strlen(text) - 1] = 0;
 
 		jlUtilStartup(name);
-		jlStaLoad(font, text);
+
+		_jlDebugBorder(BORDER_DEEP_RED);
+
+		jlDisplayPresent();
+		_jlDebugBorder(BORDER_PURPLE);
+		//jlKeyWaitForAny();
+
+		/*
+		if (!jlStaLoad(font, text)) {
+			jlUtilDie("Unable to load %s", text);
+		}
 
 		termStart(font, 0, 0, 40, 25);
+		termPrint("Term started...\n");
 		termDestruciveBackspace(false);
 		termMoveCursor(1, 25);
 		termSaveCursor();
+		termPrint("Term configured...\n");
 
+		termPrint("process_arguments...\n");
 		process_arguments(game);
+		termPrint("configure...\n");
 		configure(V1, V8);
+		termPrint("initialize_screen...\n");
 		initialize_screen();
+		termPrint("load_cache...\n");
 		load_cache();
+		termPrint("z_restart...\n");
 		z_restart();
+		termPrint("interpret...\n");
 		(void)interpret();
+		termPrint("unload_cache...\n");
 		unload_cache();
+		termPrint("close_story...\n");
 		close_story();
+		termPrint("close_script...\n");
 		close_script();
+		termPrint("reset_screen...\n");
 		reset_screen();
-
 		termStop();
 
 		jlStaFree(font);
+		*/
+		jlUtilShutdown();
 	}
 
-	jlUtilShutdown();
 }
diff --git a/nowhere.vec b/nowhere.vec
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7dc1ad3de81b9b18881f2ca90b532e0efd656303 100644
GIT binary patch
literal 28
jcmWG@b!K1@FlRAf)L>L(l3^2P65$YGXJlezVPpUREL;L6

literal 0
HcmV?d00001

diff --git a/nowhere.vec.source b/nowhere.vec.source
index 817fe39..55d6523 100644
--- a/nowhere.vec.source
+++ b/nowhere.vec.source
@@ -1,29 +1,29 @@
 # Reset Palette, Clear Screen to White, Draw in Black
 # Hacky Border because we can't hit 319 yet.
-R
-C 0
-E
-C 15
-S 0 0 255 199
-C 0
+reset
+color 0
+clear
+color 15
+fbox 0 0 255 199
+color 0
 
 # Horizon
-L 0 87 255 87
+line 0 87 255 87
 
 # Sun
-L 255 64 248 61 240 61 233 62 228 66 223 72 220 78 220 87
+line 255 64 248 61 240 61 233 62 228 66 223 72 220 78 220 87
 
 # Beach
-L 0 101 87 124 126 128 148 133 160 136 168 141 172 146 171 149 169 153 169 158 176 164 188 168 205 171 227 174 255 174
+line 0 101 87 124 126 128 148 133 160 136 168 141 172 146 171 149 169 153 169 158 176 164 188 168 205 171 227 174 255 174
 
 # Fill Sun
-C 12
-F 242 74
+color 12
+# fill 242 74
 
 # Fill Beach
-C 14
-F 105 161
+color 14
+#fill 105 161
 
 # Fill Ocean
-C 1
-F 194 106
+color 1
+#fill 194 106
diff --git a/quetzal.c b/quetzal.c
index 5abe208..d502675 100644
--- a/quetzal.c
+++ b/quetzal.c
@@ -1,3 +1,5 @@
+#include "joey.h"
+segment "quetzal";
 
 /* $Id: quetzal.c,v 1.3 2000/07/05 15:20:34 jholder Exp $
  * --------------------------------------------------------------------