diff --git a/ansiterm.c b/ansiterm.c index 63040bc..dbe6312 100644 --- a/ansiterm.c +++ b/ansiterm.c @@ -1,3 +1,4 @@ +#include #include #include @@ -5,8 +6,9 @@ #include "ansiterm.h" +#ifdef JOEY_IIGS segment "ansiterm"; - +#endif // http://ansi-bbs.org/ansi-bbs-core-server.html diff --git a/build-IIgs.sh b/build-IIgs.sh index 9e30aa2..6e042e6 100755 --- a/build-IIgs.sh +++ b/build-IIgs.sh @@ -1,8 +1,9 @@ #!/bin/bash -e PROJECT=ifengine -DATA=(8x8thin.sta output.z8 gamedata.dat) -SOURCE=(*.c *.h) +DATA=(thin.sta output.z8 gamedata.dat) +#SOURCE=(*.c *.h) +SOURCE=() # --- HERE BE DRAGONS --- diff --git a/fileio.c b/fileio.c index 2f138bf..c0d161b 100644 --- a/fileio.c +++ b/fileio.c @@ -1,5 +1,8 @@ #include "joey.h" + +#ifdef JOEY_IIGS segment "fileio"; +#endif /* $Id: fileio.c,v 1.3 2000/07/05 15:20:34 jholder Exp $ * -------------------------------------------------------------------- diff --git a/gamedata.dat b/gamedata.dat index 8fefff2..1d10dce 100644 --- a/gamedata.dat +++ b/gamedata.dat @@ -1,3 +1,3 @@ IF Engine Test Game output.z8 -8x8thin.sta +thin.sta diff --git a/ifengine.pro b/ifengine.pro index 2fd11d3..d3af869 100644 --- a/ifengine.pro +++ b/ifengine.pro @@ -71,4 +71,5 @@ LIBS += \ $$JOEY_LIBS \ DISTFILES += \ - build-IIgs.sh + build-IIgs.sh \ + gamedata.dat diff --git a/joeyio.c b/joeyio.c index 5b2723a..3c465b3 100644 --- a/joeyio.c +++ b/joeyio.c @@ -3,7 +3,9 @@ #include "ztypes.h" +#ifdef JOEY_IIGS segment "joeyio"; +#endif #define DISPLAY_MIXED_SIZE 5 diff --git a/main.c b/main.c index 950f4c5..d82d4a9 100644 --- a/main.c +++ b/main.c @@ -8,7 +8,9 @@ #include "ztypes.h" +#ifdef JOEY_IIGS segment "ifengine"; +#endif extern int GLOBALVER; @@ -104,8 +106,6 @@ int main(void) { char game[40]; char text[40]; - //asm { brk 0xea } - in = fopen("gamedata.dat", "rt"); if (in != NULL) { @@ -121,48 +121,28 @@ int main(void) { jlUtilStartup(name); - _jlDebugBorder(BORDER_DEEP_RED); - - jlDisplayPresent(); - _jlDebugBorder(BORDER_PURPLE); - //jlKeyWaitForAny(); - - /* if (!jlStaLoad(font, text)) { - jlUtilDie("Unable to load %s", text); + jlUtilDie("Unable to load [%s] (%d)", text, strlen(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(); } diff --git a/quetzal.c b/quetzal.c index d502675..56cb668 100644 --- a/quetzal.c +++ b/quetzal.c @@ -1,5 +1,8 @@ #include "joey.h" + +#ifdef JOEY_IIGS segment "quetzal"; +#endif /* $Id: quetzal.c,v 1.3 2000/07/05 15:20:34 jholder Exp $ * -------------------------------------------------------------------- diff --git a/8x8thin.sta b/thin.sta similarity index 100% rename from 8x8thin.sta rename to thin.sta