josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Core/Currency] no needed delta calculations + fix crashes because of it.

Browse Source
This commit is contained in:
cyberbrest
2012-09-03 22:54:45 +03:00
parent 25cc49b489
commit 9025a86536
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+8 -12
View File
@@ -7374,23 +7374,19 @@ void Player::ModifyCurrency(uint32 id, int32 count, bool printLog/* = true*/)
if (newWeekCount < 0)
newWeekCount = 0;
if (currency->TotalCap && int32(currency->TotalCap) < newTotalCount)
{
int32 delta = newTotalCount - int32(currency->TotalCap);
newTotalCount = int32(currency->TotalCap);
newWeekCount -= delta;
}
// TODO: fix conquest points
// if we get more then weekCap just set to limit.
uint32 weekCap = _GetCurrencyWeekCap(currency);
if (weekCap && int32(weekCap) < newTotalCount)
{
int32 delta = newWeekCount - int32(weekCap);
newWeekCount = int32(weekCap);
newTotalCount -= delta;
}
// if we change total, we must change week
ASSERT(((newTotalCount-oldTotalCount) != 0) == ((newWeekCount-oldWeekCount) != 0));
// if we get more then totalCap set to maximum;
if (currency->TotalCap && int32(currency->TotalCap) < newTotalCount)
{
newTotalCount = int32(currency->TotalCap);
newWeekCount = weekCap;
}
if (uint32(newTotalCount) != oldTotalCount)
{