converted all tabs to 4 spaces

This commit is contained in:
Yehonal
2016-06-26 19:23:57 +02:00
parent 52f305111c
commit f6eefedcd5
717 changed files with 132388 additions and 132388 deletions

View File

@@ -9,58 +9,58 @@ ACE_Thread_Mutex SavingSystemMgr::_savingLock;
void SavingSystemMgr::Update(uint32 diff)
{
if (GetSavingMaxValue() > GetSavingCurrentValue())
{
const uint32 step = 120;
if (GetSavingMaxValue() > GetSavingCurrentValue())
{
const uint32 step = 120;
float multiplicator;
uint32 playerCount = sWorld->GetPlayerCount();
if (!playerCount)
{
m_savingCurrentValue = 0;
m_savingMaxValueAssigned = 0;
m_savingDiffSum = 0;
m_savingSkipList.clear();
return;
}
float multiplicator;
uint32 playerCount = sWorld->GetPlayerCount();
if (!playerCount)
{
m_savingCurrentValue = 0;
m_savingMaxValueAssigned = 0;
m_savingDiffSum = 0;
m_savingSkipList.clear();
return;
}
if (GetSavingMaxValue()-GetSavingCurrentValue() > playerCount+m_savingSkipList.size()) // this should not happen, but just in case
m_savingMaxValueAssigned = m_savingCurrentValue+playerCount+m_savingSkipList.size();
if (GetSavingMaxValue()-GetSavingCurrentValue() > playerCount+m_savingSkipList.size()) // this should not happen, but just in case
m_savingMaxValueAssigned = m_savingCurrentValue+playerCount+m_savingSkipList.size();
if (playerCount <= 1500) // every 2min
multiplicator = 1000.0f / playerCount;
else if (playerCount <= 2500) // every 3min
multiplicator = 1500.0f / playerCount;
else if (playerCount <= 2750) // every 4min
multiplicator = 2000.0f / playerCount;
else if (playerCount <= 3000) // every 6min
multiplicator = 3000.0f / playerCount;
else if (playerCount <= 3250) // every 7min
multiplicator = 3500.0f / playerCount;
else // every 8min
multiplicator = 4000.0f / playerCount;
if (playerCount <= 1500) // every 2min
multiplicator = 1000.0f / playerCount;
else if (playerCount <= 2500) // every 3min
multiplicator = 1500.0f / playerCount;
else if (playerCount <= 2750) // every 4min
multiplicator = 2000.0f / playerCount;
else if (playerCount <= 3000) // every 6min
multiplicator = 3000.0f / playerCount;
else if (playerCount <= 3250) // every 7min
multiplicator = 3500.0f / playerCount;
else // every 8min
multiplicator = 4000.0f / playerCount;
m_savingDiffSum += diff;
while (m_savingDiffSum >= (uint32)(step*multiplicator))
{
IncreaseSavingCurrentValue(1);
m_savingDiffSum += diff;
while (m_savingDiffSum >= (uint32)(step*multiplicator))
{
IncreaseSavingCurrentValue(1);
while (m_savingSkipList.size() && *(m_savingSkipList.begin()) <= GetSavingCurrentValue())
{
IncreaseSavingCurrentValue(1);
m_savingSkipList.pop_front();
}
while (m_savingSkipList.size() && *(m_savingSkipList.begin()) <= GetSavingCurrentValue())
{
IncreaseSavingCurrentValue(1);
m_savingSkipList.pop_front();
}
m_savingDiffSum -= (uint32)(step*multiplicator);
m_savingDiffSum -= (uint32)(step*multiplicator);
if (GetSavingCurrentValue() > GetSavingMaxValue())
{
m_savingDiffSum = 0;
break;
}
if (GetSavingCurrentValue() > GetSavingMaxValue())
{
m_savingDiffSum = 0;
break;
}
if (m_savingDiffSum > 60000)
m_savingDiffSum = 60000;
}
}
if (m_savingDiffSum > 60000)
m_savingDiffSum = 60000;
}
}
}