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

double to float conversions

Browse Source
This commit is contained in:
Arthur Dene Ice 2014-05-09 20:33:57 -07:00
parent d07114b7d7
commit cc8e6fa4d4
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
zone/spell_effects.cpp
View File

@ -418,10 +418,10 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
float x, y, z, heading; float x, y, z, heading;
const char *target_zone; const char *target_zone;
x = spell.base[1]; x = (float)spell.base[1];
y = spell.base[0]; y = (float)spell.base[0];
z = spell.base[2]; z = (float)spell.base[2];
heading = spell.base[3]; heading = (float)spell.base[3];
if(!strcmp(spell.teleport_zone, "same")) if(!strcmp(spell.teleport_zone, "same"))
{ {
@ -490,10 +490,10 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
float x, y, z, heading; float x, y, z, heading;
const char *target_zone; const char *target_zone;
x = spell.base[1]; x = (float)spell.base[1];
y = spell.base[0]; y = (float)spell.base[0];
z = spell.base[2]; z = (float)spell.base[2];
heading = spell.base[3]; heading = (float)spell.base[3];
if(!strcmp(spell.teleport_zone, "same")) if(!strcmp(spell.teleport_zone, "same"))
{ {
@ -791,7 +791,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
if (!bBreak) if (!bBreak)
{ {
int resistMod = partial + (GetCHA()/25); int resistMod = (int)(partial + (GetCHA()/25));
resistMod = resistMod > 100 ? 100 : resistMod; resistMod = resistMod > 100 ? 100 : resistMod;
buffs[buffslot].ticsremaining = resistMod * buffs[buffslot].ticsremaining / 100; buffs[buffslot].ticsremaining = resistMod * buffs[buffslot].ticsremaining / 100;
} }
@ -867,7 +867,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
if(IsClient()) if(IsClient())
{ {
AI_Start(); AI_Start();
animation = GetRunspeed() * 21; //set our animation to match our speed about animation = (uint16)(GetRunspeed() * 21); //set our animation to match our speed about
} }
CalculateNewFearpoint(); CalculateNewFearpoint();
@ -1459,7 +1459,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
caster->GetTarget()->GetGender(), caster->GetTarget()->GetGender(),
caster->GetTarget()->GetTexture() caster->GetTarget()->GetTexture()
); );
caster->SendAppearancePacket(AT_Size, caster->GetTarget()->GetSize()); caster->SendAppearancePacket(AT_Size, (uint32)caster->GetTarget()->GetSize());
for(int x = 0; x < 7; x++){ for(int x = 0; x < 7; x++){
caster->SendWearChange(x); caster->SendWearChange(x);
} }
@ -1654,7 +1654,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
#ifdef SPELL_EFFECT_SPAM #ifdef SPELL_EFFECT_SPAM
snprintf(effect_desc, _EDLEN, "Model Size: %d%%", effect_value); snprintf(effect_desc, _EDLEN, "Model Size: %d%%", effect_value);
#endif #endif
ChangeSize(GetSize() * (effect_value / 100.0)); ChangeSize(GetSize() * (effect_value / 100.0f));
break; break;
} }
@ -2038,7 +2038,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
if(IsNPC()) if(IsNPC())
{ {
Stun(toss_amt); Stun((int)toss_amt);
} }
toss_amt = sqrt(toss_amt)-2.0; toss_amt = sqrt(toss_amt)-2.0;
@ -2071,9 +2071,9 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
spu->x_pos = FloatToEQ19(GetX()); spu->x_pos = FloatToEQ19(GetX());
spu->y_pos = FloatToEQ19(GetY()); spu->y_pos = FloatToEQ19(GetY());
spu->z_pos = FloatToEQ19(GetZ()); spu->z_pos = FloatToEQ19(GetZ());
spu->delta_x = NewFloatToEQ13(new_x); spu->delta_x = NewFloatToEQ13((float)new_x);
spu->delta_y = NewFloatToEQ13(new_y); spu->delta_y = NewFloatToEQ13((float)new_y);
spu->delta_z = NewFloatToEQ13(toss_amt); spu->delta_z = NewFloatToEQ13((float)toss_amt);
spu->heading = FloatToEQ19(GetHeading()); spu->heading = FloatToEQ19(GetHeading());
spu->padding0002 =0; spu->padding0002 =0;
spu->padding0006 =7; spu->padding0006 =7;
@ -2393,7 +2393,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
gid = r->GetGroup(caster->GetName()); gid = r->GetGroup(caster->GetName());
if(gid < 11) if(gid < 11)
{ {
r->BalanceHP(spell.base[i], gid, spell.range, caster); r->BalanceHP(spell.base[i], gid, (int32)spell.range, caster);
break; break;
} }
} }
@ -2403,7 +2403,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
if(!g) if(!g)
break; break;
g->BalanceHP(spell.base[i], spell.range, caster); g->BalanceHP(spell.base[i], (int32)spell.range, caster);
break; break;
} }
@ -2421,7 +2421,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
gid = r->GetGroup(caster->GetName()); gid = r->GetGroup(caster->GetName());
if(gid < 11) if(gid < 11)
{ {
r->BalanceMana(spell.base[i], gid, spell.range, caster); r->BalanceMana(spell.base[i], gid, (int32)spell.range, caster);
break; break;
} }
} }
@ -2431,7 +2431,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
if(!g) if(!g)
break; break;
g->BalanceMana(spell.base[i], spell.range, caster); g->BalanceMana(spell.base[i], (int32)spell.range, caster);
break; break;
} }
@ -2503,7 +2503,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
gid = r->GetGroup(caster->GetName()); gid = r->GetGroup(caster->GetName());
if(gid < 11) if(gid < 11)
{ {
r->HealGroup(heal_amt,caster, gid, spell.range); r->HealGroup(heal_amt,caster, gid, (int32)spell.range);
break; break;
} }
} }
@ -2515,7 +2515,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
break; break;
} }
g->HealGroup(heal_amt, caster, spell.range); g->HealGroup(heal_amt, caster, (int32)spell.range);
break; break;
} }
@ -2644,7 +2644,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
case SE_Taunt: case SE_Taunt:
{ {
if (IsNPC()) if (IsNPC())
caster->Taunt(this->CastToNPC(), false, spell.base[i]); caster->Taunt(this->CastToNPC(), false, (float)spell.base[i]);
break; break;
} }