projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- turned menu into a class, still a lot of public variables around and menu_item...
[supertux.git]
/
src
/
high_scores.cpp
diff --git
a/src/high_scores.cpp
b/src/high_scores.cpp
index
33836d4
..
d2e7102
100644
(file)
--- a/
src/high_scores.cpp
+++ b/
src/high_scores.cpp
@@
-63,7
+63,8
@@
void load_hs(void)
{
FILE * fi;
char temp[128];
{
FILE * fi;
char temp[128];
- int c, i, strl;
+ int strl;
+ unsigned int i, c;
hs_score = 100;
strcpy(hs_name, "Grandma\0");
hs_score = 100;
strcpy(hs_name, "Grandma\0");
@@
-117,17
+118,17
@@
void save_hs(int score)
FILE * fi;
FILE * fi;
- texture_load(&bkgd,
DATA_PREFIX
"/images/highscore/highscore.png", IGNORE_ALPHA);
+ texture_load(&bkgd,
datadir +
"/images/highscore/highscore.png", IGNORE_ALPHA);
hs_score = score;
menu_reset();
hs_score = score;
menu_reset();
-
menu_set_current(&
highscore_menu);
+
Menu::set_current(
highscore_menu);
- if(!highscore_menu
.
item[0].input)
- highscore_menu
.
item[0].input = (char*) malloc(strlen(hs_name) + 1);
+ if(!highscore_menu
->
item[0].input)
+ highscore_menu
->
item[0].input = (char*) malloc(strlen(hs_name) + 1);
- strcpy(highscore_menu
.
item[0].input,hs_name);
+ strcpy(highscore_menu
->
item[0].input,hs_name);
/* ask for player's name */
show_menu = 1;
/* ask for player's name */
show_menu = 1;
@@
-147,11
+148,11
@@
void save_hs(int score)
if(event.type == SDL_KEYDOWN)
menu_event(&event.key.keysym);
if(event.type == SDL_KEYDOWN)
menu_event(&event.key.keysym);
- switch (
menu_check(&highscore_menu
))
+ switch (
highscore_menu->check(
))
{
case 0:
{
case 0:
- if(highscore_menu
.
item[0].input != NULL)
- strcpy(hs_name, highscore_menu
.
item[0].input);
+ if(highscore_menu
->
item[0].input != NULL)
+ strcpy(hs_name, highscore_menu
->
item[0].input);
break;
}
break;
}