X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fglobals.h;h=5a68fc810953cffedcfa26ac55b39030c18ffc0f;hb=28dcc843a7500b395730e5f5eb821577f0b9d797;hp=0dcb117ba594ac6a9c02904116b2f11ec36b189b;hpb=972b624ee371fb5e4b418aa482a92c555c1a3abd;p=supertux.git diff --git a/src/globals.h b/src/globals.h index 0dcb117ba..5a68fc810 100644 --- a/src/globals.h +++ b/src/globals.h @@ -24,7 +24,7 @@ #include #include -#include "text.h" +#include "screen/font.h" #include "menu.h" #include "mousecursor.h" @@ -46,17 +46,13 @@ struct JoystickKeymap extern JoystickKeymap joystick_keymap; -extern SDL_Surface * screen; -extern Text* black_text; -extern Text* gold_text; -extern Text* silver_text; -extern Text* white_text; -extern Text* white_small_text; -extern Text* white_big_text; -extern Text* blue_text; -extern Text* red_text; -extern Text* green_text; -extern Text* yellow_nums; +extern SDL_Surface* screen; +extern Font* gold_text; +extern Font* white_text; +extern Font* white_small_text; +extern Font* white_big_text; +extern Font* blue_text; +extern Font* yellow_nums; extern MouseCursor * mouse_cursor;