B/U/C Priest suggestion by Pat

- also a win32 dsp file modification

diff --git a/src/invent.c b/src/invent.c
index baa5242c979523720f393d353abaa85fefd9d618..40a1147a743d1b5d2961d25d9f10ee665bb35cc4 100644 (file)
--- a/src/invent.c
+++ b/src/invent.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)invent.c   3.4     2002/02/23      */
+/*     SCCS Id: @(#)invent.c   3.4     2002/04/07      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1761,24 +1761,23 @@ count_buc(list, type)
     int count = 0;
 
     while (list) {
+       if (Role_if(PM_PRIEST)) list->bknown = TRUE;
        switch(type) {
            case BUC_BLESSED:
-               if (list->oclass != GOLD_CLASS &&
-                   (list->bknown || Role_if(PM_PRIEST)) && list->blessed)
+               if (list->oclass != GOLD_CLASS && list->bknown && list->blessed)
                    count++;
                break;
            case BUC_CURSED:
-               if (list->oclass != GOLD_CLASS &&
-                   (list->bknown || Role_if(PM_PRIEST)) && list->cursed)
+               if (list->oclass != GOLD_CLASS && list->bknown && list->cursed)
                    count++;
                break;
            case BUC_UNCURSED:
                if (list->oclass != GOLD_CLASS &&
-                   (list->bknown || Role_if(PM_PRIEST)) && !list->blessed && !list->cursed)
+                       list->bknown && !list->blessed && !list->cursed)
                    count++;
                break;
            case BUC_UNKNOWN:
-               if (list->oclass != GOLD_CLASS && !(list->bknown || Role_if(PM_PRIEST)))
+               if (list->oclass != GOLD_CLASS && !list->bknown)
                    count++;
                break;
            default:

diff --git a/src/pickup.c b/src/pickup.c
index 08a2e37f49e5ae159952cd677d4a1902b58cf550..aedf71c98e43d1d14eaa8f9fb2ddf2965c610ec1 100644 (file)
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)pickup.c   3.4     2002/03/30      */
+/*     SCCS Id: @(#)pickup.c   3.4     2002/04/07      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -312,23 +312,21 @@ boolean
 allow_category(obj)
 struct obj *obj;
 {
+    if (Role_if(PM_PRIEST)) obj->bknown = TRUE;
     if (((index(valid_menu_classes,'u') != (char *)0) && obj->unpaid) ||
        (index(valid_menu_classes, obj->oclass) != (char *)0))
        return TRUE;
     else if (((index(valid_menu_classes,'U') != (char *)0) &&
-       (obj->oclass != GOLD_CLASS && (obj->bknown || Role_if(PM_PRIEST)) &&
-       !obj->blessed && !obj->cursed)))
+       (obj->oclass != GOLD_CLASS && obj->bknown && !obj->blessed && !obj->cursed)))
        return TRUE;
     else if (((index(valid_menu_classes,'B') != (char *)0) &&
-       (obj->oclass != GOLD_CLASS &&
-       (obj->bknown || Role_if(PM_PRIEST)) && obj->blessed)))
+       (obj->oclass != GOLD_CLASS && obj->bknown && obj->blessed)))
        return TRUE;
     else if (((index(valid_menu_classes,'C') != (char *)0) &&
-       (obj->oclass != GOLD_CLASS &&
-       (obj->bknown || Role_if(PM_PRIEST)) && obj->cursed)))
+       (obj->oclass != GOLD_CLASS && obj->bknown && obj->cursed)))
        return TRUE;
     else if (((index(valid_menu_classes,'X') != (char *)0) &&
-       (obj->oclass != GOLD_CLASS && !(obj->bknown || Role_if(PM_PRIEST)))))
+       (obj->oclass != GOLD_CLASS && !obj->bknown)))
        return TRUE;
     else
        return FALSE;

diff --git a/win/win32/nethackw.dsp b/win/win32/nethackw.dsp
index e3ab108f68dad0dde53280aba2276d98cae690ae..ed0d73da34ab69ee7dd7cb6ee5e9ad1877679f1e 100644 (file)
--- a/win/win32/nethackw.dsp
+++ b/win/win32/nethackw.dsp
@@ -54,7 +54,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib advapi32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib advapi32.lib /nologo /subsystem:windows /map /debug /machine:I386 /MAPINFO:EXPORTS /MAPINFO:LINES
+# SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"