nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

rename engraving symbols and tiles

Browse Source 
"engraved part of a room" and "engraved part of a corridor" sound
silly.  Change to "engraving in a room" and "engraving in a corridor".
Still displayed to player as just "engraving".

An orhpaned wintype.h tweak got dragged in.  Renumbers to_core_flags.
This commit is contained in:
PatR
2023-11-20 00:47:12 -08:00
parent 490b60da4d
commit e723a4aafa
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/defsym.h
View File

@@ -113,10 +113,12 @@
PCHAR( 18, '#', S_tree, "tree", CLR(CLR_GREEN))
PCHAR( 19, '.', S_room, "floor of a room", CLR(CLR_GRAY))
PCHAR( 20, '.', S_darkroom, "dark part of a room", CLR(CLR_BLACK))
PCHAR( 21, '`', S_engroom, "engraved part of a room", CLR(CLR_BRIGHT_BLUE))
PCHAR2(21, '`', S_engroom, "engraving in a room", "engraving",
CLR(CLR_BRIGHT_BLUE))
PCHAR2(22, '#', S_corr, "dark corridor", "corridor", CLR(CLR_GRAY))
PCHAR( 23, '#', S_litcorr, "lit corridor", CLR(CLR_GRAY))
PCHAR( 24, '#', S_engrcorr, "engraved part of a corridor", CLR(CLR_BRIGHT_BLUE))
PCHAR2(24, '#', S_engrcorr, "engraving in a corridor", "engraving",
CLR(CLR_BRIGHT_BLUE))
PCHAR2(25, '<', S_upstair, "up stairs", "staircase up", CLR(CLR_GRAY))
PCHAR2(26, '>', S_dnstair, "down stairs", "staircase down", CLR(CLR_GRAY))
PCHAR2(27, '<', S_upladder, "up ladder", "ladder up", CLR(CLR_BROWN))

20
include/wintype.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 wintype.h $NHDT-Date: 1596498573 2020/08/03 23:49:33 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.23 $ */
/* NetHack 3.7 wintype.h $NHDT-Date: 1700470031 2023/11/20 08:47:11 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.46 $ */
/* Copyright (c) David Cohrs, 1991 */
/* NetHack may be freely redistributed. See license for details. */
@@ -34,8 +34,8 @@ typedef union any {
unsigned long a_mask32; /* used by status highlighting */
/* add types as needed */
} anything;
#define ANY_P union any /* avoid typedef in prototypes */
/* (buggy old Ultrix compiler) */
#define ANY_P union any /* avoid typedef in prototypes
* (buggy old Ultrix compiler) */
/* symbolic names for the data types housed in anything */
enum any_types {
@@ -174,7 +174,11 @@ typedef struct gi {
#define MENU_BEHAVE_STANDARD 0x0000000U
#define MENU_BEHAVE_PERMINV 0x0000001U
enum perm_invent_toggles {toggling_off = -1, toggling_not = 0, toggling_on = 1 };
enum perm_invent_toggles {
toggling_off = -1,
toggling_not = 0,
toggling_on = 1
};
/* perm_invent modes */
enum inv_mode_bits {
@@ -198,15 +202,15 @@ enum inv_modes { /* 'perminv_mode' option settings */
enum to_core_flags {
active = 0x001,
prohibited = 0x002,
no_init_done = 0x004,
too_small = 0x008,
too_small = 0x002,
prohibited = 0x004,
no_init_done = 0x008,
};
enum from_core_requests {
set_mode = 1,
request_settings = 2,
set_menu_promptstyle = 3
set_menu_promptstyle = 3,
};
struct to_core {

4
win/share/other.txt
View File

@@ -429,7 +429,7 @@ Z = (195, 195, 195)
.A.A.A.A.A.A.A.A
A.A.A.A.A.A.A.A.
}
# tile 21 (engraved part of a room)
# tile 21 (engraving in a room)
{
................
................
@@ -486,7 +486,7 @@ Z = (195, 195, 195)
................
................
}
# tile 24 (engraved part of a corridor)
# tile 24 (engraving in a corridor)
{
................
...H...H........