Merge branch 'master' into random

Conflicts:
	zone/command.cpp
	zone/merc.cpp
This commit is contained in:
Michael Cook (mackal)
2014-12-02 14:05:55 -05:00
14 changed files with 550 additions and 541 deletions
+1
View File
@@ -594,6 +594,7 @@ void Mob::RogueBackstab(Mob* other, bool min_damage, int ReuseTime)
for (int i = 0; i < EmuConstants::ITEM_COMMON_SIZE; ++i)
{
ItemInst *aug = wpn->GetAugment(i);
if(aug)
{
backstab_dmg += aug->GetItem()->BackstabDmg;
}