From 9773742e82c264b2eb148e846c1fb99d9631250e Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 24 Feb 2018 23:26:25 -0500 Subject: [PATCH] fix some msdos build errors --- src/files.c | 2 +- sys/msdos/Makefile.GCC | 2 +- sys/msdos/setup.bat | 4 ++-- sys/msdos/vidvesa.c | 2 +- sys/msdos/vidvga.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/files.c b/src/files.c index 4c46d23d0..f1bb770b2 100644 --- a/src/files.c +++ b/src/files.c @@ -1977,7 +1977,7 @@ int src; set_configfile_name(fqname(backward_compat_configfile, CONFIGPREFIX, 0)); if ((fp = fopenp(configfile, "r")) != (FILE *) 0) { return fp; - } else if (strcmp(backwad_compat_configfile, configfile)) { + } else if (strcmp(backward_compat_configfile, configfile)) { set_configfile_name(backward_compat_configfile); if ((fp = fopenp(configfile, "r")) != (FILE *) 0) return fp; diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC index 68265b6c2..38c71fc9b 100644 --- a/sys/msdos/Makefile.GCC +++ b/sys/msdos/Makefile.GCC @@ -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 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 -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 \ $(O)video.o $(O)vidtxt.o $(O)pckeys.o diff --git a/sys/msdos/setup.bat b/sys/msdos/setup.bat index 63e9de9d6..b2e373f7a 100755 --- a/sys/msdos/setup.bat +++ b/sys/msdos/setup.bat @@ -1,10 +1,10 @@ @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 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. 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. REM setup batch file for msdos, see Install.dos for details. diff --git a/sys/msdos/vidvesa.c b/sys/msdos/vidvesa.c index 4f497ef9b..e9b7bb183 100644 --- a/sys/msdos/vidvesa.c +++ b/sys/msdos/vidvesa.c @@ -766,7 +766,7 @@ vesa_Init(void) * */ tile_file = iflags.wc_tile_file; - if (tile_file == NULL || tile_file == '\0') { + if (tile_file == NULL || *tile_file == '\0') { tile_file = "nhtiles.bmp"; } if (!read_tiles(tile_file, FALSE)) diff --git a/sys/msdos/vidvga.c b/sys/msdos/vidvga.c index 888010d4b..4e8a18206 100644 --- a/sys/msdos/vidvga.c +++ b/sys/msdos/vidvga.c @@ -758,7 +758,7 @@ vga_Init(void) * */ tile_file = iflags.wc_tile_file; - if (tile_file == NULL || tile_file == '\0') { + if (tile_file == NULL || *tile_file == '\0') { tile_file = "nhtiles.bmp"; } if (!read_tiles(tile_file, FALSE))