From 3a4302773d4379b86b679863fb91e612806dd4a1 Mon Sep 17 00:00:00 2001 From: nhmall Date: Tue, 1 Feb 2022 17:11:35 -0500 Subject: [PATCH] two minor core changes for hypothetical Amiga cross port The tilemap change provides three variables that used to be uppercase compile macros in the past, and Amiga (and other ports?) used them. The other change just uncomments the header file include. --- include/global.h | 2 +- win/share/tilemap.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/global.h b/include/global.h index 12ae0c06c..7ee316945 100644 --- a/include/global.h +++ b/include/global.h @@ -147,7 +147,7 @@ typedef uchar nhsym; /* amiconf.h needs to be the last nested #include of config.h because 'make depend' will turn it into a comment, hiding anything after it */ #ifdef AMIGA -/*#include "amiconf.h"*/ +#include "amiconf.h" #endif /* Displayable name of this port; don't redefine if defined in *conf.h */ diff --git a/win/share/tilemap.c b/win/share/tilemap.c index ed9d296a0..5d35ac828 100644 --- a/win/share/tilemap.c +++ b/win/share/tilemap.c @@ -1337,7 +1337,10 @@ main(int argc UNUSED, char *argv[] UNUSED) Fprintf(ofp, "\nint total_tiles_used = %d,\n", laststatuetile + 1); Fprintf(ofp, "%sTile_corr = %d,\n", indent, TILE_corr); /* X11 references it */ Fprintf(ofp, "%sTile_stone = %d,\n", indent, TILE_stone); - Fprintf(ofp, "%sTile_unexplored = %d;\n\n", indent, TILE_unexplored); + Fprintf(ofp, "%sTile_unexplored = %d;\n", indent, TILE_unexplored); + Fprintf(ofp, "%smaxmontile = %d;\n", indent, lastmontile); + Fprintf(ofp, "%smaxobjtile = %d;\n", indent, lastobjtile); + Fprintf(ofp, "%smaxothtile = %d;\n\n", indent, lastothtile); Fprintf(ofp, "/* glyph, ttychar, { color, symidx, ovidx, glyphflags, tileidx} */\n"); Fprintf(ofp, "const glyph_info nul_glyphinfo = { \n");