mirror of
https://github.com/ondra-novak/gates_of_skeldal.git
synced 2025-07-20 05:04:53 -04:00
#3 fix issues reported by an ARM64 compiler
This commit is contained in:
parent
b22149a13a
commit
27c803f040
6 changed files with 11 additions and 11 deletions
|
@ -745,7 +745,7 @@ static void wait_timer(EVENT_MSG *msg, void **udata) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void effect_show(va_list args)
|
void effect_show()
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
char s = exit_wait;
|
char s = exit_wait;
|
||||||
|
|
|
@ -766,7 +766,7 @@ void wire_dialog_drw(void)
|
||||||
wire_dialog();
|
wire_dialog();
|
||||||
draw_all();
|
draw_all();
|
||||||
ukaz_mysku();
|
ukaz_mysku();
|
||||||
effect_show(NULL);
|
effect_show();
|
||||||
}
|
}
|
||||||
void unwire_dialog(void)
|
void unwire_dialog(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1770,12 +1770,12 @@ void wire_save_load(char save) {
|
||||||
change_click_map(clk_save,CLK_SAVELOAD);
|
change_click_map(clk_save,CLK_SAVELOAD);
|
||||||
redraw_save();
|
redraw_save();
|
||||||
send_message(E_ADD, E_KEYBOARD, saveload_keyboard);
|
send_message(E_ADD, E_KEYBOARD, saveload_keyboard);
|
||||||
effect_show(NULL);
|
effect_show();
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
curcolor = 0;
|
curcolor = 0;
|
||||||
redraw_load();
|
redraw_load();
|
||||||
effect_show(NULL);
|
effect_show();
|
||||||
if (save == 2)
|
if (save == 2)
|
||||||
change_click_map(clk_load_error, CLK_LOAD_ERROR);
|
change_click_map(clk_load_error, CLK_LOAD_ERROR);
|
||||||
else if (save == 4) {
|
else if (save == 4) {
|
||||||
|
|
|
@ -1764,7 +1764,7 @@ char clk_enter(int id,int xa,int ya,int xr,int yr);
|
||||||
int enter_menu(char open); //task!
|
int enter_menu(char open); //task!
|
||||||
void titles(va_list args); //task!
|
void titles(va_list args); //task!
|
||||||
void run_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);
|
void konec_hry(void);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -637,7 +637,7 @@ struct _tag_map_save_state{
|
||||||
uint32_t _hash;
|
uint32_t _hash;
|
||||||
} MAP_SAVE_STATE;
|
} 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() {
|
static void save_current_map() {
|
||||||
if (save_state._map_coord) {
|
if (save_state._map_coord) {
|
||||||
|
|
10
game/menu.c
10
game/menu.c
|
@ -350,8 +350,8 @@ int enter_menu(char open)
|
||||||
put_picture(0,0,ablock(H_MENU_BAR));
|
put_picture(0,0,ablock(H_MENU_BAR));
|
||||||
put_picture(0,56,ablock(H_ANIM));
|
put_picture(0,56,ablock(H_ANIM));
|
||||||
ukaz_mysku();
|
ukaz_mysku();
|
||||||
effect_show(NULL);
|
effect_show();
|
||||||
//if (open) effect_show(NULL);else showview(0,0,0,0);
|
|
||||||
change_click_map(clk_main_menu,CLK_MAIN_MENU);
|
change_click_map(clk_main_menu,CLK_MAIN_MENU);
|
||||||
send_message(E_ADD,E_TIMER,prehraj_animaci_v_menu);
|
send_message(E_ADD,E_TIMER,prehraj_animaci_v_menu);
|
||||||
send_message(E_ADD,E_KEYBOARD,klavesnice);
|
send_message(E_ADD,E_KEYBOARD,klavesnice);
|
||||||
|
@ -552,7 +552,7 @@ void titles(va_list args)
|
||||||
alock(H_PICTURE);
|
alock(H_PICTURE);
|
||||||
picture=ablock(H_PICTURE);
|
picture=ablock(H_PICTURE);
|
||||||
put_picture(0,0,picture);
|
put_picture(0,0,picture);
|
||||||
effect_show(NULL);
|
effect_show();
|
||||||
titlefont=H_FBIG;
|
titlefont=H_FBIG;
|
||||||
set_font(titlefont,RGB(158,210,25));charcolors[1]=0;
|
set_font(titlefont,RGB(158,210,25));charcolors[1]=0;
|
||||||
counter=get_timer_value();newc=counter;
|
counter=get_timer_value();newc=counter;
|
||||||
|
@ -621,7 +621,7 @@ void konec_hry()
|
||||||
schovej_mysku();
|
schovej_mysku();
|
||||||
curcolor=0;
|
curcolor=0;
|
||||||
bar32(0,0,639,479);
|
bar32(0,0,639,479);
|
||||||
effect_show(NULL);
|
effect_show();
|
||||||
create_playlist(texty[205]);
|
create_playlist(texty[205]);
|
||||||
change_music(get_next_music_from_playlist());
|
change_music(get_next_music_from_playlist());
|
||||||
timer=get_timer_value();
|
timer=get_timer_value();
|
||||||
|
@ -641,7 +641,7 @@ void konec_hry()
|
||||||
curcolor=0;
|
curcolor=0;
|
||||||
bar32(0,0,639,479);
|
bar32(0,0,639,479);
|
||||||
ukaz_mysku();
|
ukaz_mysku();
|
||||||
effect_show(NULL);
|
effect_show();
|
||||||
timer=get_timer_value();
|
timer=get_timer_value();
|
||||||
while (get_timer_value()-timer<150) task_sleep();
|
while (get_timer_value()-timer<150) task_sleep();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue