mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Proper power uses.

Browse source
This commit is contained in:
LordJZ 2012-08-12 08:38:06 +04:00 • committed by Antz
parent ef2aa96340
commit adabb1556d
3 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/game/Player.cpp
View file

@ -2064,8 +2064,15 @@ void Player::RegenerateAll(uint32 diff)
// diff contains the time in milliseconds since last regen.
void Player::Regenerate(Powers power, uint32 diff)
{
uint32 curValue = GetPower(power);
uint32 maxValue = GetMaxPower(power);
uint32 powerIndex = GetPowerIndex(power);
if (powerIndex == INVALID_POWER_INDEX)
return;
uint32 maxValue = GetMaxPowerByIndex(powerIndex);
if (!maxValue)
return;
uint32 curValue = GetPowerByIndex(powerIndex);
float addvalue = 0.0f;
@ -2537,7 +2544,7 @@ void Player::GiveLevel(uint32 level)
sObjectMgr.GetPlayerClassLevelInfo(getClass(), level, basehp, basemana);
// send levelup info to client
WorldPacket data(SMSG_LEVELUP_INFO, (4 + 4 + MAX_POWERS * 4 + MAX_STATS * 4));
WorldPacket data(SMSG_LEVELUP_INFO, (4 + 4 + MAX_STORED_POWERS * 4 + MAX_STATS * 4));
data << uint32(level);
data << uint32(int32(basehp) - int32(GetCreateHealth()));
// for(int i = 0; i < MAX_POWERS; ++i) // Powers loop (0-4)
@ -16151,10 +16158,10 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder* holder)
uint32 savedhealth = fields[50].GetUInt32();
SetHealth(savedhealth > GetMaxHealth() ? GetMaxHealth() : savedhealth);
for(uint32 i = 0; i < MAX_POWERS; ++i)
for(uint32 i = 0; i < MAX_STORED_POWERS; ++i)
{
uint32 savedpower = fields[51 + i].GetUInt32();
SetPower(Powers(i), savedpower > GetMaxPower(Powers(i)) ? GetMaxPower(Powers(i)) : savedpower);
SetPowerByIndex(i, std::min(savedpower, GetMaxPowerByIndex(i)));
}
DEBUG_FILTER_LOG(LOG_FILTER_PLAYER_STATS, "The value of player %s after load item and aura is: ", m_name.c_str());
@ -17585,8 +17592,8 @@ void Player::SaveToDB()
uberInsert.addUInt32(GetHealth());
for (uint32 i = 0; i < MAX_POWERS; ++i)
uberInsert.addUInt32(GetPower(Powers(i)));
for (uint32 i = 0; i < MAX_STORED_POWERS; ++i)
uberInsert.addUInt32(GetPowerByIndex(i));
uberInsert.addUInt32(uint32(m_specsCount));
uberInsert.addUInt32(uint32(m_activeSpec));
@ -18260,8 +18267,8 @@ void Player::_SaveStats()
stmt.addUInt32(GetGUIDLow());
stmt.addUInt32(GetMaxHealth());
for (int i = 0; i < MAX_POWERS; ++i)
stmt.addUInt32(GetMaxPower(Powers(i)));
for (int i = 0; i < MAX_STORED_POWERS; ++i)
stmt.addUInt32(GetMaxPowerByIndex(i));
for (int i = 0; i < MAX_STATS; ++i)
stmt.addFloat(GetStat(Stats(i)));
// armor + school resistances

6
src/game/StatSystem.cpp
View file

@ -125,7 +125,7 @@ bool Player::UpdateAllStats()
UpdateAttackPowerAndDamage(true);
UpdateMaxHealth();
for (int i = POWER_MANA; i < MAX_POWERS; ++i)
for (uint32 i = POWER_MANA; i < MAX_POWERS; ++i)
UpdateMaxPower(Powers(i));
UpdateAllRatings();
@ -822,7 +822,7 @@ bool Creature::UpdateAllStats()
UpdateMaxHealth();
UpdateAttackPowerAndDamage();
for (int i = POWER_MANA; i < MAX_POWERS; ++i)
for (uint32 i = POWER_MANA; i < MAX_POWERS; ++i)
UpdateMaxPower(Powers(i));
for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
@ -966,7 +966,7 @@ bool Pet::UpdateAllStats()
for (int i = STAT_STRENGTH; i < MAX_STATS; ++i)
UpdateStats(Stats(i));
for (int i = POWER_MANA; i < MAX_POWERS; ++i)
for (uint32 i = POWER_MANA; i < MAX_POWERS; ++i)
UpdateMaxPower(Powers(i));
for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)

8
src/game/Unit.cpp
View file

@ -9815,7 +9815,7 @@ int32 Unit::GetPower(Powers power) const
if (power == POWER_HEALTH)
return GetHealth();
uint32 powerIndex = GetPowerIndexByClass(power, getClass());
uint32 powerIndex = GetPowerIndex(power);
if (powerIndex == INVALID_POWER_INDEX)
return 0;
@ -9834,7 +9834,7 @@ uint32 Unit::GetMaxPower(Powers power) const
if (power == POWER_HEALTH)
return GetMaxHealth();
uint32 powerIndex = GetPowerIndexByClass(power, getClass());
uint32 powerIndex = GetPowerIndex(power);
if (powerIndex == INVALID_POWER_INDEX)
return 0;
@ -9853,7 +9853,7 @@ void Unit::SetPower(Powers power, int32 val)
if (power == POWER_HEALTH)
return SetHealth(val >= 0 ? val : 0);
uint32 powerIndex = GetPowerIndexByClass(power, getClass());
uint32 powerIndex = GetPowerIndex(power);
if (powerIndex == INVALID_POWER_INDEX)
return;
@ -9903,7 +9903,7 @@ void Unit::SetMaxPower(Powers power, int32 val)
if (power == POWER_HEALTH)
return SetMaxHealth(val >= 0 ? val : 0);
uint32 powerIndex = GetPowerIndexByClass(power, getClass());
uint32 powerIndex = GetPowerIndex(power);
if (powerIndex == INVALID_POWER_INDEX)
return;