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

Reused function to create timing strings; added support for 1/100 s .

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5393 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-05-06 22:45:30 +00:00
parent 0a6608069e
commit e201176255
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/states_screens/dialogs/race_over_dialog.cpp
View File

@ -134,17 +134,13 @@ RaceOverDialog::RaceOverDialog(const float percentWidth,
const Kart *current_kart = world->getKart(order[i]); const Kart *current_kart = world->getKart(order[i]);
const stringw& kart_name = current_kart->getName(); const stringw& kart_name = current_kart->getName();
char sTime[20]; std::string time_string;
sTime[0]=0;
const float time = current_kart->getFinishTime(); const float time = current_kart->getFinishTime();
if (display_time) if (display_time)
{ {
const int min = (int) floor ( time / 60.0 ) ; time_string = StringUtils::timeToString(time);
const int sec = (int) floor ( time - (double) ( 60 * min ) ) ;
const int tenths = (int) floor ( 10.0f * (time - (double)(sec + 60* min)));
sprintf ( sTime, "%d:%02d:%d", min, sec, tenths ) ;
} }
//This shows position + driver name + time + points earned + total points //This shows position + driver name + time + points earned + total points
@ -156,7 +152,8 @@ RaceOverDialog::RaceOverDialog(const float percentWidth,
if (display_time) if (display_time)
{ {
kart_results_line = StringUtils::insertValues( L"#%i. %s %s (%i + %i = %i)", kart_results_line = StringUtils::insertValues( L"#%i. %s %s (%i + %i = %i)",
current_kart->getPosition(), sTime, current_kart->getPosition(),
time_string.c_str(),
kart_name.c_str(), prev_score, kart_name.c_str(), prev_score,
(new_score - prev_score), new_score); (new_score - prev_score), new_score);
} }
@ -174,13 +171,15 @@ RaceOverDialog::RaceOverDialog(const float percentWidth,
//I18N: the second %s is where the time is inserted //I18N: the second %s is where the time is inserted
kart_results_line = StringUtils::insertValues( _("%i. %s : survived for %s"), kart_results_line = StringUtils::insertValues( _("%i. %s : survived for %s"),
current_kart->getPosition(), current_kart->getPosition(),
kart_name.c_str(), sTime); kart_name.c_str(),
time_string.c_str());
} }
else else
{ {
kart_results_line = StringUtils::insertValues( L"%i. %s %s", kart_results_line = StringUtils::insertValues( L"%i. %s %s",
current_kart->getPosition(), current_kart->getPosition(),
kart_name.c_str(), sTime); kart_name.c_str(),
time_string.c_str());
} }
const KartProperties* prop = current_kart->getKartProperties(); const KartProperties* prop = current_kart->getKartProperties();
@ -227,16 +226,13 @@ RaceOverDialog::RaceOverDialog(const float percentWidth,
unsigned int num_scores = hs->getNumberEntries(); unsigned int num_scores = hs->getNumberEntries();
char timebuffer[64]; std::string timebuffer;
for (unsigned int i=0; i<num_scores; i++) for (unsigned int i=0; i<num_scores; i++)
{ {
std::string kart_name, name; std::string kart_name, name;
float T; float T;
hs->getEntry(i, kart_name, name, &T); hs->getEntry(i, kart_name, name, &T);
const int MINS = (int) floor ( T / 60.0 ) ; timebuffer = StringUtils::timeToString(T);
const int SECS = (int) floor ( T - (float) ( 60 * MINS ) ) ;
const int TENTHS = (int) floor ( 10.0f * (T - (float)(SECS + 60*MINS)));
sprintf(timebuffer, "%2d:%02d.%01d", MINS, SECS, TENTHS);
const int line_from = lines_from_y + text_height*(i*3); const int line_from = lines_from_y + text_height*(i*3);
@ -249,7 +245,7 @@ RaceOverDialog::RaceOverDialog(const float percentWidth,
m_irrlicht_window); m_irrlicht_window);
core::rect< s32 > linearea2(m_area.getWidth()*2/3, line_from + text_height, core::rect< s32 > linearea2(m_area.getWidth()*2/3, line_from + text_height,
m_area.getWidth(), line_from + text_height*2); m_area.getWidth(), line_from + text_height*2);
GUIEngine::getGUIEnv()->addStaticText( stringw(timebuffer).c_str(), GUIEngine::getGUIEnv()->addStaticText( stringw(timebuffer.c_str()).c_str(),
linearea2, false, false, // border, word warp linearea2, false, false, // border, word warp
m_irrlicht_window); m_irrlicht_window);
} // next score } // next score

8
src/utils/string_utils.cpp
View File

@ -338,11 +338,11 @@ namespace StringUtils
*/ */
std::string timeToString(float time) std::string timeToString(float time)
{ {
int min = (int) floor ( time / 60.0 ) ; int min = (int) floor ( time / 60.0 ) ;
int sec = (int) floor ( time - (double) ( 60 * min ) ) ; int sec = (int) floor ( time - (double) ( 60 * min ) ) ;
int tenths = (int) floor ( 10.0f * (time - (double)(sec + 60* min))); int hundredths = (int) floor ( 100.0f * (time - (double)(sec + 60* min)));
char s[9]; char s[9];
sprintf ( s, "%d:%02d:%d", min, sec, tenths ) ; sprintf ( s, "%02d:%02d:%02d", min, sec, hundredths) ;
return std::string(s); return std::string(s);
} // timeToString } // timeToString