projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
preload sounds
[supertux.git]
/
src
/
resources.cpp
diff --git
a/src/resources.cpp
b/src/resources.cpp
index
ef251a6
..
f0e6037
100644
(file)
--- a/
src/resources.cpp
+++ b/
src/resources.cpp
@@
-31,6
+31,7
@@
MouseCursor* mouse_cursor = NULL;
Font* gold_text = NULL;
MouseCursor* mouse_cursor = NULL;
Font* gold_text = NULL;
+Font* gold_fixed_text = NULL;
Font* blue_text = NULL;
Font* gray_text = NULL;
Font* white_text = NULL;
Font* blue_text = NULL;
Font* gray_text = NULL;
Font* white_text = NULL;
@@
-45,24
+46,25
@@
void load_shared()
MouseCursor::set_current(mouse_cursor);
/* Load global images: */
MouseCursor::set_current(mouse_cursor);
/* Load global images: */
- gold_text = new Font(Font::
FIXED
,
+ gold_text = new Font(Font::
VARIABLE
,
"images/engine/fonts/gold.png",
"images/engine/fonts/shadow.png", 16, 18);
"images/engine/fonts/gold.png",
"images/engine/fonts/shadow.png", 16, 18);
- blue_text = new Font(Font::FIXED,
+ gold_fixed_text = new Font(Font::FIXED,
+ "images/engine/fonts/gold.png",
+ "images/engine/fonts/shadow.png", 16, 18);
+ blue_text = new Font(Font::VARIABLE,
"images/engine/fonts/blue.png",
"images/engine/fonts/shadow.png", 16, 18, 3);
"images/engine/fonts/blue.png",
"images/engine/fonts/shadow.png", 16, 18, 3);
- // white_text = new Font("images/engine/fonts/white.png",
- // "images/engine/fonts/shadow.png", 16, 18);
white_text = new Font(Font::VARIABLE,
white_text = new Font(Font::VARIABLE,
- "images/engine/fonts/white.png", 16, 18);
- gray_text = new Font(Font::FIXED,
+ "images/engine/fonts/white.png",
+ "images/engine/fonts/shadow.png", 16, 18);
+ gray_text = new Font(Font::VARIABLE,
"images/engine/fonts/gray.png",
"images/engine/fonts/shadow.png", 16, 18);
white_small_text = new Font(Font::VARIABLE,
"images/engine/fonts/white-small.png",
"images/engine/fonts/gray.png",
"images/engine/fonts/shadow.png", 16, 18);
white_small_text = new Font(Font::VARIABLE,
"images/engine/fonts/white-small.png",
- 8, 9);
- // "images/engine/fonts/shadow-small.png", 8, 9, 1);
- white_big_text = new Font(Font::FIXED,
+ "images/engine/fonts/shadow-small.png", 8, 9, 1);
+ white_big_text = new Font(Font::VARIABLE,
"images/engine/fonts/white-big.png",
"images/engine/fonts/shadow-big.png", 20, 22, 3);
"images/engine/fonts/white-big.png",
"images/engine/fonts/shadow-big.png", 20, 22, 3);
@@
-120,6
+122,7
@@
void unload_shared()
{
/* Free global images: */
delete gold_text;
{
/* Free global images: */
delete gold_text;
+ delete gold_fixed_text;
delete white_text;
delete blue_text;
delete gray_text;
delete white_text;
delete blue_text;
delete gray_text;
@@
-143,4
+146,7
@@
void unload_shared()
/* Free mouse-cursor */
delete mouse_cursor;
/* Free mouse-cursor */
delete mouse_cursor;
+
+ delete player_status;
+ player_status = NULL;
}
}