amr/rogged
1
0
Fork 0
forked from NotAShelf/rogged
Code Pull requests Activity

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 • committed by raf
commit 23e98772ad
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main.c
View file

@ -522,15 +522,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);