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:
Ray San
2018-05-04 16:59:48 +02:00
parent 6045062a05
commit ec33e7d705
34 changed files with 3027 additions and 179 deletions

View File

@ -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);
}

View File

@ -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");

View File

@ -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?

View File

@ -76,7 +76,7 @@ Color textColorButton;
int currentMission;
int totalMissions;
SpriteFont fontMission;
Font fontMission;
Word messageWords[MAX_MISSION_WORDS];

View File

@ -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