X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=score.c;h=30d30a5eb4c479124b0f83fb296bd45b92368745;hp=6823b575a7961248cd6fe905f643de7a8b7dc343;hb=19f8eb7a835a2b084010a8deb8f3d200f995559d;hpb=88a9e026caed5568363cefb7d49308b875dc5e4a diff --git a/score.c b/score.c index 6823b57..30d30a5 100644 --- a/score.c +++ b/score.c @@ -31,26 +31,27 @@ #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,"-"} } }; @@ -143,7 +144,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); } } @@ -157,10 +158,12 @@ show_score(void) } 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 = font_height(); + int display_cursor = (SDL_GetTicks() / CURSOR_BLINK_TIME) % 2; + font_write(x+30, y, "High scores"); y += h; @@ -172,7 +175,7 @@ display_scores(SDL_Surface *s, uint32_t x, uint32_t y) font_write(x, y, t); snprintscore(t, 1024, g_scores[g_easy][i].score); font_write(x+50, y, t); - if(i == cur_score) snprintf(t, 1024, "%s_", g_scores[g_easy][i].name); + 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); font_write(x+180, y, t); } @@ -190,7 +193,7 @@ 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) {