From c928cda7753998ff294835051d1c35d30ed8e4e6 Mon Sep 17 00:00:00 2001 From: Bart House Date: Sun, 30 Jun 2019 16:34:41 -0700 Subject: [PATCH 1/3] Need to check ball and chain after we have procesed floor objects. --- src/restore.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/restore.c b/src/restore.c index 69d4660c5..14612e08e 100644 --- a/src/restore.c +++ b/src/restore.c @@ -672,13 +672,6 @@ unsigned int *stuckid, *steedid; if (otmp->owornmask) setworn(otmp, otmp->owornmask); - if ((uball && !uchain) || (uchain && !uball)) { - impossible("restgamestate: lost ball & chain"); - /* poor man's unpunish() */ - setworn((struct obj *) 0, W_CHAIN); - setworn((struct obj *) 0, W_BALL); - } - /* reset weapon so that player will get a reminder about "bashing" during next fight when bare-handed or wielding an unconventional item; for pick-axe, we aren't able to distinguish between having @@ -921,6 +914,13 @@ register int fd; if (otmp->owornmask) setworn(otmp, otmp->owornmask); + if ((uball && !uchain) || (uchain && !uball)) { + impossible("restgamestate: lost ball & chain"); + /* poor man's unpunish() */ + setworn((struct obj *) 0, W_CHAIN); + setworn((struct obj *) 0, W_BALL); + } + /* in_use processing must be after: * + The inventory has been read so that freeinv() works. * + The current level has been restored so billing information From 1b0d47911fbaa0cba0ae11ad92eea6aaee624a54 Mon Sep 17 00:00:00 2001 From: Bart House Date: Sun, 30 Jun 2019 16:41:24 -0700 Subject: [PATCH 2/3] When restoring game we should not need to invoke rnd to test for hiding. --- src/restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/restore.c b/src/restore.c index 14612e08e..b6126a227 100644 --- a/src/restore.c +++ b/src/restore.c @@ -1140,7 +1140,7 @@ boolean ghostly; them is different now than when the level was saved */ restore_cham(mtmp); /* give hiders a chance to hide before their next move */ - if (ghostly || elapsed > (long) rnd(10)) + if (ghostly || (elapsed > 00 && elapsed > (long) rnd(10))) hide_monst(mtmp); } From 3e86b46f8a35757e6066a5d23129ae6b136d4e47 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sun, 30 Jun 2019 22:19:37 -0400 Subject: [PATCH 3/3] fix up Windows gcc Makefile --- sys/winnt/Makefile.gcc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc index 5fd3181da..358965369 100644 --- a/sys/winnt/Makefile.gcc +++ b/sys/winnt/Makefile.gcc @@ -90,8 +90,8 @@ TARGET_CPU=x86 # of your PDCurses C files which must already be resident on # your machine. # -#ADD_CURSES=Y -#PDCURSES_TOP=../../pdcurses +# ADD_CURSES=Y +# PDCURSES_TOP=../../pdcurses #4b Qt # @@ -404,12 +404,11 @@ PDCSRC = $(PDCURSES_TOP)/pdcurses PDCWINCON = $(PDCURSES_TOP)/wincon PDCLIBOBJS = $(O)addch.o $(O)addchstr.o $(O)addstr.o $(O)attr.o $(O)beep.o \ $(O)bkgd.o $(O)border.o $(O)clear.o $(O)color.o $(O)delch.o $(O)deleteln.o \ - $(O)deprec.o $(O)getch.o $(O)getstr.o $(O)getyx.o $(O)inch.o $(O)inchstr.o \ + $(O)getch.o $(O)getstr.o $(O)getyx.o $(O)inch.o $(O)inchstr.o \ $(O)initscr.o $(O)inopts.o $(O)insch.o $(O)insstr.o $(O)instr.o $(O)kernel.o \ $(O)keyname.o $(O)mouse.o $(O)move.o $(O)outopts.o $(O)overlay.o $(O)pad.o \ $(O)panel.o $(O)printw.o $(O)refresh.o $(O)scanw.o $(O)scr_dump.o $(O)scroll.o \ - $(O)slk.o $(O)termattr.o $(O)terminfo.o $(O)touch.o $(O)util.o $(O)window.o \ - $(O)debug.o + $(O)slk.o $(O)termattr.o $(O)touch.o $(O)util.o $(O)window.o $(O)debug.o PDCOBJS = $(O)pdcclip.o $(O)pdcdisp.o $(O)pdcgetsc.o $(O)pdckbd.o $(O)pdcscrn.o \ $(O)pdcsetsc.o $(O)pdcutil.o