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

Switched out our kinda juryrigged vector types for glm::vec types since we use that as a 3d math library already but never switched out the types

Browse Source
This commit is contained in:
KimLS
2015-01-23 00:01:10 -08:00
parent 03286f540a
commit 269d56e1d0
68 changed files with 1524 additions and 1692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/raids.cpp
+8 -8
View File
@@ -489,7 +489,7 @@ void Raid::CastGroupSpell(Mob* caster, uint16 spellid, uint32 gid)
else if(members[x].member != nullptr)
{
if(members[x].GroupNumber == gid){
distance = ComparativeDistance(caster->GetPosition(), members[x].member->GetPosition());
distance = DistanceSquared(caster->GetPosition(), members[x].member->GetPosition());
if(distance <= range2){
caster->SpellOnTarget(spellid, members[x].member);
#ifdef GROUP_BUFF_PETS
@@ -537,7 +537,7 @@ void Raid::HealGroup(uint32 heal_amt, Mob* caster, uint32 gid, float range)
if(members[gi].member){
if(members[gi].GroupNumber == gid)
{
distance = ComparativeDistance(caster->GetPosition(), members[gi].member->GetPosition());
distance = DistanceSquared(caster->GetPosition(), members[gi].member->GetPosition());
if(distance <= range2){
numMem += 1;
}
@@ -551,7 +551,7 @@ void Raid::HealGroup(uint32 heal_amt, Mob* caster, uint32 gid, float range)
if(members[gi].member){
if(members[gi].GroupNumber == gid)
{
distance = ComparativeDistance(caster->GetPosition(), members[gi].member->GetPosition());
distance = DistanceSquared(caster->GetPosition(), members[gi].member->GetPosition());
if(distance <= range2){
members[gi].member->SetHP(members[gi].member->GetHP() + heal_amt);
members[gi].member->SendHPUpdate();
@@ -581,7 +581,7 @@ void Raid::BalanceHP(int32 penalty, uint32 gid, float range, Mob* caster, int32
if(members[gi].member){
if(members[gi].GroupNumber == gid)
{
distance = ComparativeDistance(caster->GetPosition(), members[gi].member->GetPosition());
distance = DistanceSquared(caster->GetPosition(), members[gi].member->GetPosition());
if(distance <= range2){
dmgtaken_tmp = members[gi].member->GetMaxHP() - members[gi].member->GetHP();
@@ -602,7 +602,7 @@ void Raid::BalanceHP(int32 penalty, uint32 gid, float range, Mob* caster, int32
if(members[gi].member){
if(members[gi].GroupNumber == gid)
{
distance = ComparativeDistance(caster->GetPosition(), members[gi].member->GetPosition());
distance = DistanceSquared(caster->GetPosition(), members[gi].member->GetPosition());
if(distance <= range2){
if((members[gi].member->GetMaxHP() - dmgtaken) < 1){//this way the ability will never kill someone
members[gi].member->SetHP(1); //but it will come darn close
@@ -637,7 +637,7 @@ void Raid::BalanceMana(int32 penalty, uint32 gid, float range, Mob* caster, int3
if(members[gi].GroupNumber == gid)
{
if (members[gi].member->GetMaxMana() > 0) {
distance = ComparativeDistance(caster->GetPosition(), members[gi].member->GetPosition());
distance = DistanceSquared(caster->GetPosition(), members[gi].member->GetPosition());
if(distance <= range2){
manataken_tmp = members[gi].member->GetMaxMana() - members[gi].member->GetMana();
@@ -660,7 +660,7 @@ void Raid::BalanceMana(int32 penalty, uint32 gid, float range, Mob* caster, int3
if(members[gi].member){
if(members[gi].GroupNumber == gid)
{
distance = ComparativeDistance(caster->GetPosition(), members[gi].member->GetPosition());
distance = DistanceSquared(caster->GetPosition(), members[gi].member->GetPosition());
if(distance <= range2){
if((members[gi].member->GetMaxMana() - manataken) < 1){
members[gi].member->SetMana(1);
@@ -791,7 +791,7 @@ void Raid::GroupBardPulse(Mob* caster, uint16 spellid, uint32 gid){
else if(members[z].member != nullptr)
{
if(members[z].GroupNumber == gid){
distance = ComparativeDistance(caster->GetPosition(), members[z].member->GetPosition());
distance = DistanceSquared(caster->GetPosition(), members[z].member->GetPosition());
if(distance <= range2) {
members[z].member->BardPulse(spellid, caster);
#ifdef GROUP_BUFF_PETS