// main heading
char heading[64];
if (parallel == 0) {
- sprintf(heading, "Round %u", round);
+ std::sprintf(heading, "Round %u", round);
} else {
- sprintf(heading, "Round %u, Group %u", round, parallel);
+ std::sprintf(heading, "Round %u, Group %u", round, parallel);
}
{
// titles for chosen songs.
unsigned width[16], num_scores;
unsigned max_num_width = my_draw_text("8888", NULL, 22.0);
- unsigned mode, sumwidth;
- for (mode = 0; mode < 2; ++mode) {
+ unsigned sumwidth;
+ for (unsigned mode = 0; mode < 2; ++mode) {
for (unsigned i = 0; i < 16; ++i)
width[i] = 0;
}
if (first_chosen_col != -1) {
- printf("first_chosen_col=%u\n", first_chosen_col);
width[first_chosen_col] += 780 - sumwidth;
}
}
for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
char text[16] = "";
if (j->score != -1) {
- sprintf(text, "%u", j->score);
+ std::sprintf(text, "%u", j->score);
}
unsigned this_width = my_draw_text(text, NULL, 22.0);
if (j->chosen) {
my_draw_text_deferred(td, text, 22.0, x + max_num_width - this_width, y);
- my_draw_text_deferred(td, (mode == 0) ? j->song.title : j->song.short_title, 12.0, x + max_num_width + 10, y);
+
+ // draw the long name if we can, otherwise use the short one
+ if (my_draw_text(j->song.title, NULL, 12.0) > width[col]) {
+ my_draw_text_deferred(td, j->song.short_title, 12.0, x + max_num_width + 10, y);
+ } else {
+ my_draw_text_deferred(td, j->song.title, 12.0, x + max_num_width + 10, y);
+ }
} else {
my_draw_text_deferred(td, text, 22.0, x + width[col] / 2 - this_width / 2, y);
}
// draw total
{
char text[16];
- sprintf(text, "%u", i->total);
+ std::sprintf(text, "%u", i->total);
unsigned this_width = my_draw_text(text, NULL, 22.0);
my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 1] / 2 - this_width / 2, y);
unsigned j = (i + next_player->position - 1) % num_random_songs;
if (next_player->scores[j].score == -1) {
next_song = &(next_player->scores[j]);
- printf("Selecting score %u\n", j);
break;
}
}
unsigned j = (i + next_player->position) % num_scores;
if (next_player->scores[j].score == -1) {
next_song = &(next_player->scores[j]);
- printf("Selecting score %u\n", j);
break;
}
}