aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities
diff options
context:
space:
mode:
authorSpp <none@none>2010-08-30 23:07:14 +0200
committerSpp <none@none>2010-08-30 23:07:14 +0200
commite252b8abe764e5e348e8ec89deec944729437147 (patch)
treef131abb9ab5f0ebae01d4c0481cce237d78e33eb /src/server/game/Entities
parenta6d075dfc6691797aaa09bd119bd1a1b34034ff5 (diff)
Core: Fix more warnings
--HG-- branch : trunk
Diffstat (limited to 'src/server/game/Entities')
-rw-r--r--src/server/game/Entities/Creature/CreatureGroups.cpp4
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
index 97414c35529..5a35e0b537a 100644
--- a/src/server/game/Entities/Creature/CreatureGroups.cpp
+++ b/src/server/game/Entities/Creature/CreatureGroups.cpp
@@ -93,7 +93,7 @@ void CreatureGroupManager::LoadCreatureFormations()
return;
}
- uint32 total_records = result->GetRowCount();
+ uint64 total_records = result->GetRowCount();
barGoLink bar(total_records);
Field *fields;
@@ -145,7 +145,7 @@ void CreatureGroupManager::LoadCreatureFormations()
while (result->NextRow()) ;
sLog.outString();
- sLog.outString(">> Loaded %u creatures in formations", total_records);
+ sLog.outString(">> Loaded " UI64FMTD " creatures in formations", total_records);
sLog.outString();
}
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 161addda839..1c4c19a77eb 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -11085,9 +11085,9 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
scripted = true;
int32 apBonus = int32(std::max(GetTotalAttackPowerValue(BASE_ATTACK), GetTotalAttackPowerValue(RANGED_ATTACK)));
if (apBonus > DoneAdvertisedBenefit)
- DoneTotal += apBonus * 0.22f; // 22% of AP per tick
+ DoneTotal += int32(apBonus * 0.22f); // 22% of AP per tick
else
- DoneTotal += DoneAdvertisedBenefit * 0.377f; //37.7% of BH per tick
+ DoneTotal += int32(DoneAdvertisedBenefit * 0.377f); //37.7% of BH per tick
}
// Earthliving - 0.45% of normal hot coeff
else if (spellProto->SpellFamilyName == SPELLFAMILY_SHAMAN && spellProto->SpellFamilyFlags[1] & 0x80000)