projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed broken 1-time animations in sprites, fixed collision code returning no-collisio...
[supertux.git]
/
src
/
high_scores.cpp
diff --git
a/src/high_scores.cpp
b/src/high_scores.cpp
index
73fc528
..
86b1eb6
100644
(file)
--- a/
src/high_scores.cpp
+++ b/
src/high_scores.cpp
@@
-20,6
+20,8
@@
/* Open the highscore file: */
/* Open the highscore file: */
+#include <config.h>
+
#include <cstring>
#include <cstdlib>
#include <cstring>
#include <cstdlib>
@@
-31,6
+33,9
@@
#include "video/surface.h"
#include "app/setup.h"
#include "utils/lispreader.h"
#include "video/surface.h"
#include "app/setup.h"
#include "utils/lispreader.h"
+#include "resources.h"
+
+using namespace SuperTux;
#ifdef WIN32
const char * highscore_filename = "/st_highscore.dat";
#ifdef WIN32
const char * highscore_filename = "/st_highscore.dat";
@@
-92,22
+97,19
@@
void save_hs(int score)
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.c_str()) + 1);
-
- strcpy(highscore_menu->item[0].input,hs_name.c_str());
+ highscore_menu->item[0].input = hs_name;
/* ask for player's name */
while(Menu::current())
{
context.draw_surface(bkgd, Vector(0, 0), LAYER_BACKGROUND0);
/* ask for player's name */
while(Menu::current())
{
context.draw_surface(bkgd, Vector(0, 0), LAYER_BACKGROUND0);
- context.draw_text
_center
(blue_text, "Congratulations",
- Vector(
0, 130)
, LAYER_FOREGROUND1);
+ context.draw_text(blue_text, "Congratulations",
+ Vector(
screen->w/2, 130), CENTER_ALLIGN
, LAYER_FOREGROUND1);
context.draw_text(blue_text, "Your score:", Vector(150, 180),
context.draw_text(blue_text, "Your score:", Vector(150, 180),
- LAYER_FOREGROUND1);
+ L
EFT_ALLIGN, L
AYER_FOREGROUND1);
sprintf(str, "%d", hs_score);
sprintf(str, "%d", hs_score);
- context.draw_text(yellow_nums, str, Vector(250, 170), LAYER_FOREGROUND1);
+ context.draw_text(yellow_nums, str, Vector(250, 170), L
EFT_ALLIGN, L
AYER_FOREGROUND1);
Menu::current()->draw(context);
Menu::current()->action();
Menu::current()->draw(context);
Menu::current()->action();
@@
-121,8
+123,7
@@
void save_hs(int score)
switch (highscore_menu->check())
{
case 0:
switch (highscore_menu->check())
{
case 0:
- if(highscore_menu->item[0].input != NULL)
- hs_name = highscore_menu->item[0].input;
+ hs_name = highscore_menu->item[0].input;
break;
}
break;
}
@@
-138,8
+139,8
@@
void save_hs(int score)
/* Save data file: */
filename = highscore_filename;
/* Save data file: */
filename = highscore_filename;
- fcreatedir(filename.c_str());
- if(fwriteable(filename.c_str()))
+
FileSystem::
fcreatedir(filename.c_str());
+ if(
FileSystem::
fwriteable(filename.c_str()))
{
fi = fopen(filename.c_str(), "w");
if (fi == NULL)
{
fi = fopen(filename.c_str(), "w");
if (fi == NULL)