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

Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes

Browse Source
This commit is contained in:
j883376
2013-05-23 21:12:07 -04:00
parent d6ff01d63c 815c3dc73f
commit b47597b813
219 changed files with 2420 additions and 2489 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spell_effects.cpp
+2 -2
View File
@@ -3759,7 +3759,7 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id)
return 0;
}
for (map<uint32, AA_Ability>::const_iterator iter = aa_effects[aa_ID].begin(); iter != aa_effects[aa_ID].end(); ++iter)
for (std::map<uint32, AA_Ability>::const_iterator iter = aa_effects[aa_ID].begin(); iter != aa_effects[aa_ID].end(); ++iter)
{
effect = iter->second.skill_id;
base1 = iter->second.base1;
@@ -4643,7 +4643,7 @@ int16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) {
uint8 SizeProcList = 0;
uint8 MAX_SYMPATHETIC = 10;
vector<int> SympatheticProcList;
std::vector<int> SympatheticProcList;
//item focus
if (itembonuses.FocusEffects[type]){