bass, treble, control crt filter in setup, fix lock multiaction

This commit is contained in:
Ondrej Novak 2025-02-18 10:32:37 +01:00
parent 05c1f952c4
commit e631f339dd
11 changed files with 279 additions and 23 deletions

View file

@ -1555,7 +1555,7 @@ THAGGLERESULT smlouvat_dlg(int cena,int puvod,int pocet,int posledni, int money,
char ask_save_dialog(char *name_buffer, size_t name_size) {
const char *str_label = texty[98];
if (str_label == 0) str_label ="Ulo\x91it hru jako";
// if (str_label == 0) str_label ="Ulo\x91it hru jako";
set_font(H_FBOLD,RGB555(31,31,31));
add_window(170,130,300,100,H_WINTXTR,3,20,20);

View file

@ -739,10 +739,11 @@ void call_macro_ex(int side, int flags, int runatside) {
z = mrec.action_list;
if (z->general.flags & flags) {
int jmp_to = -1;
char cancel_enabled = 1;
int stindex = z - first_macro;
char cancel = 0;
if (!z->general.once || !macro_state_block.states[stindex]) {
macro_state_block.states[stindex] = 1;
cancel = z->general.cancel;
count_actions++;
switch (z->general.action) {
default:
@ -789,14 +790,14 @@ void call_macro_ex(int side, int flags, int runatside) {
enter_shop(z->text.textindex);
break;
case MA_CLOCK:
cancel_enabled = decode_lock(z->clock.znak, z->clock.string,
cancel = decode_lock(z->clock.znak, z->clock.string,
z->clock.codenum);
break;
case MA_CACTN:
cancel_action(z->cactn.sector, z->cactn.dir);
break;
case MA_LOCK:
cancel_enabled = if_lock(side, z->lock.key_id,
cancel = if_lock(side, z->lock.key_id,
z->lock.thieflevel, &z->lock);
break;
case MA_SWAPS:
@ -879,7 +880,7 @@ void call_macro_ex(int side, int flags, int runatside) {
if (jmp_to != -1) {
mrec = go_macro(runatside, jmp_to);
program_counter = jmp_to;
} else if (z->general.cancel && cancel_enabled) {
} else if (cancel) {
break;
} else {
program_counter++;

View file

@ -145,7 +145,7 @@ void new_setup()
int i;
static int textxp[]={ 75, 75,435,435,434,535,535,535,434,434,434,434,434, 35,410,510};
static int textyp[]={275,305, 65, 95,125, 65, 95,125,185,215,245,275,305,235, 40, 40};
static int textc[]={ 53, 54, 56, 57, 58, 56, 57, 58,140,141,142,143,144 ,51, 55, 59};
static int textc[]={ 53, 99, 56, 57, 58, 56, 57, 58,140,141,142,143,144 ,51, 55, 59};
mix_back_sound(256000-16384);
memset(&ctl,0,sizeof(ctl));

View file

@ -802,7 +802,10 @@ void cti_texty(void)
exit(1);
}
lang_patch_stringtable(&texty, "ui.csv", "");
//patch stringtable
if (!texty[98]) str_replace(&texty,98,"Ulo\x91it hru jako");
if (!texty[99]) str_replace(&texty,99,"CRT Filter (>720p)");
lang_patch_stringtable(&texty, "ui.csv", "");
}