diff --git a/include/optlist.h b/include/optlist.h index 1f0d22a72..ff7b9d95b 100644 --- a/include/optlist.h +++ b/include/optlist.h @@ -74,6 +74,14 @@ opt_##a, #define NHOPTO(m, a, b, c, s, n, v, d, al, z) \ { m, 0, b, opt_##a, s, OthrOpt, n, v, d, No, c, (boolean *) 0, &optfn_##a, \ al, z, (const char *) 0, On, On, 0 }, + +#ifdef USE_TILES +#define tiled_map_Def On +#define ascii_map_Def Off +#else +#define ascii_map_Def On +#define tiled_map_Def Off +#endif #endif /* B:nm, ln, opt_*, setwhere?, on?, negat?, val?, dup?, hndlr? Alias, bool_p */ @@ -97,8 +105,8 @@ opt_##a, NHOPTB(altmeta, 0, opt_out, set_in_config, Off, Yes, No, No, NoAlias, (boolean *) 0) #endif - NHOPTB(ascii_map, 0, opt_in, set_in_game, Off, Yes, No, No, NoAlias, - &iflags.wc_ascii_map) + NHOPTB(ascii_map, 0, opt_in, set_in_game, ascii_map_Def, Yes, No, No, + NoAlias, &iflags.wc_ascii_map) NHOPTB(autodescribe, 0, opt_out, set_in_game, On, Yes, No, No, NoAlias, &iflags.autodescribe) NHOPTB(autodig, 0, opt_in, set_in_game, Off, Yes, No, No, NoAlias, @@ -472,8 +480,8 @@ opt_##a, "height of tiles") NHOPTC(tile_width, 20, opt_in, set_gameview, Yes, Yes, No, No, NoAlias, "width of tiles") - NHOPTB(tiled_map, 0, opt_in, set_in_config, On, Yes, No, No, NoAlias, - &iflags.wc_tiled_map) + NHOPTB(tiled_map, 0, opt_in, set_in_config, tiled_map_Def, Yes, No, No, + NoAlias, &iflags.wc_tiled_map) NHOPTB(time, 0, opt_in, set_in_game, Off, Yes, No, No, NoAlias, &flags.time) #ifdef TIMED_DELAY diff --git a/src/options.c b/src/options.c index 864e85a17..6c48ec218 100644 --- a/src/options.c +++ b/src/options.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 options.c $NHDT-Date: 1613723080 2021/02/19 08:24:40 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.508 $ */ +/* NetHack 3.7 options.c $NHDT-Date: 1640991743 2021/12/31 23:02:23 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.522 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2008. */ /* NetHack may be freely redistributed. See license for details. */ @@ -65,7 +65,7 @@ static struct allopt_t allopt_init[] = { #undef NHOPT_PARSE -#ifdef DEFAULT_WC_TILED_MAP +#if defined(USE_TILES) && defined(DEFAULT_WC_TILED_MAP) #define PREFER_TILED TRUE #else #define PREFER_TILED FALSE