Index: ./Games/Pingus/data/data/fonts.scr =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/data/data/fonts.scr,v retrieving revision 1.16 diff -u -r1.16 fonts.scr --- ./Games/Pingus/data/data/fonts.scr 30 Nov 2001 20:22:20 -0000 1.16 +++ ./Games/Pingus/data/data/fonts.scr 26 Nov 2002 00:39:43 -0000 @@ -11,6 +11,7 @@ pingus = ../images/fonts/pingus4.png (type=font, alphafont=1, spacelen=8, trans_limit=0.25, subtract_width=0,letters="!""#$%&'()*+,-./0123456789:;<=>address@hidden|}~ÄÖÜäöüÇçÐðÝýÞþ"); // pingus_small = ../images/fonts/pingus_small3.png (type=font, alphafont=1, spacelen=8, trans_limit=0.25, subtract_width=0,letters="!""#$%&'()*+,-./0123456789:;<=>address@hidden|}~ÄÖÜäöü"); pingus_small = ../images/fonts/pingus_small4.png (type=font, alphafont=1, spacelen=8, trans_limit=0.25, subtract_width=0,letters="!""#$%&'()*+,-./0123456789:;<=>address@hidden|}~ÄÖÜäöüÇçÐðÝýÞþ"); + pingus_small_fix_num = ../images/fonts/pingus_small4_fix_num.png (type=font, alphafont=1, spacelen=13, trans_limit=0, subtract_width=0,letters="!""#$%&'()*+,-./0123456789:;<=>address@hidden|}~ÄÖÜäöüÇçÐðÝýÞþ"); xterm = ../images/fonts/xterm.png (type=font, tcol=0, x=1, y=1, spacelen=6,letters="!""#$%&'()*+,-./0123456789:;<=>address@hidden|}~"); // numbers = ../images/fonts/number_fnt.pcx (type=font, x=1, y=1, tcol=0, spacelen=0, letters=" 0123456789:"); Index: ./Games/Pingus/src/pingus_counter.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_counter.cxx,v retrieving revision 1.11 diff -u -r1.11 pingus_counter.cxx --- ./Games/Pingus/src/pingus_counter.cxx 17 Oct 2002 00:10:46 -0000 1.11 +++ ./Games/Pingus/src/pingus_counter.cxx 26 Nov 2002 00:39:43 -0000 @@ -33,7 +33,7 @@ : server(s), background (PingusResource::load_surface("Buttons/info","core")) { - font = PingusResource::load_font("Fonts/pingus_small","fonts"); + font = PingusResource::load_font("Fonts/pingus_small_fix_num","fonts"); } void @@ -46,7 +46,7 @@ World* world = server->get_world(); - snprintf(str, 128, _("Released: %3d/%3d Out: %3d Saved: %3d/%3d"), + snprintf(str, 128, _("Released:%3d/%-3d Out:%3d Saved:%3d/%-3d"), world->get_pingus()->get_number_of_released(), world->get_pingus()->get_number_of_allowed(), world->get_pingus()->get_number_of_alive(), Index: ./Games/Pingus/src/time_display.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/time_display.cxx,v retrieving revision 1.10 diff -u -r1.10 time_display.cxx --- ./Games/Pingus/src/time_display.cxx 24 Oct 2002 15:32:48 -0000 1.10 +++ ./Games/Pingus/src/time_display.cxx 26 Nov 2002 00:39:44 -0000 @@ -32,7 +32,8 @@ : infinity_symbol(PingusResource::load_surface("misc/infinity", "core")) { //font = PingusResource::load_font("Fonts/numbers","fonts"); - font = PingusResource::load_font("Fonts/pingus_small","fonts"); + //font = PingusResource::load_font("Fonts/pingus_small","fonts"); + font = PingusResource::load_font("Fonts/pingus_small_fix_num","fonts"); } void @@ -54,18 +55,13 @@ //int millisecs = (((time_value * 100)) / game_speed) % 100; int seconds = (time_value / game_speed % 60); int minutes = (time_value / (60 * game_speed)); - char* p; - snprintf(time_string, 8, "%2d:%2d", minutes, seconds); + // Stop displaying negative seconds, which can happen if armageddon is + // clicked with 1 second left. + if (seconds < 0) + seconds = 0; - p = time_string; - - // Replace any space with a zero - while (*p++) - { - if (*p == ' ') - *p = '0'; - } + snprintf(time_string, 8, "%2d:%02d", minutes, seconds); } else { @@ -73,7 +69,7 @@ snprintf(time_string, 8, "%4d", time_value); } - font->print_right(CL_Display::get_width() - 5, 1, time_string); + font->print_right(CL_Display::get_width() - 5, 3, time_string); } UNUSED_ARG(gc);