Merge branch 'main' into sse

This commit is contained in:
Ondřej Novák 2025-05-09 08:04:02 +02:00
commit 5931c6eab4
37 changed files with 739 additions and 147 deletions

View file

@ -75,12 +75,13 @@ typedef struct inis
THE_TIMER timer_tree;
int hl_ptr=H_FIRST_FREE;
int debug_enabled=0;
char sound_detection=1;
int snd_devnum,snd_parm1,snd_parm2,snd_parm3,snd_mixing=22000;
char gamespeed=5;
char gamespeedbattle=0;
uint8_t gamespeed=GAMESPEED;
uint8_t gamespeedbattle=GAMESPEED;
char level_preload=1;
char *level_fname=NULL;
int game_extras=0;
@ -827,6 +828,8 @@ void cti_texty(void)
//patch stringtable
if (!texty[98]) str_replace(&texty,98,"Ulo\x91it hru jako");
if (!texty[99]) str_replace(&texty,99,"CRT Filter (>720p)");
str_replace(&texty, 144, "Zrychlit souboje");
str_replace(&texty, 51, "Celkov\x88 Hudba Efekty V\x98\xA8ky Basy Rychlost");
str_replace(&texty,0,"Byl nalezen p\xA9ipojen\x98 ovlada\x87\nPro aktivaci ovlada\x87""e stiskn\x88te kter\x82koliv tla\x87\xA1tko na ovlada\x87i");
lang_patch_stringtable(&texty, "ui.csv", "");
}
@ -1622,7 +1625,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);