X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fresources.cpp;h=f0e6037148b82c9ddd25af509dfe35ed87ea4d38;hb=c551a7ee31696e62ee6a05d4505ff93cfca24112;hp=a4a3f80a1e7f34b28926eda78d2f545031e88c0c;hpb=7504b8ef1155259916f0e38eeb74a6024bb1d85b;p=supertux.git diff --git a/src/resources.cpp b/src/resources.cpp index a4a3f80a1..f0e603714 100644 --- a/src/resources.cpp +++ b/src/resources.cpp @@ -31,6 +31,7 @@ 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; @@ -45,18 +46,26 @@ void load_shared() MouseCursor::set_current(mouse_cursor); /* Load global images: */ - gold_text = new Font("images/engine/fonts/gold.png", + gold_text = new Font(Font::VARIABLE, + "images/engine/fonts/gold.png", "images/engine/fonts/shadow.png", 16, 18); - blue_text = new Font("images/engine/fonts/blue.png", + 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); - // white_text = new Font("images/engine/fonts/white.png", - // "images/engine/fonts/shadow.png", 16, 18); - white_text = new Font("images/engine/fonts/white.png", 16, 18); - gray_text = new Font("images/engine/fonts/gray.png", + white_text = new Font(Font::VARIABLE, + "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("images/engine/fonts/white-small.png", + white_small_text = new Font(Font::VARIABLE, + "images/engine/fonts/white-small.png", "images/engine/fonts/shadow-small.png", 8, 9, 1); - white_big_text = new Font("images/engine/fonts/white-big.png", + white_big_text = new Font(Font::VARIABLE, + "images/engine/fonts/white-big.png", "images/engine/fonts/shadow-big.png", 20, 22, 3); Menu::default_font = white_text; @@ -113,6 +122,7 @@ void unload_shared() { /* Free global images: */ delete gold_text; + delete gold_fixed_text; delete white_text; delete blue_text; delete gray_text; @@ -136,4 +146,7 @@ void unload_shared() /* Free mouse-cursor */ delete mouse_cursor; + + delete player_status; + player_status = NULL; }