From f9e5b3d1e95964e345470d38d1d82becbacb4e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=A1k?= Date: Thu, 1 May 2025 14:03:27 +0200 Subject: [PATCH] - #3 fix issues reported by an ARM64 compiler (2) --- game/chargen.c | 4 ++-- game/globals.h | 4 ++-- game/menu.c | 6 +++--- game/skeldal.c | 4 ++-- platform/linux/skeldal.sh | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/game/chargen.c b/game/chargen.c index 4f9ed6d..a729dd9 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() +void effect_show(void) { int i; char s = exit_wait; @@ -861,7 +861,7 @@ char enter_generator() memset(&cur_stats,0,sizeof(cur_stats)); vypocet_vlastnosti(cur_angle,&cur_vls); b_disables=0x7; - redraw_generator(rep);if (!rep)effect_show(NULL);rep=1; + redraw_generator(rep);if (!rep)effect_show();rep=1; edit_name(); change_click_map(clk_page1,CLK_PAGE1); was_enter=0; diff --git a/game/globals.h b/game/globals.h index 53f7de0..bc5d4e3 100644 --- a/game/globals.h +++ b/game/globals.h @@ -1763,8 +1763,8 @@ char clk_enter(int id,int xa,int ya,int xr,int yr); //menu int enter_menu(char open); //task! void titles(va_list args); //task! -void run_titles(va_list args); //task! -void effect_show(void); //effektni zobrazeni +void run_titles(void ); +void effect_show(void); //effektni zobrazeni void konec_hry(void); diff --git a/game/menu.c b/game/menu.c index 8d5c9c3..d9bf6f3 100644 --- a/game/menu.c +++ b/game/menu.c @@ -604,7 +604,7 @@ void titles(va_list args) if (send_back)send_message(E_KEYBOARD,27); } -void run_titles(va_list args) +void run_titles(void) { int task_id; task_id=add_task(8196,titles,1,"titulky.TXT"); @@ -612,12 +612,12 @@ void run_titles(va_list args) term_task(task_id); } -void konec_hry() +void konec_hry(void) { int task_id; int timer; - + schovej_mysku(); curcolor=0; bar32(0,0,639,479); diff --git a/game/skeldal.c b/game/skeldal.c index ee1b6ec..28d488e 100644 --- a/game/skeldal.c +++ b/game/skeldal.c @@ -989,7 +989,7 @@ void init_skeldal(const INI_CONFIG *cfg) cti_texty(); timer_tree.next=NULL; - init_events(); + init_events(); steam_init(); @@ -1579,7 +1579,7 @@ static void start(va_list args) openning =0; break; case V_OBNOVA_HRY:load_saved_game();break; - case V_AUTORI:run_titles(NULL);break; + case V_AUTORI:run_titles();break; } } while (!exit_wait); diff --git a/platform/linux/skeldal.sh b/platform/linux/skeldal.sh index 03e6c7f..1dedef9 100755 --- a/platform/linux/skeldal.sh +++ b/platform/linux/skeldal.sh @@ -2,6 +2,7 @@ temp_file=$(mktemp /tmp/skeldal.XXXXXX.log) CURDIR=`dirname "$0"` +chmod +x "$CURDIR/skeldal_bin" LD_LIBRARY_PATH=$CURDIR:$LD_LIBRARY_PATH "$CURDIR/skeldal_bin" $* > "$temp_file" 2>&1 exit_code=$? @@ -25,4 +26,3 @@ fi rm $temp_file exit $exit_code -