updated files

sys/unix/Makefile.src

@@ -448,7 +448,7 @@ HACKCSRC = allmain.c alloc.c apply.c artifact.c attrib.c ball.c bones.c \
 	   mplayer.c mthrowu.c muse.c music.c o_init.c objects.c objnam.c \
 	   options.c pager.c pickup.c pline.c polyself.c potion.c pray.c \
 	   priest.c quest.c questpgr.c read.c rect.c region.c restore.c \
-	   rip.c rnd.c role.c rumors.c save.c \
+	   rip.c rnd.c role.c rumors.c save.c sfstruct.c \
 	   sfbase.c sfdata.c sfascii.c sflendian.c \
 	   shk.c shknam.c sit.c sounds.c \
 	   sp_lev.c spell.c steal.c steed.c sys.c teleport.c timeout.c \
@@ -517,7 +517,7 @@ HOBJ = $(FIRSTOBJ) allmain.o alloc.o apply.o artifact.o attrib.o ball.o \
 	mplayer.o mthrowu.o muse.o music.o o_init.o objnam.o options.o \
 	pager.o pickup.o pline.o polyself.o potion.o pray.o priest.o \
 	quest.o questpgr.o read.o rect.o region.o restore.o rip.o rnd.o \
-	role.o rumors.o save.o \
+	role.o rumors.o save.o sfstruct.o \
 	sfbase.o sfdata.o sfascii.o sflendian.o \
 	shk.o shknam.o sit.o sounds.o sp_lev.o spell.o sys.o \
 	steal.o steed.o teleport.o timeout.o topten.o track.o trap.o u_init.o \
@@ -664,22 +664,23 @@ tile.c: ../win/share/tilemap.c $(HACK_H)
 # readtags dependencies
 #
 #
-../util/readtags:
-	@( cd ../util ; $(MAKE) readtags )
-
-../util/nethack.tags:
-	@( cd ../util ; $(MAKE) nethack.tags )
-
+sfstruct.o: sfstruct.c $(HACK_H)
 sfbase.o: sfbase.c $(HACK_H) ../include/sfproto.h ../include/sfprocs.h
 sfascii.o: sfascii.c $(HACK_H) ../include/sfprocs.h
 sflendian.o: sflendian.c $(HACK_H) ../include/sfprocs.h
 sfdata.o: sfdata.c $(HACK_H) ../include/sfprocs.h
 
-sfdata.c: ../util/readtags ../util/nethack.tags
-	@( cd ../util ; ./readtags )
-
-../include/sfproto.h: ../util/readtags ../util/nethack.tags
-	@( cd ../util ; ./readtags )
+#../util/readtags:
+#	@( cd ../util ; $(MAKE) readtags )
+#
+#../util/nethack.tags:
+#	@( cd ../util ; $(MAKE) nethack.tags )
+#
+#sfdata.c: ../util/readtags ../util/nethack.tags
+#	@( cd ../util ; ./readtags )
+#
+#../include/sfproto.h: ../util/readtags ../util/nethack.tags
+#	@( cd ../util ; ./readtags )
 
 #	date.h should be remade any time any of the source or include code
 #	is modified.  Unfortunately, this would make the contents of this

sys/winnt/Makefile.msc

@@ -236,8 +236,8 @@ VOBJ24 = $(O)track.o    $(O)trap.o     $(O)u_init.o   $(O)uhitm.o
 VOBJ25 = $(O)vault.o    $(O)vis_tab.o  $(O)vision.o   $(O)weapon.o
 VOBJ26 = $(O)were.o     $(O)wield.o    $(O)windows.o  $(O)wizard.o
 VOBJ27 = $(O)worm.o     $(O)worn.o     $(O)write.o    $(O)zap.o
-VOBJ28 = $(O)sfbase.o   $(O)sfdata.o   $(O)sfascii.o  $(O)sflendian.o
-#VOBJ29 = 
+VOBJ28 = $(O)sfbase.o   $(O)sfdata.o   
+VOBJ29 = $(O)sfstruct.o $(O)sfascii.o  $(O)sflendian.o
 
 DLBOBJ = $(O)dlb.o
 
@@ -1504,6 +1504,9 @@ $(O)sfbase.o: $(HACK_H) $(INCL)\sfproto.h $(INCL)\sfprocs.h \
 $(O)sfdata.o: $(HACK_H) $(INCL)\sfprocs.h $(SRC)\sfdata.c
 	@$(cc) $(cflagsBuild) -Fo$@ $(SRC)\sfdata.c
 
+$(O)sfstruct.o: $(HACK_H) $(SRC)\sfstruct.c
+	@$(cc) $(cflagsBuild) -Fo$@ $(SRC)\sfstruct.c
+
 $(O)sfascii.o: $(HACK_H) $(INCL)\sfprocs.h $(SRC)\sfascii.c
 	@$(cc) $(cflagsBuild) -Fo$@ $(SRC)\sfascii.c
 

sys/winnt/windmain.c

@@ -798,7 +798,7 @@ getlock()
     }
 
     /* regularize(lock); */ /* already done in pcmain */
-    Sprintf(tbuf, "%s", fqname(g.lock, LEVELPREFIX, 0));
+    /*Sprintf(tbuf, "%s", fqname(g.lock, LEVELPREFIX, 0)); */
     set_levelfile_name(g.lock, 0);
     fq_lock = fqname(g.lock, LEVELPREFIX, 1);
     if ((fd = open(fq_lock, 0)) == -1) {
@@ -807,21 +807,7 @@ getlock()
 #if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
         chdirx(orgdir, 0);
 #endif
-#if defined(HOLD_LOCKFILE_OPEN)
-        if (errno == EACCES) {
-            Strcpy(
-                oops,
-                "\nThere are files from a game in progress under your name.");
-            Strcat(oops, "\nThe files are locked or inaccessible.");
-            Strcat(oops, " Is the other game still running?\n");
-            if (strlen(fq_lock) < ((OOPS_BUFSZ - 16) - strlen(oops)))
-                Sprintf(eos(oops), "Cannot open %s", fq_lock);
-            Strcat(oops, "\n");
-            unlock_file(HLOCK);
-            raw_print(oops);
-        } else
-#endif
-            error("Bad directory or name: %s\n%s\n", fq_lock,
+        error("Bad directory or name: %s\n%s\n", fq_lock,
                   strerror(errno));
         unlock_file(HLOCK);
         Sprintf(oops, "Cannot open %s", fq_lock);

sys/winnt/winnt.c

@@ -505,8 +505,10 @@ int code;
            a little cleaner than the stdio one */
         windowprocs.win_nhgetch = windows_console_custom_nhgetch;
     }
-    if (getreturn_enabled)
+    if (getreturn_enabled) {
+        raw_print("\n");
         wait_synch();
+    }
     exit(code);
 }