Mercurial > hg > early-roguelike

diff urogue/newlvl.c @ 304:e52a8a7ad4c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix many compiler warnings. There should only be two changes in behavior: arogue7/fight.c, arogue7/fight.c: a to-hit bonus is now correctly applied to characters who are not monks instead of monks who are not empty-handed. urogue/fight.c: fixed an interaction with the "debug" macro that could cause the wrong message to be displayed.
author John "Elwin" Edwards
date Wed, 14 Apr 2021 18:55:33 -0400
parents c495a4f288c6
children 13b482bd9e66
line wrap: on
line diff
--- a/urogue/newlvl.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/urogue/newlvl.c	Wed Apr 14 18:55:33 2021 -0400
@@ -264,7 +264,7 @@
                 turn_off(player, BLESSMAP);
         }
 
-        if (player.t_ctype == C_THIEF || on(player, BLESSGOLD) && rnd(5) == 0)
+        if (player.t_ctype == C_THIEF || (on(player, BLESSGOLD) && rnd(5) == 0))
         {
             read_scroll(&player, S_GFIND, ISNORMAL);
 
@@ -272,7 +272,8 @@
                 turn_off(player, BLESSGOLD);
         }
 
-        if (player.t_ctype == C_RANGER || on(player, BLESSFOOD) && rnd(5) == 0)
+        if (player.t_ctype == C_RANGER || 
+            (on(player, BLESSFOOD) && rnd(5) == 0))
         {
             read_scroll(&player, S_FOODDET, ISNORMAL);
 
@@ -281,7 +282,7 @@
         }
 
         if (player.t_ctype == C_MAGICIAN || player.t_ctype == C_ILLUSION ||
-            on(player, BLESSMAGIC) && rnd(5) == 0)
+            (on(player, BLESSMAGIC) && rnd(5) == 0))
         {
             quaff(&player, P_TREASDET, ISNORMAL);
 
@@ -289,7 +290,7 @@
                 turn_off(player, BLESSMAGIC);
         }
 
-        if (player.t_ctype == C_DRUID || on(player, BLESSMONS) && rnd(5) == 0)
+        if (player.t_ctype == C_DRUID || (on(player, BLESSMONS) && rnd(5) == 0))
         {
             quaff(&player, P_MONSTDET, ISNORMAL);
 
@@ -305,7 +306,7 @@
         aggravate();
 
     if (is_wearing(R_ADORNMENT) ||
-        cur_armor != NULL && cur_armor->o_which == MITHRIL)
+        (cur_armor != NULL && cur_armor->o_which == MITHRIL))
     {
         int greed = FALSE;