X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=score.c;h=86486793d50a4ec83bedb0459fea3de84cf46a46;hp=b9c666e7f36cd1c62fc147eda46cbf5a530c69fd;hb=dfe2d5a39007e86ccebf2e076ba53c99db49b95f;hpb=8332fa82bd3726436a1c3165484ed8207ed23ede

diff --git a/score.c b/score.c
index b9c666e..8648679 100644
--- a/score.c
+++ b/score.c
@@ -25,32 +25,33 @@
 #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,"-"}
 	}
 };
 
@@ -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);
 	}
 }
 
@@ -161,6 +162,8 @@ 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(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) {