pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-08-30 05:28:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into lua

Browse Source 
Conflicts:
	zone/merc.cpp
This commit is contained in:
KimLS
2013-06-27 12:53:47 -07:00
parent d12c700bbf d25205d9d3
commit a5db4310c6
28 changed files with 180 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob.cpp
+1 -3
View File
@@ -226,8 +226,7 @@ Mob::Mob(const char* in_name,
PermaProcs[j].chance = 0;
PermaProcs[j].base_spellID = SPELL_UNKNOWN;
SpellProcs[j].spellID = SPELL_UNKNOWN;
SpellProcs[j].chance = 0;
SpellProcs[j].base_spellID = SPELL_UNKNOWN;
DefensiveProcs[j].spellID = SPELL_UNKNOWN;
DefensiveProcs[j].chance = 0;
DefensiveProcs[j].base_spellID = SPELL_UNKNOWN;
@@ -272,7 +271,6 @@ Mob::Mob(const char* in_name,
casting_spell_timer = 0;
casting_spell_timer_duration = 0;
casting_spell_type = 0;
casting_spell_inventory_slot = 0;
target = 0;
memset(&itembonuses, 0, sizeof(StatBonuses));