more follow-up (trunk only)

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

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
}

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

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
}

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
}