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

Merge branch 'master' of https://github.com/EQEmu/Server into EQEmu-master

Browse Source 
Conflicts:
	zone/client.h
	zone/mod_functions.cpp
	zone/mod_functions_base.cpp
This commit is contained in:
root
2013-06-01 19:17:23 -05:00
parent ac5926bdfe 39426789f4
commit 7fca5a7a89
231 changed files with 2955 additions and 3061 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spells.cpp
+9 -7
View File
@@ -83,13 +83,15 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
#include "../common/bodytypes.h"
#include "../common/classes.h"
#include "../common/rulesys.h"
#include "../common/StringUtil.h"
#include <math.h>
#include <assert.h>
#ifndef WIN32
// #include <pthread.h>
#include <stdlib.h>
#include "../common/unix.h"
#include <stdlib.h>
#include "../common/unix.h"
#endif
#ifdef _GOTFRAGS
#include "../common/packet_dump_file.h"
#endif
@@ -1955,8 +1957,8 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16
while(angle_end > 360.0f)
angle_end -= 360.0f;
list<Mob*> targets_in_range;
list<Mob*>::iterator iter;
std::list<Mob*> targets_in_range;
std::list<Mob*>::iterator iter;
entity_list.GetTargetsForConeArea(this, spells[spell_id].aoerange, spells[spell_id].aoerange / 2, targets_in_range);
iter = targets_in_range.begin();
@@ -2719,7 +2721,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid
int buffslot, ret, caster_level, emptyslot = -1;
bool will_overwrite = false;
vector<int> overwrite_slots;
std::vector<int> overwrite_slots;
if(level_override > 0)
caster_level = level_override;
@@ -2829,7 +2831,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid
// to remove some other buffs already worn if will_overwrite is true
if(will_overwrite)
{
vector<int>::iterator cur, end;
std::vector<int>::iterator cur, end;
cur = overwrite_slots.begin();
end = overwrite_slots.end();
for(; cur != end; cur++) {