X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;fp=bigscreen%2Fgroupscreen.cpp;h=750cec44ea9df56f17fb53a00c1f496218973338;hp=2c49020f6d1f854ebb15b3d50e13839581b2495e;hb=79445f894ef099042925039c30fbd83c5b7fc9ea;hpb=e51cb41cb5a8aeef4f11088d71229766de2b4a92

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 2c49020..750cec4 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -78,8 +78,10 @@ void GroupScreen::draw_column_headings(std::vector<TextDefer> &td, const Group &
 		x += colwidth[col] + 20;
 	}
 
-	my_draw_text_deferred(td, "Total", 12.0, x + colwidth[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100);
-	x += colwidth[num_scores + 1] + 20;
+	if (num_scores > 1) {
+		my_draw_text_deferred(td, "Total", 12.0, x + colwidth[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100);
+		x += colwidth[num_scores + 1] + 20;
+	}
 	my_draw_text_deferred(td, "Rank", 12.0, x + colwidth[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100);
 }	
 	
@@ -124,7 +126,7 @@ void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, co
 		}
 
 		// draw total
-		{
+		if (num_scores > 1) {
 			char text[16];
 			std::sprintf(text, "%u", i->total);
 			
@@ -181,8 +183,10 @@ void GroupScreen::find_column_widths(const Group &group, std::vector<unsigned> &
 			colwidth.push_back(0);
 			colwidth.push_back(0);
 		}
-		
-		colwidth[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width);
+	
+		if (num_scores > 1) {
+			colwidth[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width);
+		}
 		colwidth[num_scores + 2] = my_draw_text("Rank", NULL, 12.0);
 
 		// if we're at long titles and that works, don't try the short ones
@@ -674,6 +678,10 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 		unsigned x = 40 + colwidth[0];
 		for (unsigned j = 1; j <= num_scores + 1; ++j)
 			x += colwidth[j] + 20;
+
+		// minor correction :-)
+		if (num_scores <= 1)
+			x -= 20;
 		
 		unsigned this_width = my_draw_text(text, NULL, 22.0);
 		my_draw_text_deferred(td, text, 22.0, x + colwidth[num_scores + 2] / 2 - this_width / 2, y);