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

symbol preprocessing (trunk only)

Browse Source 
Clean up the preprocessing associated with the
loadable symbol stuff.

Base it on new LOADSYMSETS, rather than on the
previously existing ASCIIGRAPH preprocessor define.
This commit is contained in:
nethack.allison
2006-10-02 13:15:50 +00:00
parent 58a1828f18
commit 084dce82d0
14 changed files with 119 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sys/share/pcmain.c
View File

@@ -305,17 +305,19 @@ char *argv[];
process_options(argc, argv);
#endif
#if defined(MSDOS) || defined(WIN32)
#ifdef LOADSYMSETS
# if defined(MSDOS) || defined(WIN32)
/* Player didn't specify any symbol set so use IBM defaults */
if (!symset[PRIMARY].name) {
load_symset("IBMGraphics_2", PRIMARY);
}
# ifdef REINCARNATION
# ifdef REINCARNATION
if (!symset[ROGUESET].name) {
load_symset("RogueEpyx", ROGUESET);
}
# endif
# endif
#endif
#endif /*LOADSYMSETS*/
#ifdef MSDOS
init_nhwindows(&argc,argv);
@@ -548,7 +550,7 @@ char *argv[];
case 'I':
case 'i':
if (!strncmpi(argv[0]+1, "IBM", 3)) {
# ifdef ASCIIGRAPH
# ifdef LOADSYMSETS
load_symset("IBMGraphics", PRIMARY);
load_symset("RogueIBM", ROGUESET);
switch_symbols(TRUE);
@@ -558,7 +560,7 @@ char *argv[];
/* case 'D': */
case 'd':
if (!strncmpi(argv[0]+1, "DEC", 3)) {
# ifdef ASCIIGRAPH
# ifdef LOADSYMSETS
load_symset("DECGraphics", PRIMARY);
switch_symbols(TRUE);
# endif

2
sys/share/unixtty.c
View File

@@ -365,7 +365,7 @@ init_sco_cons()
if (!strcmp(windowprocs.name, "tty") && sco_flag_console) {
atexit(sco_mapon);
sco_mapoff();
# ifdef ASCIIGRAPH
# ifdef LOADSYMSETS
load_symset("IBMGraphics", PRIMARY);
load_symset("RogueIBM", ROGUESET);
switch_symbols(TRUE);

4
sys/unix/unixmain.c
View File

@@ -370,7 +370,7 @@ char *argv[];
case 'I':
case 'i':
if (!strncmpi(argv[0]+1, "IBM", 3)) {
#ifdef ASCIIGRAPH
#ifdef LOADSYMSETS
load_symset("IBMGraphics", PRIMARY);
load_symset("RogueIBM", ROGUESET);
switch_symbols(TRUE);
@@ -380,7 +380,7 @@ char *argv[];
/* case 'D': */
case 'd':
if (!strncmpi(argv[0]+1, "DEC", 3)) {
#ifdef ASCIIGRAPH
#ifdef LOADSYMSETS
load_symset("DECGraphics", PRIMARY);
switch_symbols(TRUE);
#endif

4
sys/vms/vmsmain.c
View File

@@ -269,7 +269,7 @@ char *argv[];
case 'I':
case 'i':
if (!strncmpi(argv[0]+1, "IBM", 3)) {
#ifdef ASCIIGRAPH
#ifdef LOADSYMSETS
load_symset("IBMGraphics", PRIMARY);
load_symset("RogueIBM", ROGUESET);
switch_symbols(TRUE);
@@ -279,7 +279,7 @@ char *argv[];
/* case 'D': */
case 'd':
if (!strncmpi(argv[0]+1, "DEC", 3)) {
#ifdef ASCIIGRAPH
#ifdef LOADSYMSETS
load_symset("DECGraphics", PRIMARY);
switch_symbols(TRUE);
#endif