NotAShelf/rogged
1
1
Fork 3
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

font: pick a generic temporary font, fix leftover conflict

Browse source
This commit is contained in:
A.M. Rowsell 2026-04-10 08:35:45 -04:00
commit cd3f0f87aa
Signed by: amr
GPG key ID: E0879EDBDB0CA7B1
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
assets/fonts/spartan_500.ttf Normal file
View file

Binary file not shown.

5
src/main.c
View file

@ -523,15 +523,12 @@ void load_audio_assets(GameState *gs) {
static void game_loop(unsigned int run_seed) {
GameState gs;
memset(&gs, 0, sizeof(GameState));
<<<<<<< HEAD
gs.run_seed = run_seed;
=======
// load external assets
// sound
>>>>>>> acdbc9c (font: squash commit into main)
load_audio_assets(&gs);
// font
Font fontTTF = LoadFontEx("./assets/fonts/Tomorrow_Night.ttf", 24, NULL, 0);
Font fontTTF = LoadFontEx("./assets/fonts/spartan_500.ttf", 36, NULL, 0);
// Initialize first floor
init_floor(&gs, 1);