From 33cec926db02139b4c67c59a013ab110aff40720 Mon Sep 17 00:00:00 2001 From: Arthur Dene Ice Date: Fri, 9 May 2014 19:30:24 -0700 Subject: [PATCH] explicit double to float conversions --- zone/MobAI.cpp | 2 +- zone/bot.cpp | 2 +- zone/client.cpp | 42 ++++++++++++++++++++--------------------- zone/client_packet.cpp | 12 ++++++------ zone/client_process.cpp | 2 +- zone/command.cpp | 2 +- zone/merc.cpp | 2 +- zone/mob.cpp | 2 +- zone/tradeskills.cpp | 2 +- zone/zone.cpp | 4 ++-- zone/zonedb.cpp | 14 +++++++------- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/zone/MobAI.cpp b/zone/MobAI.cpp index 88c0309c0..db62d8953 100644 --- a/zone/MobAI.cpp +++ b/zone/MobAI.cpp @@ -1591,7 +1591,7 @@ void NPC::AI_DoMovement() { ) { float movedist = roambox_distance*roambox_distance; - float movex = MakeRandomFloat(0, movedist); + float movex = (float)MakeRandomFloat(0, movedist); float movey = movedist - movex; movex = sqrtf(movex); movey = sqrtf(movey); diff --git a/zone/bot.cpp b/zone/bot.cpp index 3b5013a62..dc1a63fd3 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -3865,7 +3865,7 @@ void Bot::AI_Process() { int16 DWBonus = spellbonuses.DualWieldChance + itembonuses.DualWieldChance; DualWieldProbability += DualWieldProbability*float(DWBonus)/ 100.0f; - float random = MakeRandomFloat(0, 1); + float random = (float)MakeRandomFloat(0, 1); if (random < DualWieldProbability){ // Max 78% of DW diff --git a/zone/client.cpp b/zone/client.cpp index 1627c64b6..00141ba51 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -1576,7 +1576,7 @@ void Client::SetStats(uint8 type,int16 set_val){ switch(type){ case STAT_STR: if(set_val>0) - iss->str=set_val; + iss->str=(uint8)set_val; if(set_val<0) m_pp.STR=0; else if(set_val>255) @@ -1586,7 +1586,7 @@ void Client::SetStats(uint8 type,int16 set_val){ break; case STAT_STA: if(set_val>0) - iss->sta=set_val; + iss->sta=(uint8)set_val; if(set_val<0) m_pp.STA=0; else if(set_val>255) @@ -1596,7 +1596,7 @@ void Client::SetStats(uint8 type,int16 set_val){ break; case STAT_AGI: if(set_val>0) - iss->agi=set_val; + iss->agi=(uint8)set_val; if(set_val<0) m_pp.AGI=0; else if(set_val>255) @@ -1606,7 +1606,7 @@ void Client::SetStats(uint8 type,int16 set_val){ break; case STAT_DEX: if(set_val>0) - iss->dex=set_val; + iss->dex=(uint8)set_val; if(set_val<0) m_pp.DEX=0; else if(set_val>255) @@ -1616,7 +1616,7 @@ void Client::SetStats(uint8 type,int16 set_val){ break; case STAT_INT: if(set_val>0) - iss->int_=set_val; + iss->int_=(uint8)set_val; if(set_val<0) m_pp.INT=0; else if(set_val>255) @@ -1626,7 +1626,7 @@ void Client::SetStats(uint8 type,int16 set_val){ break; case STAT_WIS: if(set_val>0) - iss->wis=set_val; + iss->wis=(uint8)set_val; if(set_val<0) m_pp.WIS=0; else if(set_val>255) @@ -1636,7 +1636,7 @@ void Client::SetStats(uint8 type,int16 set_val){ break; case STAT_CHA: if(set_val>0) - iss->cha=set_val; + iss->cha=(uint8)set_val; if(set_val<0) m_pp.CHA=0; else if(set_val>255) @@ -1659,7 +1659,7 @@ void Client::IncStats(uint8 type,int16 increase_val){ switch(type){ case STAT_STR: if(increase_val>0) - iss->str=increase_val; + iss->str=(uint8)increase_val; if((m_pp.STR+increase_val*2)<0) m_pp.STR=0; else if((m_pp.STR+increase_val*2)>255) @@ -1669,7 +1669,7 @@ void Client::IncStats(uint8 type,int16 increase_val){ break; case STAT_STA: if(increase_val>0) - iss->sta=increase_val; + iss->sta=(uint8)increase_val; if((m_pp.STA+increase_val*2)<0) m_pp.STA=0; else if((m_pp.STA+increase_val*2)>255) @@ -1679,7 +1679,7 @@ void Client::IncStats(uint8 type,int16 increase_val){ break; case STAT_AGI: if(increase_val>0) - iss->agi=increase_val; + iss->agi=(uint8)increase_val; if((m_pp.AGI+increase_val*2)<0) m_pp.AGI=0; else if((m_pp.AGI+increase_val*2)>255) @@ -1689,7 +1689,7 @@ void Client::IncStats(uint8 type,int16 increase_val){ break; case STAT_DEX: if(increase_val>0) - iss->dex=increase_val; + iss->dex=(uint8)increase_val; if((m_pp.DEX+increase_val*2)<0) m_pp.DEX=0; else if((m_pp.DEX+increase_val*2)>255) @@ -1699,7 +1699,7 @@ void Client::IncStats(uint8 type,int16 increase_val){ break; case STAT_INT: if(increase_val>0) - iss->int_=increase_val; + iss->int_=(uint8)increase_val; if((m_pp.INT+increase_val*2)<0) m_pp.INT=0; else if((m_pp.INT+increase_val*2)>255) @@ -1709,7 +1709,7 @@ void Client::IncStats(uint8 type,int16 increase_val){ break; case STAT_WIS: if(increase_val>0) - iss->wis=increase_val; + iss->wis=(uint8)increase_val; if((m_pp.WIS+increase_val*2)<0) m_pp.WIS=0; else if((m_pp.WIS+increase_val*2)>255) @@ -1719,7 +1719,7 @@ void Client::IncStats(uint8 type,int16 increase_val){ break; case STAT_CHA: if(increase_val>0) - iss->cha=increase_val; + iss->cha=(uint8)increase_val; if((m_pp.CHA+increase_val*2)<0) m_pp.CHA=0; else if((m_pp.CHA+increase_val*2)>255) @@ -5106,7 +5106,7 @@ const bool Client::IsMQExemptedArea(uint32 zoneID, float x, float y, float z) co { case 2: { - float delta = (x-(-713.6)); + float delta = (x-(-713.6f)); delta *= delta; float distance = delta; delta = (y-(-160.2)); @@ -5136,13 +5136,13 @@ const bool Client::IsMQExemptedArea(uint32 zoneID, float x, float y, float z) co } case 9: { - float delta = (x-(-682.5)); + float delta = (x-(-682.5f)); delta *= delta; float distance = delta; - delta = (y-(147.0)); + delta = (y-(147.0f)); delta *= delta; distance += delta; - delta = (z-(-9.9)); + delta = (z-(-9.9f)); delta *= delta; distance += delta; @@ -5179,13 +5179,13 @@ const bool Client::IsMQExemptedArea(uint32 zoneID, float x, float y, float z) co case 24: { - float delta = (x-(-183.0)); + float delta = (x-(-183.0f)); delta *= delta; float distance = delta; - delta = (y-(-773.3)); + delta = (y-(-773.3f)); delta *= delta; distance += delta; - delta = (z-(54.1)); + delta = (z-(54.1f)); delta *= delta; distance += delta; diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index e45976e85..0ce75ee6c 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -3417,7 +3417,7 @@ void Client::Handle_OP_Sneak(const EQApplicationPacket *app) CheckIncreaseSkill(SkillSneak, nullptr, 5); } float hidechance = ((GetSkill(SkillSneak)/300.0f) + .25) * 100; - float random = MakeRandomFloat(0, 99); + float random = (float)MakeRandomFloat(0, 99); if(!was && random < hidechance) { sneaking = true; } @@ -3458,8 +3458,8 @@ void Client::Handle_OP_Hide(const EQApplicationPacket *app) int reuse = HideReuseTime - GetAA(209); p_timers.Start(pTimerHide, reuse-1); - float hidechance = ((GetSkill(SkillHide)/250.0f) + .25) * 100; - float random = MakeRandomFloat(0, 100); + float hidechance = ((GetSkill(SkillHide)/250.0f) + .25f) * 100.0f; + float random = (float)MakeRandomFloat(0, 100); CheckIncreaseSkill(SkillHide, nullptr, 5); if (random < hidechance) { EQApplicationPacket* outapp = new EQApplicationPacket(OP_SpawnAppearance, sizeof(SpawnAppearance_Struct)); @@ -11679,9 +11679,9 @@ void Client::Handle_OP_GMSearchCorpse(const EQApplicationPacket *app) uint32 ZoneID = atoi(Row[1]); - float CorpseX = atof(Row[2]); - float CorpseY = atof(Row[3]); - float CorpseZ = atof(Row[4]); + float CorpseX = (float)atof(Row[2]); + float CorpseY = (float)atof(Row[3]); + float CorpseZ = (float)atof(Row[4]); strn0cpy(TimeOfDeath, Row[5], sizeof(TimeOfDeath)); diff --git a/zone/client_process.cpp b/zone/client_process.cpp index 81cd55972..039e1156f 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -503,7 +503,7 @@ bool Client::Process() { int16 DWBonus = spellbonuses.DualWieldChance + itembonuses.DualWieldChance; DualWieldProbability += DualWieldProbability*float(DWBonus)/ 100.0f; - float random = MakeRandomFloat(0, 1); + float random = (float)MakeRandomFloat(0, 1); CheckIncreaseSkill(SkillDualWield, auto_attack_target, -10); if (random < DualWieldProbability){ // Max 78% of DW if(CheckAAEffect(aaEffectRampage)) { diff --git a/zone/command.cpp b/zone/command.cpp index d9924bb8a..983bfa4b0 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -2347,7 +2347,7 @@ void command_size(Client *c, const Seperator *sep) if (!sep->IsNumber(1)) c->Message(0, "Usage: #size [0 - 255] (Decimal increments are allowed)"); else { - float newsize = atof(sep->arg[1]); + float newsize = (float)atof(sep->arg[1]); if (newsize > 255) c->Message(0, "Error: #size: Size can not be greater than 255."); else if (newsize < 0) diff --git a/zone/merc.cpp b/zone/merc.cpp index 255489031..65a85a2b0 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -1723,7 +1723,7 @@ void Merc::AI_Process() { int16 DWBonus = spellbonuses.DualWieldChance + itembonuses.DualWieldChance; DualWieldProbability += DualWieldProbability*float(DWBonus)/ 100.0f; - float random = MakeRandomFloat(0, 1); + float random = (float)MakeRandomFloat(0, 1); if (random < DualWieldProbability){ // Max 78% of DW diff --git a/zone/mob.cpp b/zone/mob.cpp index e087e2447..8d8c29699 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -5081,7 +5081,7 @@ float Mob::HeadingAngleToMob(Mob *other) if (y_diff < 0.0000009999999974752427) y_diff = 0.0000009999999974752427; - float angle = atan2(x_diff, y_diff) * 180.0 * 0.3183099014828645; // angle, nice "pi" + float angle = atan2(x_diff, y_diff) * 180.0f * 0.3183099014828645f; // angle, nice "pi" // return the right thing based on relative quadrant // I'm sure this could be improved for readability, but whatever diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index 5df392fa3..a5f901833 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -927,7 +927,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { _log(TRADESKILLS__TRACE, "...Current skill: %d , Trivial: %d , Success chance: %f percent", user_skill , spec->trivial , chance); _log(TRADESKILLS__TRACE, "...Bonusstat: %d , INT: %d , WIS: %d , DEX: %d , STR: %d", bonusstat , GetINT() , GetWIS() , GetDEX() , GetSTR()); - float res = MakeRandomFloat(0, 99); + float res = (float)MakeRandomFloat(0, 99); int AAChance = 0; //AA modifiers diff --git a/zone/zone.cpp b/zone/zone.cpp index e1d64a98b..67b0cb168 100644 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -641,8 +641,8 @@ void Zone::LoadLevelEXPMods(){ else { while(DataRow = mysql_fetch_row(DatasetResult)) { uint32 index = atoi(DataRow[0]); - float exp_mod = atof(DataRow[1]); - float aa_exp_mod = atof(DataRow[2]); + float exp_mod = (float)atof(DataRow[1]); + float aa_exp_mod = (float)atof(DataRow[2]); level_exp_mod[index].ExpMod = exp_mod; level_exp_mod[index].AAExpMod = aa_exp_mod; } diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index d779809bb..ee4d2e863 100644 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -2408,12 +2408,12 @@ bool ZoneDatabase::LoadBlockedSpells(int32 blockedSpellsCount, ZoneSpellsBlocked if(row){ into[r].spellid = atoi(row[1]); into[r].type = atoi(row[2]); - into[r].x = atof(row[3]); - into[r].y = atof(row[4]); - into[r].z = atof(row[5]); - into[r].xdiff = atof(row[6]); - into[r].ydiff = atof(row[7]); - into[r].zdiff = atof(row[8]); + into[r].x = (float)atof(row[3]); + into[r].y = (float)atof(row[4]); + into[r].z = (float)atof(row[5]); + into[r].xdiff = (float)atof(row[6]); + into[r].ydiff = (float)atof(row[7]); + into[r].zdiff = (float)atof(row[8]); strn0cpy(into[r].message, row[9], 255); } } @@ -2848,7 +2848,7 @@ void ZoneDatabase::LoadPetInfo(Client *c) { pi->SpellID = atoi(row[3]); pi->HP = atoul(row[4]); pi->Mana = atoul(row[5]); - pi->size = atof(row[6]); + pi->size = (float)atof(row[6]); } mysql_free_result(result); }