From c030cfe0ad00f18e62885e04724540203306d656 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Fri, 28 Feb 2014 02:56:36 -0500 Subject: [PATCH] Fix zone crash with TryWeaponProc --- zone/attack.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/zone/attack.cpp b/zone/attack.cpp index db8e5bf6c..0b59632b1 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -4080,7 +4080,7 @@ void Mob::TryWeaponProc(const ItemInst *inst, const Item_Struct *weapon, Mob *on } } - if (!proced) { + if (!proced && inst) { for (int r = 0; r < MAX_AUGMENT_SLOTS; r++) { const ItemInst *aug_i = inst->GetAugment(r); if (!aug_i) // no aug, try next slot! @@ -4098,12 +4098,10 @@ void Mob::TryWeaponProc(const ItemInst *inst, const Item_Struct *weapon, Mob *on Mob *own = GetOwner(); if (own) own->Message_StringID(13, PROC_PETTOOLOW); - } - else { + } else { Message_StringID(13, PROC_TOOLOW); } - } - else { + } else { ExecWeaponProc(aug_i, aug->Proc.Effect, on); break; }