fix some msdos build errors

This commit is contained in:
nhmall
2018-02-24 23:26:25 -05:00
parent f44ff54c7f
commit 9773742e82
5 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -1977,7 +1977,7 @@ int src;
set_configfile_name(fqname(backward_compat_configfile, CONFIGPREFIX, 0)); set_configfile_name(fqname(backward_compat_configfile, CONFIGPREFIX, 0));
if ((fp = fopenp(configfile, "r")) != (FILE *) 0) { if ((fp = fopenp(configfile, "r")) != (FILE *) 0) {
return fp; return fp;
} else if (strcmp(backwad_compat_configfile, configfile)) { } else if (strcmp(backward_compat_configfile, configfile)) {
set_configfile_name(backward_compat_configfile); set_configfile_name(backward_compat_configfile);
if ((fp = fopenp(configfile, "r")) != (FILE *) 0) if ((fp = fopenp(configfile, "r")) != (FILE *) 0)
return fp; return fp;
+1 -1
View File
@@ -336,7 +336,7 @@ VOBJ19 = $(O)trap.o $(O)u_init.o $(O)uhitm.o $(O)vault.o $(O)vision.o
VOBJ20 = $(O)vis_tab.o $(O)weapon.o $(O)were.o $(O)wield.o $(O)windows.o VOBJ20 = $(O)vis_tab.o $(O)weapon.o $(O)were.o $(O)wield.o $(O)windows.o
VOBJ21 = $(O)wintty.o $(O)wizard.o $(O)worm.o $(O)worn.o $(O)write.o VOBJ21 = $(O)wintty.o $(O)wizard.o $(O)worm.o $(O)worn.o $(O)write.o
VOBJ22 = $(O)zap.o $(O)light.o $(O)dlb.o $(O)dig.o $(O)teleport.o VOBJ22 = $(O)zap.o $(O)light.o $(O)dlb.o $(O)dig.o $(O)teleport.o
VOBJ23 = $(O)region.o $(O)sys.o $(O)pmatchre.o $(O)string.o $(O)unicode.o VOBJ23 = $(O)region.o $(O)sys.o $(O)pmatchre.o
SOBJ = $(O)msdos.o $(O)sound.o $(O)pcsys.o $(O)tty.o $(O)unix.o \ SOBJ = $(O)msdos.o $(O)sound.o $(O)pcsys.o $(O)tty.o $(O)unix.o \
$(O)video.o $(O)vidtxt.o $(O)pckeys.o $(O)video.o $(O)vidtxt.o $(O)pckeys.o
+2 -2
View File
@@ -1,10 +1,10 @@
@echo off @echo off
REM NetHack 3.6 setup.bat $NHDT-Date: 1432512792 2015/05/25 00:13:12 $ $NHDT-Branch: master $:$NHDT-Revision: 1.9 $ REM NetHack 3.6 setup.bat $NHDT-Date: 1432512792 2015/05/25 00:13:12 $ $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
REM Copyright (c) NetHack PC Development Team 1990 - 2012 REM Copyright (c) NetHack PC Development Team 1990 - 2018
REM NetHack may be freely redistributed. See license for details. REM NetHack may be freely redistributed. See license for details.
echo. echo.
echo Copyright (c) NetHack PC Development Team 1990 - 2012 echo Copyright (c) NetHack PC Development Team 1990 - 2018
echo NetHack may be freely redistributed. See license for details. echo NetHack may be freely redistributed. See license for details.
echo. echo.
REM setup batch file for msdos, see Install.dos for details. REM setup batch file for msdos, see Install.dos for details.
+1 -1
View File
@@ -766,7 +766,7 @@ vesa_Init(void)
* *
*/ */
tile_file = iflags.wc_tile_file; tile_file = iflags.wc_tile_file;
if (tile_file == NULL || tile_file == '\0') { if (tile_file == NULL || *tile_file == '\0') {
tile_file = "nhtiles.bmp"; tile_file = "nhtiles.bmp";
} }
if (!read_tiles(tile_file, FALSE)) if (!read_tiles(tile_file, FALSE))
+1 -1
View File
@@ -758,7 +758,7 @@ vga_Init(void)
* *
*/ */
tile_file = iflags.wc_tile_file; tile_file = iflags.wc_tile_file;
if (tile_file == NULL || tile_file == '\0') { if (tile_file == NULL || *tile_file == '\0') {
tile_file = "nhtiles.bmp"; tile_file = "nhtiles.bmp";
} }
if (!read_tiles(tile_file, FALSE)) if (!read_tiles(tile_file, FALSE))