void GroupScreen::draw(unsigned char *buf)
{
+ std::vector<TextDefer> td;
+
scores_changed.reset_flag();
Group group;
{
unsigned width = my_draw_text(heading, NULL, 48.0);
- my_draw_text(heading, buf, 48.0, 800/2 - width/2, 60);
+ my_draw_text_deferred(td, heading, 48.0, 800/2 - width/2, 60);
}
// Find out how wide each column has to be. First try unlimited width (ie.
for (std::vector<Score>::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) {
if (!i->chosen) {
unsigned this_width = my_draw_text(i->song.short_title, NULL, 12.0);
- my_draw_text(i->song.short_title, buf, 12.0, x + width[col] / 2 - this_width / 2, 100);
+ my_draw_text_deferred(td, i->song.short_title, 12.0, x + width[col] / 2 - this_width / 2, 100);
}
x += width[col] + 20;
}
- my_draw_text("Total", buf, 12.0, x + width[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100);
+ my_draw_text_deferred(td, "Total", 12.0, x + width[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100);
x += width[num_scores + 1] + 20;
- my_draw_text("Rank", buf, 12.0, x + width[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100);
+ my_draw_text_deferred(td, "Rank", 12.0, x + width[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100);
// show all the players and the scores
unsigned y = 140;
for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
- my_draw_text(i->nick, buf, 18.0, 20, y);
+ my_draw_text_deferred(td, i->nick, 18.0, 20, y);
unsigned x = 40 + width[0];
unsigned col = 1;
for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
- char text[16];
- sprintf(text, "%u", j->score);
+ char text[16] = "";
+ if (j->score != -1) {
+ sprintf(text, "%u", j->score);
+ }
unsigned this_width = my_draw_text(text, NULL, 22.0);
if (j->chosen) {
- if (j->score != -1) {
- my_draw_text(text, buf, 22.0, x + max_num_width - this_width, y);
- }
- my_draw_text((mode == 0) ? j->song.title : j->song.short_title, buf, 12.0, x + max_num_width + 10, y);
+ 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);
} else {
- if (j->score != -1) {
- my_draw_text(text, buf, 22.0, x + width[col] / 2 - this_width / 2, y);
- }
+ my_draw_text_deferred(td, text, 22.0, x + width[col] / 2 - this_width / 2, y);
}
x += width[col] + 20;
}
sprintf(text, "%u", i->total);
unsigned this_width = my_draw_text(text, NULL, 22.0);
- my_draw_text(text, buf, 22.0, x + width[num_scores + 1] / 2 - this_width / 2, y);
+ my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 1] / 2 - this_width / 2, y);
x += width[num_scores + 1] + 20;
}
std::sprintf(text, "%u-%u", best_rank, worst_rank);
unsigned this_width = my_draw_text(text, NULL, 22.0);
- my_draw_text(text, buf, 22.0, x + width[num_scores + 2] / 2 - this_width / 2, y);
+ my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 2] / 2 - this_width / 2, y);
y += 40;
}
valid = true;
+ draw_all_deferred_text(buf, td, last_text);
+ last_text = td;
}