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

more follow-up (trunk only)

Browse Source 
Based on feedback, make the load_symset() call easier
to follow.
This commit is contained in:
nethack.allison
2006-09-21 03:47:00 +00:00
parent b5648a7bb3
commit f0bf6c7653
6 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/rm.h
View File

@@ -261,11 +261,8 @@ extern char *roguesymset, *roguehandling; /* from drawing.c */
* Graphics sets for display symbols
*/
#define DEFAULT_GRAPHICS 0 /* regular characters: '-', '+', &c */
#if 0
#define IBM_GRAPHICS 1 /* PC graphic characters */
#define DEC_GRAPHICS 2 /* VT100 line drawing characters */
#define MAC_GRAPHICS 3 /* Macintosh drawing characters */
#endif
#define ROGUESET 1 /* useful for load_symset() */
#define PRIMARY 0
/*
* The 5 possible states of doors

8
src/options.c
View File

@@ -610,9 +610,9 @@ initoptions()
/* this detects the IBM-compatible console on most 386 boxes */
if ((opts = nh_getenv("TERM")) && !strncmp(opts, "AT", 2)) {
#ifdef ASCIIGRAPH
if (!symset) load_symset("IBMGraphics", FALSE);
if (!symset) load_symset("IBMGraphics", PRIMARY);
if (!roguesymset) load_symset("RogueIBM", TRUE);
if (!roguesymset) load_symset("RogueIBM", ROGUESET);
switch_graphics(TRUE);
#endif
@@ -628,7 +628,7 @@ initoptions()
!strncmpi(opts, "vt", 2) && AS && AE &&
index(AS, '\016') && index(AE, '\017')) {
# ifdef ASCIIGRAPH
if (!symset) load_symset("DECGraphics", FALSE);
if (!symset) load_symset("DECGraphics", PRIMARY);
@@ -639,7 +639,7 @@ initoptions()
#endif /* UNIX || VMS */
#ifdef MAC_GRAPHICS_ENV
if (!symset) load_symset("MACGraphics", FALSE);
if (!symset) load_symset("MACGraphics", PRIMARY);
switch_graphics(TRUE);
#endif /* MAC_GRAPHICS_ENV */
flags.menu_style = MENU_FULL;

10
sys/share/pcmain.c
View File

@@ -308,11 +308,11 @@ char *argv[];
#if defined(MSDOS) || defined(WIN32)
/* Player didn't specify any symbol set so use IBM defaults */
if (!symset) {
load_symset("IBMGraphics_2", FALSE);
load_symset("IBMGraphics_2", PRIMARY);
}
# ifdef REINCARNATION
if (!roguesymset) {
load_symset("RogueEpyx", TRUE);
load_symset("RogueEpyx", ROGUESET);
}
# endif
#endif
@@ -549,8 +549,8 @@ char *argv[];
case 'i':
if (!strncmpi(argv[0]+1, "IBM", 3)) {
# ifdef ASCIIGRAPH
load_symset("IBMGraphics", FALSE);
load_symset("RogueIBM", TRUE);
load_symset("IBMGraphics", PRIMARY);
load_symset("RogueIBM", ROGUESET);
switch_graphics(TRUE);
# endif
}
@@ -559,7 +559,7 @@ char *argv[];
case 'd':
if (!strncmpi(argv[0]+1, "DEC", 3)) {
# ifdef ASCIIGRAPH
load_symset("DECGraphics", FALSE);
load_symset("DECGraphics", PRIMARY);
switch_graphics(TRUE);
# endif
}

4
sys/share/unixtty.c
View File

@@ -366,8 +366,8 @@ init_sco_cons()
atexit(sco_mapon);
sco_mapoff();
# ifdef ASCIIGRAPH
load_symset("IBMGraphics", FALSE);
load_symset("RogueIBM", TRUE);
load_symset("IBMGraphics", PRIMARY);
load_symset("RogueIBM", ROGUESET);
switch_graphics(TRUE);
# endif
# ifdef TEXTCOLOR

6
sys/unix/unixmain.c
View File

@@ -371,8 +371,8 @@ char *argv[];
case 'i':
if (!strncmpi(argv[0]+1, "IBM", 3)) {
#ifdef ASCIIGRAPH
load_symset("IBMGraphics", FALSE);
load_symset("IBMGraphics", TRUE);
load_symset("IBMGraphics", PRIMARY);
load_symset("RogueIBM", ROGUESET);
switch_graphics(TRUE);
#endif
}
@@ -381,7 +381,7 @@ char *argv[];
case 'd':
if (!strncmpi(argv[0]+1, "DEC", 3)) {
#ifdef ASCIIGRAPH
load_symset("DECGraphics", FALSE);
load_symset("DECGraphics", PRIMARY);
switch_graphics(TRUE);
#endif
}

6
sys/vms/vmsmain.c
View File

@@ -270,8 +270,8 @@ char *argv[];
case 'i':
if (!strncmpi(argv[0]+1, "IBM", 3)) {
#ifdef ASCIIGRAPH
load_symset("IBMGraphics", FALSE);
load_symset("IBMGraphics", TRUE);
load_symset("IBMGraphics", PRIMARY);
load_symset("RogueIBM", ROGUESET);
switch_graphics(TRUE);
#endif
}
@@ -280,7 +280,7 @@ char *argv[];
case 'd':
if (!strncmpi(argv[0]+1, "DEC", 3)) {
#ifdef ASCIIGRAPH
load_symset("DECGraphics", FALSE);
load_symset("DECGraphics", PRIMARY);
switch_graphics(TRUE);
#endif
}