From f194481a520a39a1964348011df8deb108f789b7 Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Sun, 12 May 2024 16:57:19 +0200 Subject: splash art --- src/asset_defs.c | 5 ++++- src/game.c | 16 ++++++++++++++++ src/zombies.c | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/asset_defs.c b/src/asset_defs.c index 7fff980..9e29b10 100644 --- a/src/asset_defs.c +++ b/src/asset_defs.c @@ -3,7 +3,8 @@ //#include "../data/fonts/oxanium.h" #include "../data/fonts/aleo.h" -void load_assets() { +void load_menu_assets() { // Assets loaded at game start + img_splash_art1 = assets_load_image_from_file("data/imgs/ui/splash1.png"); fnt_52 = assets_load_font(Aleo_Regular, Aleo_Regular + Aleo_Regular_Size, 52); fnt_48 = assets_load_font(Aleo_Regular, Aleo_Regular + Aleo_Regular_Size, 48); @@ -18,7 +19,9 @@ void load_assets() { fnt_12 = assets_load_font(Aleo_Regular, Aleo_Regular + Aleo_Regular_Size, 12); fnt_8 = assets_load_font(Aleo_Regular, Aleo_Regular + Aleo_Regular_Size, 8); fnt_4 = assets_load_font(Aleo_Regular, Aleo_Regular + Aleo_Regular_Size, 4); +} +void load_assets() { // Assets loaded at match start. // UI img_red_border = assets_load_image_from_file("data/imgs/ui/red_border.png"); diff --git a/src/game.c b/src/game.c index d17e432..c582ac4 100644 --- a/src/game.c +++ b/src/game.c @@ -372,9 +372,25 @@ static void move_camera(platform_window* window) { _global_camera.y = (int)_camera_buffer.y; } +void draw_splash(platform_window* window) { + image* img = img_splash_art1; + int imgw = img->width * (window->height/(float)img->height); + int imgh = window->height; + + int imgx = (window->width - imgw) / 2 + _global_camera.x; + int imgy = 0 + _global_camera.y; + + renderer->render_image(img, imgx, imgy, imgw, imgh); +} + void update_game(platform_window* window) { clear_bullets(); + if (global_state.state != GAMESTATE_PLAYING) { + draw_splash(window); + return; + } + if (global_state.server) { update_server(window); } diff --git a/src/zombies.c b/src/zombies.c index c04f91e..13368f2 100644 --- a/src/zombies.c +++ b/src/zombies.c @@ -479,7 +479,7 @@ void draw_zombies(platform_window* window, uint32_t ystart, uint32_t yend) { renderer->render_rectangle(zombie_pos.x + (zombie_size/2) - (bar_w/2), zombie_pos.y - bar_h, bar_w*percentage, bar_h, rgb(100,0,0)); } - if (global_state.server) draw_path_of_zombie(window, o); + //if (global_state.server) draw_path_of_zombie(window, o); } } -- cgit v1.2.3-70-g09d2