ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix hit limit game progress

Browse Source
This commit is contained in:
Benau
2019-01-16 02:10:48 +08:00
parent b0d1bf6cce
commit f9cd0256ad
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/modes/free_for_all.cpp
View File

@@ -250,3 +250,26 @@ void FreeForAll::restoreCompleteState(const BareNetworkString& b)
for (unsigned i = 0; i < m_scores.size(); i++)
m_scores[i] = b.getUInt32();
} // restoreCompleteState
// ----------------------------------------------------------------------------
std::pair<uint32_t, uint32_t> FreeForAll::getGameStartedProgress() const
{
std::pair<uint32_t, uint32_t> progress(
std::numeric_limits<uint32_t>::max(),
std::numeric_limits<uint32_t>::max());
if (race_manager->hasTimeTarget())
{
progress.first = (uint32_t)m_time;
}
AbstractKart* k = getKartAtPosition(1);
float score = -1.0f;
if (k)
score = (float)getKartScore(k->getWorldKartId());
if (score >= 0.0f)
{
progress.second = (uint32_t)(score /
(float)race_manager->getHitCaptureLimit() * 100.0f);
}
return progress;
} // getGameStartedProgress

14
src/modes/free_for_all.hpp
View File

@@ -72,19 +72,7 @@ public:
bool getKartFFAResult(int kart_id) const;
// ------------------------------------------------------------------------
virtual std::pair<uint32_t, uint32_t> getGameStartedProgress() const
OVERRIDE
{
std::pair<uint32_t, uint32_t> progress(
std::numeric_limits<uint32_t>::max(),
std::numeric_limits<uint32_t>::max());
if (race_manager->hasTimeTarget())
{
progress.first = (uint32_t)m_time;
}
progress.second = (uint32_t)((float)m_scores.size() /
(float)race_manager->getHitCaptureLimit() * 100.0f);
return progress;
}
OVERRIDE;
// ------------------------------------------------------------------------
virtual void addReservedKart(int kart_id) OVERRIDE
{