diff --git a/common/EQStreamFactory.cpp b/common/EQStreamFactory.cpp index c91bdf110..260be7d56 100644 --- a/common/EQStreamFactory.cpp +++ b/common/EQStreamFactory.cpp @@ -145,7 +145,6 @@ void EQStreamFactory::ReaderLoop() { fd_set readset; std::map,EQStream *>::iterator stream_itr; -EQStream* currStream = NULL; int num; int length; unsigned char buffer[2048]; diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index 5da329e54..eb0ca4db5 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -606,14 +606,16 @@ void Mob::RogueBackstab(Mob* other, bool min_damage, int ReuseTime) if(IsClient()){ const ItemInst *wpn = nullptr; wpn = CastToClient()->GetInv().GetItem(SLOT_PRIMARY); - primaryweapondamage = GetWeaponDamage(other, wpn); - backstab_dmg = wpn->GetItem()->BackstabDmg; - for(int i = 0; i < MAX_AUGMENT_SLOTS; ++i) - { - ItemInst *aug = wpn->GetAugment(i); - if(aug) + if(wpn) { + primaryweapondamage = GetWeaponDamage(other, wpn); + backstab_dmg = wpn->GetItem()->BackstabDmg; + for(int i = 0; i < MAX_AUGMENT_SLOTS; ++i) { - backstab_dmg += aug->GetItem()->BackstabDmg; + ItemInst *aug = wpn->GetAugment(i); + if(aug) + { + backstab_dmg += aug->GetItem()->BackstabDmg; + } } } }