work around compiler warnings in high score read

[vor.git] / score.c

diff --git a/score.c b/score.c
index 78a03ac..8c5bc59 100644 (file)
--- a/score.c
+++ b/score.c
@@ -22,42 +22,41 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "SFont.h"
+#include "font.h"
 
 #include "common.h"
-#include "config.h"
+#include "vorconfig.h"
 #include "file.h"
 #include "globals.h"
 #include "score.h"
 
 // High score table
+// below are the defaults (when there's no high score file) in miliseconds
 struct highscore g_scores[2][N_SCORES] = {
        {
-               {1*60*1000,"-"},
-               {45*1000,"-"},
-               {30*1000,"-"},
-               {20*1000,"-"},
-               {10*1000,"-"},
-               {7*1000,"-"},
-               {5*1000,"-"},
-               {3*1000,"-"}
+               {120000,"-"},
+               {105000,"-"},
+               { 90000,"-"},
+               { 75000,"-"},
+               { 60000,"-"},
+               { 50000,"-"},
+               { 40000,"-"},
+               { 30000,"-"}
        },
        {
-               {1*60*1000,"-"},
-               {45*1000,"-"},
-               {30*1000,"-"},
-               {20*1000,"-"},
-               {10*1000,"-"},
-               {7*1000,"-"},
-               {5*1000,"-"},
-               {3*1000,"-"}
+               {120000,"-"},
+               {105000,"-"},
+               { 90000,"-"},
+               { 75000,"-"},
+               { 60000,"-"},
+               { 50000,"-"},
+               { 40000,"-"},
+               { 30000,"-"}
        }
 };
 
 static char *titles[2] = { "Normal\n", "Easy\n" };
 
-extern SFont_Font *g_font;
-
 int g_easy = 0;
 int cur_score = -1; // which score we're currently entering.
 
@@ -65,15 +64,21 @@ void
 read_high_score_table()
 {
        FILE *f;
-       int i, j;
+       int i, j, ret;
        
        f = open_score_file("r");
        if(f) {
                // If the file exists, read from it
                for(j=0; j<2; j++) {
-                       fscanf(f, titles[j]);
+                       ret = fseek(f, strlen(titles[j]), SEEK_CUR);
+                       if (ret != 0) {
+                               break;
+                       }
                        for(i = 0; i<N_SCORES; i++) {
-                               fscanf(f, "%d %31[^\n]\n", &g_scores[j][i].score, g_scores[j][i].name);
+                               ret = fscanf(f, "%d %31[^\n]\n", &g_scores[j][i].score, g_scores[j][i].name);
+                               if (ret != 2) {
+                                       break;
+                               }
                        }
                }
                fclose(f);
@@ -90,7 +95,7 @@ write_high_score_table()
        if(f) {
                // If the file exists, write to it
                for(j=0; j<2; j++) {
-                       fprintf(f, titles[j]);
+                       fprintf(f, "%s", titles[j]);
                        for(i = 0; i<N_SCORES; i++) {
                                fprintf (f, "%d %.31s\n", g_scores[j][i].score, g_scores[j][i].name);
                        }
@@ -145,7 +150,7 @@ snprintscore(char *s, size_t n, int score)
        if(min) {
                return snprintf(s, n, "%2d:%.2d.%d", min, sec, tenths);
        } else {
-               return snprintf(s, n, "%2d.%d", sec, tenths);
+               return snprintf(s, n, "   %2d.%d", sec, tenths);
        }
 }
 
@@ -155,28 +160,30 @@ show_score(void)
        char s[16];
        int r = snprintf(s, 16, "Time: ");
        snprintscore(s+r, 16-r, score);
-       SFont_Write(surf_screen, g_font, XSIZE-250, 0, s);
+       font_write(XSIZE-250, 0, s);
 }
 
 void
-display_scores(SDL_Surface *s, uint32_t x, uint32_t y)
+display_scores(uint32_t x, uint32_t y)
 {
        char t[1024];
-       int i,h = SFont_TextHeight(g_font);
+       int i,h = font_height();
+       int display_cursor = (SDL_GetTicks() / CURSOR_BLINK_TIME) % 2;
 
-       SFont_Write(s,g_font,x+30,y,"High scores");
+
+       font_write(x+30, y, "High scores");
        y += h;
-       if(g_easy) SFont_Write(s,g_font,x+75,y,"(easy)");
-       else SFont_Write(s,g_font,x+60,y,"(normal)");
+       if(g_easy) font_write(x+75,y,"(easy)");
+       else font_write(x+60,y,"(normal)");
        for(i = 0; i<N_SCORES; i++) {
                y += h;
                snprintf(t, 1024, "#%1d",i+1);
-               SFont_Write(s, g_font, x, y, t);
+               font_write(x, y, t);
                snprintscore(t, 1024, g_scores[g_easy][i].score);
-               SFont_Write(s, g_font, x+50, y, t);
-               if(i == cur_score) snprintf(t, 1024, "%s_", g_scores[g_easy][i].name);
+               font_write(x+50, y, t);
+               if(display_cursor && i == cur_score) snprintf(t, 1024, "%s_", g_scores[g_easy][i].name);
                else snprintf(t, 1024, "%s", g_scores[g_easy][i].name);
-               SFont_Write(s, g_font, x+180, y, t);
+               font_write(x+180, y, t);
        }
 }
 
@@ -192,11 +199,18 @@ process_score_input(SDL_keysym *key)
        if(key->sym == SDLK_BACKSPACE) {
                if(n > 0) name[--n]=0;
        } else {
-               if(key->sym == SDLK_RETURN) {
+               if(key->sym == SDLK_RETURN || key->sym == SDLK_KP_ENTER) {
                        SDL_EnableUNICODE(0);
                        cur_score = -1;
+                       if(n == 0) {
+                               name[0] = '-';
+                       }
                        return false;
-               } else name[n++] = key->unicode;
+               } else if(n < 12) {
+                       if(key->unicode >= 32 && key->unicode <= 126) {
+                               name[n++] = key->unicode;
+                       }
+               } // else drop it
        }
        return true;
 }