mirror of
https://github.com/raysan5/raylib.git
synced 2025-12-25 10:22:33 -05:00
BREAKING CHANGE: Renamed SpriteFont type to Font
- Preparing MP3 files support - Jumped version to raylib 2.0-dev (too many breaking changes...)
This commit is contained in:
@ -68,7 +68,7 @@ static Mission *missions = NULL;
|
||||
|
||||
static char headline[MAX_TITLE_CHAR] = "\0";
|
||||
|
||||
SpriteFont fontNews;
|
||||
Font fontNews;
|
||||
|
||||
// String (const char *) replacement function
|
||||
static char *StringReplace(char *orig, char *rep, char *with);
|
||||
@ -121,11 +121,11 @@ void InitEndingScreen(void)
|
||||
|
||||
// Generate newspaper with title and subtitle
|
||||
Image imNewspaper = LoadImage("resources/textures/ending_newspaper.png");
|
||||
fontNews = LoadSpriteFontEx("resources/fonts/Lora-Bold.ttf", 32, 250, 0);
|
||||
fontNews = LoadFontEx("resources/fonts/Lora-Bold.ttf", 32, 250, 0);
|
||||
ImageDrawTextEx(&imNewspaper, (Vector2){ 50, 220 }, fontNews, headline, fontNews.baseSize, 0, DARKGRAY);
|
||||
|
||||
texNewspaper = LoadTextureFromImage(imNewspaper);
|
||||
//UnloadSpriteFont(fontNews);
|
||||
//UnloadFont(fontNews);
|
||||
UnloadImage(imNewspaper);
|
||||
}
|
||||
|
||||
|
||||
@ -95,7 +95,7 @@ static int framesCounter;
|
||||
static int finishScreen;
|
||||
|
||||
static Texture2D texBackground;
|
||||
static SpriteFont fontMessage;
|
||||
static Font fontMessage;
|
||||
static Texture2D texWordsAtlas;
|
||||
static Texture2D texVignette;
|
||||
|
||||
@ -126,7 +126,7 @@ void InitGameplayScreen(void)
|
||||
framesCounter = 0;
|
||||
finishScreen = 0;
|
||||
|
||||
fontMessage = LoadSpriteFontEx("resources/fonts/traveling_typewriter.ttf", 30, 250, 0);
|
||||
fontMessage = LoadFontEx("resources/fonts/traveling_typewriter.ttf", 30, 250, 0);
|
||||
|
||||
texBackground = LoadTexture("resources/textures/message_background.png");
|
||||
texVignette = LoadTexture("resources/textures/message_vignette.png");
|
||||
|
||||
@ -36,7 +36,7 @@ static int framesCounter;
|
||||
static int finishScreen;
|
||||
|
||||
static Texture2D texBackground;
|
||||
static SpriteFont fontTitle;
|
||||
static Font fontTitle;
|
||||
static Sound fxTyping;
|
||||
|
||||
static float titleSize;
|
||||
@ -71,7 +71,7 @@ void InitTitleScreen(void)
|
||||
|
||||
texBackground = LoadTexture("resources/textures/title_background.png");
|
||||
fxTyping = LoadSound("resources/audio/fx_typing.ogg");
|
||||
fontTitle = LoadSpriteFontEx("resources/fonts/mom_typewritter.ttf", 96, 0, 0);
|
||||
fontTitle = LoadFontEx("resources/fonts/mom_typewritter.ttf", 96, 0, 0);
|
||||
|
||||
titleSize = 44;
|
||||
transmissionPosition = (Vector2){519, 221};
|
||||
@ -148,7 +148,7 @@ void UnloadTitleScreen(void)
|
||||
{
|
||||
UnloadTexture(texBackground);
|
||||
UnloadSound(fxTyping);
|
||||
UnloadSpriteFont(fontTitle);
|
||||
UnloadFont(fontTitle);
|
||||
}
|
||||
|
||||
// Title Screen should finish?
|
||||
|
||||
@ -76,7 +76,7 @@ Color textColorButton;
|
||||
int currentMission;
|
||||
int totalMissions;
|
||||
|
||||
SpriteFont fontMission;
|
||||
Font fontMission;
|
||||
|
||||
Word messageWords[MAX_MISSION_WORDS];
|
||||
|
||||
|
||||
@ -70,7 +70,7 @@ int main(void)
|
||||
SetMusicVolume(music, 1.0f);
|
||||
PlayMusicStream(music);
|
||||
|
||||
fontMission = LoadSpriteFontEx("resources/fonts/traveling_typewriter.ttf", 64, 250, 0);
|
||||
fontMission = LoadFontEx("resources/fonts/traveling_typewriter.ttf", 64, 250, 0);
|
||||
texButton = LoadTexture("resources/textures/title_ribbon.png");
|
||||
|
||||
// UI BUTTON
|
||||
@ -122,7 +122,7 @@ int main(void)
|
||||
UnloadMusicStream(music);
|
||||
UnloadSound(fxButton);
|
||||
|
||||
UnloadSpriteFont(fontMission);
|
||||
UnloadFont(fontMission);
|
||||
UnloadTexture(texButton);
|
||||
|
||||
CloseAudioDevice(); // Close audio context
|
||||
|
||||
Reference in New Issue
Block a user