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

ZoneSpellsBlocked converted x,y, and z to m_Location as xyz_location

Browse Source
This commit is contained in:
Arthur Ice 2014-12-01 13:05:40 -08:00
parent 31d32682b0
commit 2fe80d32f9
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zone/zone.cpp
View File

@ -1919,9 +1919,9 @@ bool Zone::IsSpellBlocked(uint32 spell_id, float nx, float ny, float nz)
} }
case 2: case 2:
{ {
if ((( nx >= (blocked_spells[x].x-blocked_spells[x].xdiff)) && (nx <= (blocked_spells[x].x+blocked_spells[x].xdiff))) && if ((( nx >= (blocked_spells[x].m_Location.m_X-blocked_spells[x].xdiff)) && (nx <= (blocked_spells[x].m_Location.m_X+blocked_spells[x].xdiff))) &&
(( ny >= (blocked_spells[x].y-blocked_spells[x].ydiff)) && (ny <= (blocked_spells[x].y+blocked_spells[x].ydiff))) && (( ny >= (blocked_spells[x].m_Location.m_Y-blocked_spells[x].ydiff)) && (ny <= (blocked_spells[x].m_Location.m_Y+blocked_spells[x].ydiff))) &&
(( nz >= (blocked_spells[x].z-blocked_spells[x].zdiff)) && (nz <= (blocked_spells[x].z+blocked_spells[x].zdiff)))) (( nz >= (blocked_spells[x].m_Location.m_Z-blocked_spells[x].zdiff)) && (nz <= (blocked_spells[x].m_Location.m_Z+blocked_spells[x].zdiff))))
{ {
return true; return true;
} }
@ -1957,9 +1957,9 @@ const char* Zone::GetSpellBlockedMessage(uint32 spell_id, float nx, float ny, fl
} }
case 2: case 2:
{ {
if((( nx > (blocked_spells[x].x-blocked_spells[x].xdiff)) && (nx < (blocked_spells[x].x+blocked_spells[x].xdiff))) && if((( nx > (blocked_spells[x].m_Location.m_X-blocked_spells[x].xdiff)) && (nx < (blocked_spells[x].m_Location.m_X+blocked_spells[x].xdiff))) &&
(( ny > (blocked_spells[x].y-blocked_spells[x].ydiff)) && (ny < (blocked_spells[x].y+blocked_spells[x].ydiff))) && (( ny > (blocked_spells[x].m_Location.m_Y-blocked_spells[x].ydiff)) && (ny < (blocked_spells[x].m_Location.m_Y+blocked_spells[x].ydiff))) &&
(( nz > (blocked_spells[x].z-blocked_spells[x].zdiff)) && (nz < (blocked_spells[x].z+blocked_spells[x].zdiff)))) (( nz > (blocked_spells[x].m_Location.m_Z-blocked_spells[x].zdiff)) && (nz < (blocked_spells[x].m_Location.m_Z+blocked_spells[x].zdiff))))
{ {
return blocked_spells[x].message; return blocked_spells[x].message;
} }

4
zone/zonedb.cpp
View File

@ -2666,9 +2666,7 @@ bool ZoneDatabase::LoadBlockedSpells(int32 blockedSpellsCount, ZoneSpellsBlocked
memset(&into[index], 0, sizeof(ZoneSpellsBlocked)); memset(&into[index], 0, sizeof(ZoneSpellsBlocked));
into[index].spellid = atoi(row[1]); into[index].spellid = atoi(row[1]);
into[index].type = atoi(row[2]); into[index].type = atoi(row[2]);
into[index].x = atof(row[3]); into[index].m_Location = xyz_location(atof(row[3]), atof(row[4]), atof(row[5]));
into[index].y = atof(row[4]);
into[index].z = atof(row[5]);
into[index].xdiff = atof(row[6]); into[index].xdiff = atof(row[6]);
into[index].ydiff = atof(row[7]); into[index].ydiff = atof(row[7]);
into[index].zdiff = atof(row[8]); into[index].zdiff = atof(row[8]);

4
zone/zonedb.h
View File

@ -116,9 +116,7 @@ struct PetInfo {
struct ZoneSpellsBlocked { struct ZoneSpellsBlocked {
uint32 spellid; uint32 spellid;
int8 type; int8 type;
float x; xyz_location m_Location;
float y;
float z;
float xdiff; float xdiff;
float ydiff; float ydiff;
float zdiff; float zdiff;