Mercurial > hg > early-roguelike

changeset 297:317166b49d8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ultra-Rogue: add a NULL check.
author John "Elwin" Edwards
date Thu, 08 Feb 2018 18:56:15 -0500
parents 000b1c5b8d63
children 5a94c9b3181e
files urogue/fight.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/urogue/fight.c	Mon Jan 15 20:20:35 2018 -0500
+++ b/urogue/fight.c	Thu Feb 08 18:56:15 2018 -0500
@@ -1143,7 +1143,7 @@
 
     if (attacker->t_index == attackee->t_index)
     {
-        if (attacker == THINGPTR(fam_ptr) && er_visible)
+        if (fam_ptr && attacker == THINGPTR(fam_ptr) && er_visible)
             msg("Master, I cannot hit one of my brethren.");
         if (!thrown && rnd(100) - attacker->t_stats.s_charisma + luck < 0) 
 		{