From e15b30e9c5b305e987d4d2987ac1a901a60eb0b8 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 2 May 2020 17:17:40 -0400 Subject: [PATCH] Revert "build fix for platforms that have no LUA awareness during makedefs compile" This reverts commit eb704832a91423b5fa13b56efebe2db452f0afbc. That fix was insufficient. The addition of lua_State *themelua; to the dungeon struct in dungeon.h prevents the build of host-side utilities that include "hack.h" via the CROSSCOMPILER_HOST. Unfortunately, it is no longer possible to cross-compile NetHack 3.7. That includes the cross-compiled MSDOS build. --- include/dungeon.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/dungeon.h b/include/dungeon.h index a10ededbb..34ae5afdf 100644 --- a/include/dungeon.h +++ b/include/dungeon.h @@ -53,7 +53,6 @@ typedef struct dest_area { /* non-stairway level change identifier */ xchar nhx, nhy; /* opposite corner of invalid area */ } dest_area; -#ifndef MAKEDEFS_C typedef struct dungeon { /* basic dungeon identifier */ char dname[24]; /* name of the dungeon (eg. "Hell") */ char proto[15]; /* name of prototype file (eg. "tower") */ @@ -68,7 +67,6 @@ typedef struct dungeon { /* basic dungeon identifier */ depth_start; /* the starting depth in "logical" terms */ lua_State *themelua; /* themerms compiled lua */ } dungeon; -#endif /* MAKEDEFS_C */ /* * A branch structure defines the connection between two dungeons. They