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

Make LOADSYMSETS unconditional.

Browse Source 
There are some bugs here, but this functionality should make it into the release
in some form.
This commit is contained in:
Sean Hunt
2015-02-14 14:15:27 -05:00
committed by Pasi Kallinen
parent 3481ec6589
commit 11d11c5de3
11 changed files with 3 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sys/share/pcmain.c
View File

@@ -303,8 +303,7 @@ char *argv[];
process_options(argc, argv);
#endif
#ifdef LOADSYMSETS
# if defined(MSDOS) || defined(WIN32)
#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);
@@ -312,8 +311,7 @@ char *argv[];
if (!symset[ROGUESET].name) {
load_symset("RogueEpyx", ROGUESET);
}
# endif
#endif /*LOADSYMSETS*/
#endif
#ifdef MSDOS
init_nhwindows(&argc,argv);
@@ -536,20 +534,16 @@ char *argv[];
case 'I':
case 'i':
if (!strncmpi(argv[0]+1, "IBM", 3)) {
# ifdef LOADSYMSETS
load_symset("IBMGraphics", PRIMARY);
load_symset("RogueIBM", ROGUESET);
switch_symbols(TRUE);
# endif
}
break;
/* case 'D': */
case 'd':
if (!strncmpi(argv[0]+1, "DEC", 3)) {
# ifdef LOADSYMSETS
load_symset("DECGraphics", PRIMARY);
switch_symbols(TRUE);
# endif
}
break;
#endif

2
sys/share/unixtty.c
View File

@@ -364,11 +364,9 @@ init_sco_cons()
if (!strcmp(windowprocs.name, "tty") && sco_flag_console) {
atexit(sco_mapon);
sco_mapoff();
# ifdef LOADSYMSETS
load_symset("IBMGraphics", PRIMARY);
load_symset("RogueIBM", ROGUESET);
switch_symbols(TRUE);
# endif
# ifdef TEXTCOLOR
if (has_colors())
iflags.use_color = TRUE;

4
sys/unix/unixmain.c
View File

@@ -357,20 +357,16 @@ char *argv[];
case 'I':
case 'i':
if (!strncmpi(argv[0]+1, "IBM", 3)) {
#ifdef LOADSYMSETS
load_symset("IBMGraphics", PRIMARY);
load_symset("RogueIBM", ROGUESET);
switch_symbols(TRUE);
#endif
}
break;
/* case 'D': */
case 'd':
if (!strncmpi(argv[0]+1, "DEC", 3)) {
#ifdef LOADSYMSETS
load_symset("DECGraphics", PRIMARY);
switch_symbols(TRUE);
#endif
}
break;
case 'p': /* profession (role) */

4
sys/vms/vmsmain.c
View File

@@ -266,20 +266,16 @@ char *argv[];
case 'I':
case 'i':
if (!strncmpi(argv[0]+1, "IBM", 3)) {
#ifdef LOADSYMSETS
load_symset("IBMGraphics", PRIMARY);
load_symset("RogueIBM", ROGUESET);
switch_symbols(TRUE);
#endif
}
break;
/* case 'D': */
case 'd':
if (!strncmpi(argv[0]+1, "DEC", 3)) {
#ifdef LOADSYMSETS
load_symset("DECGraphics", PRIMARY);
switch_symbols(TRUE);
#endif
}
break;
case 'p': /* profession (role) */