From 27c803f0404732ae447b73d4c29176e8062867e5 Mon Sep 17 00:00:00 2001 From: Ondrej Novak Date: Thu, 1 May 2025 13:29:51 +0200 Subject: [PATCH] #3 fix issues reported by an ARM64 compiler --- game/chargen.c | 2 +- game/dialogy.c | 2 +- game/gamesave.c | 4 ++-- game/globals.h | 2 +- game/globmap.c | 2 +- game/menu.c | 10 +++++----- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/game/chargen.c b/game/chargen.c index cf19827..4f9ed6d 100644 --- a/game/chargen.c +++ b/game/chargen.c @@ -745,7 +745,7 @@ static void wait_timer(EVENT_MSG *msg, void **udata) { } } -void effect_show(va_list args) +void effect_show() { int i; char s = exit_wait; diff --git a/game/dialogy.c b/game/dialogy.c index ead61d0..4172f80 100644 --- a/game/dialogy.c +++ b/game/dialogy.c @@ -766,7 +766,7 @@ void wire_dialog_drw(void) wire_dialog(); draw_all(); ukaz_mysku(); - effect_show(NULL); + effect_show(); } void unwire_dialog(void) { diff --git a/game/gamesave.c b/game/gamesave.c index 388835d..6b00782 100644 --- a/game/gamesave.c +++ b/game/gamesave.c @@ -1770,12 +1770,12 @@ void wire_save_load(char save) { change_click_map(clk_save,CLK_SAVELOAD); redraw_save(); send_message(E_ADD, E_KEYBOARD, saveload_keyboard); - effect_show(NULL); + effect_show(); } else { curcolor = 0; redraw_load(); - effect_show(NULL); + effect_show(); if (save == 2) change_click_map(clk_load_error, CLK_LOAD_ERROR); else if (save == 4) { diff --git a/game/globals.h b/game/globals.h index db843d4..53f7de0 100644 --- a/game/globals.h +++ b/game/globals.h @@ -1764,7 +1764,7 @@ char clk_enter(int id,int xa,int ya,int xr,int yr); int enter_menu(char open); //task! void titles(va_list args); //task! void run_titles(va_list args); //task! -void effect_show(va_list args); //effektni zobrazeni // task! +void effect_show(void); //effektni zobrazeni void konec_hry(void); diff --git a/game/globmap.c b/game/globmap.c index ab52d1d..38fa16e 100644 --- a/game/globmap.c +++ b/game/globmap.c @@ -637,7 +637,7 @@ struct _tag_map_save_state{ uint32_t _hash; } MAP_SAVE_STATE; -static struct _tag_map_save_state save_state = {NULL,NULL,NULL,0,0,0,0}; +static struct _tag_map_save_state save_state = {NULL,NULL,NULL,NULL,0,0,0,0}; static void save_current_map() { if (save_state._map_coord) { diff --git a/game/menu.c b/game/menu.c index 4dc173c..8d5c9c3 100644 --- a/game/menu.c +++ b/game/menu.c @@ -350,8 +350,8 @@ int enter_menu(char open) put_picture(0,0,ablock(H_MENU_BAR)); put_picture(0,56,ablock(H_ANIM)); ukaz_mysku(); - effect_show(NULL); - //if (open) effect_show(NULL);else showview(0,0,0,0); + effect_show(); + change_click_map(clk_main_menu,CLK_MAIN_MENU); send_message(E_ADD,E_TIMER,prehraj_animaci_v_menu); send_message(E_ADD,E_KEYBOARD,klavesnice); @@ -552,7 +552,7 @@ void titles(va_list args) alock(H_PICTURE); picture=ablock(H_PICTURE); put_picture(0,0,picture); - effect_show(NULL); + effect_show(); titlefont=H_FBIG; set_font(titlefont,RGB(158,210,25));charcolors[1]=0; counter=get_timer_value();newc=counter; @@ -621,7 +621,7 @@ void konec_hry() schovej_mysku(); curcolor=0; bar32(0,0,639,479); - effect_show(NULL); + effect_show(); create_playlist(texty[205]); change_music(get_next_music_from_playlist()); timer=get_timer_value(); @@ -641,7 +641,7 @@ void konec_hry() curcolor=0; bar32(0,0,639,479); ukaz_mysku(); - effect_show(NULL); + effect_show(); timer=get_timer_value(); while (get_timer_value()-timer<150) task_sleep(); }