CHEWY: Remove the unused mode parameter of flic_cut()

It is always set to CFO_MODE
This commit is contained in:
Filippos Karapetis 2022-02-19 04:33:07 +02:00 committed by Paul Gilbert
parent 70b1e80bd1
commit 25ad52094d
50 changed files with 122 additions and 136 deletions

View File

@ -415,10 +415,6 @@ enum SetupScreenMode {
#define ATS_ACTION_VOR 0
#define ATS_ACTION_NACH 1
#define CFO_MODE 0
#define FLC_MODE 1
#define ASF_MODE 2
#define FCUT_001 0 // Chewy escapes the prison cell
#define FCUT_002 1 // Burger
#define FCUT_003 2 // Chewy mocks an alien and he trips on a rope
@ -579,7 +575,7 @@ enum SetupScreenMode {
#define FCUT_157 157 // Red space ship travelling inside black hole (custom callback: flic_user_function)
#define FCUT_158 158 // Howard and Chewy waking up
#define FCUT_159 159 // Credits
//#define FCUT_155 160 // Intro logos (English)
#define FCUT_160 160 // Intro logos (English)
#define AUSGANG_LINKS 1
#define AUSGANG_RECHTS 2

View File

@ -167,7 +167,7 @@ void Cinema::execute() {
print_rows(546 + topIndex);
_G(flc)->set_custom_user_function(cut_serv);
flic_cut(CINEMA_FLICS[topIndex + selected], CFO_MODE);
flic_cut(CINEMA_FLICS[topIndex + selected]);
_G(flc)->remove_custom_user_function();
_G(out)->set_fontadr(_G(font6x8));
_G(out)->set_vorschub(_G(fvorx6x8), _G(fvory6x8));

View File

@ -45,7 +45,9 @@ void MainMenu::execute() {
if (!_G(modul))
_G(sndPlayer)->playMod((TmfHeader *)_G(Ci).MusicSlot);
flic_cut(200, 0);
// NOTE: Originally, this was set to play video 200, but this actually
// jumped to the very last video in the file, so we play it explicitly
flic_cut(FCUT_160);
_G(sndPlayer)->stopMod();
}
@ -95,7 +97,7 @@ void MainMenu::execute() {
_G(fx)->border(_G(workpage), 100, 0, 0);
_G(out)->set_pointer(_G(workptr));
_G(flags).NoPalAfterFlc = true;
flic_cut(135, CFO_MODE);
flic_cut(135);
break;
case MM_LOAD_GAME:
@ -121,7 +123,7 @@ void MainMenu::execute() {
_G(fx)->border(_G(workpage), 100, 0, 0);
_G(flags).NoPalAfterFlc = true;
_G(flc)->set_custom_user_function(creditsFn);
flic_cut(159, CFO_MODE);
flic_cut(159);
_G(flc)->remove_custom_user_function();
_G(fx)->border(_G(workpage), 100, 0, 0);
Dialogs::Credits::execute();

View File

@ -451,7 +451,7 @@ void enter_room(int16 eib_nr);
void exit_room(int16 eib_nr);
void flic_cut(int16 nr, int16 mode);
void flic_cut(int16 nr);
void print_rows(int16 id);

View File

@ -409,7 +409,7 @@ void show_intro() {
if (!ConfMan.getBool("shown_intro")) {
ConfMan.setBool("shown_intro", true);
_G(flags).NoPalAfterFlc = true;
flic_cut(135, CFO_MODE);
flic_cut(135);
}
}

View File

@ -904,7 +904,7 @@ static void flic_proc1() {
_G(out)->cls();
}
void flic_cut(int16 nr, int16 mode) {
void flic_cut(int16 nr) {
static const int16 FLIC_CUT_133[] = {
133, 123, 125, 126, 124, 128, 129, 130, 131,
132, 133, 127, 158
@ -1603,22 +1603,10 @@ void flic_cut(int16 nr, int16 mode) {
#ifndef NEW_VIDEO_CODE
_G(mem)->file->select_pool_item(_G(Ci).Handle,
(nr < 1000) ? nr : nr - 1000);
switch (mode) {
case 0:
_G(flc)->custom_play(&_G(Ci));
break;
case 1:
_G(flc)->play(_G(Ci).Handle, _G(Ci).VirtScreen, _G(Ci).TempArea);
break;
default:
break;
}
_G(flc)->custom_play(&_G(Ci));
#else
g_engine->playVideo(nr < 1000 ? nr : nr - 1000);
#endif
break;
}

View File

@ -745,7 +745,7 @@ void Room0::feederAni() {
auto_move(VERSTECK_POS, P_CHEWY);
set_up_screen(DO_SETUP);
_G(out)->cls();
flic_cut(FCUT_001, CFO_MODE);
flic_cut(FCUT_001);
register_cutscene(1);

View File

@ -106,7 +106,7 @@ void Room7::klingel() {
_G(det)->start_detail(0, 255, ANI_VOR);
start_detail_wait(13, 1, ANI_VOR);
flic_cut(FCUT_002, CFO_MODE);
flic_cut(FCUT_002);
_G(det)->stop_detail(0);
_G(spieler).scrollx = 0;
_G(spieler).scrolly = 0;
@ -157,7 +157,7 @@ void Room7::klingel() {
_G(obj)->hide_sib(SIB_KLINGEL_R7);
_G(flags).NoPalAfterFlc = false;
register_cutscene(2);
flic_cut(FCUT_003, CFO_MODE);
flic_cut(FCUT_003);
set_person_pos(201, 117, P_CHEWY, P_LEFT);
_G(spieler).scrollx = 0;
_G(spieler).scrolly = 0;

View File

@ -36,7 +36,7 @@ void Room10::entry() {
_G(fx)->blende1(_G(workptr), _G(screen0), _G(pal), 150, 0, 0);
_G(spieler).R10Surimy = true;
_G(fx_blend) = BLEND_NONE;
flic_cut(FCUT_004, CFO_MODE);
flic_cut(FCUT_004);
set_person_pos(0, 130, P_CHEWY, P_RIGHT);
auto_move(2, P_CHEWY);
hide_cur();
@ -54,7 +54,7 @@ void Room10::get_surimy() {
auto_move(4, P_CHEWY);
start_aad(104, 0);
_G(flc)->set_custom_user_function(cut_serv);
flic_cut(FCUT_006, CFO_MODE);
flic_cut(FCUT_006);
_G(flc)->remove_custom_user_function();
_G(spieler).R10SurimyOk = true;
_G(room)->set_timer_status(3, TIMER_STOP);

View File

@ -149,7 +149,7 @@ int16 Room11::scanner() {
_G(flc)->set_custom_user_function(cut_serv_2);
start_aad(105, 0);
flic_cut(FCUT_011, CFO_MODE);
flic_cut(FCUT_011);
register_cutscene(4);
_G(flc)->remove_custom_user_function();
_G(spieler).R11TerminalOk = true;
@ -163,7 +163,7 @@ int16 Room11::scanner() {
if (!_G(spieler).R11TerminalOk) {
actionFl = true;
_G(flc)->set_custom_user_function(cut_serv);
flic_cut(FCUT_010, CFO_MODE);
flic_cut(FCUT_010);
_G(flc)->remove_custom_user_function();
start_aad_wait(20, -1);
} else {

View File

@ -76,7 +76,7 @@ void Room12::entry() {
_G(flags).NoScroll = true;
auto_scroll(60, 0);
flic_cut(FCUT_016, CFO_MODE);
flic_cut(FCUT_016);
_G(flags).NoScroll = false;
for (int16 i = 7; i < 10; i++)
@ -203,7 +203,7 @@ int16 Room12::use_terminal() {
start_aad_wait(112, -1);
_G(flags).NoScroll = true;
auto_scroll(46, 0);
flic_cut(FCUT_017, CFO_MODE);
flic_cut(FCUT_017);
register_cutscene(5);
load_chewy_taf(CHEWY_BORK);

View File

@ -47,7 +47,7 @@ static const MovLine R13_BORK_MPKT[3] = {
void Room13::entry() {
if (!_G(spieler).R12ChewyBork && !_G(spieler).R13BorkOk) {
_G(out)->cls();
flic_cut(FCUT_013, CFO_MODE);
flic_cut(FCUT_013);
set_person_pos(106, 65, P_CHEWY, P_RIGHT);
switch_room(11);
start_spz(CH_TALK12, 255, false, P_CHEWY);
@ -128,7 +128,7 @@ void Room13::talk_bork() {
start_spz(68, 255, false, P_CHEWY);
start_aad_wait(248, -1);
flic_cut(FCUT_014, CFO_MODE);
flic_cut(FCUT_014);
load_chewy_taf(CHEWY_NORMAL);
_G(auto_obj) = 0;
_G(flags).NoScroll = false;
@ -172,7 +172,7 @@ void Room13::jmp_band() {
start_aad_wait(117, -1);
_G(flags).NoScroll = true;
auto_scroll(76, 0);
flic_cut(FCUT_015, CFO_MODE);
flic_cut(FCUT_015);
_G(flags).NoScroll = false;
set_person_pos(195, 226, P_CHEWY, P_LEFT);
@ -184,7 +184,7 @@ void Room13::jmp_band() {
_G(obj)->hide_sib(SIB_BANDKNOPF_R13);
switch_room(14);
flic_cut(FCUT_018, CFO_MODE);
flic_cut(FCUT_018);
register_cutscene(6);
_G(spieler).scrollx = 92;
_G(spieler).scrolly = 120;

View File

@ -89,7 +89,7 @@ int16 Room22::chewy_amboss() {
_G(spieler).PersonHide[P_CHEWY] = false;
auto_move(2, P_CHEWY);
_G(flags).NoPalAfterFlc = false;
flic_cut(FCUT_007, CFO_MODE);
flic_cut(FCUT_007);
_G(spieler).R22ChewyPlatt = true;
_G(atds)->set_ats_str(79, 1, ATS_DATEI);
_G(flags).AutoAniPlay = false;
@ -151,7 +151,7 @@ void Room22::bork_walk2() {
init_auto_obj(BORK_OBJ, &BORK_PHASEN[0][0], _G(mov_phasen)[BORK_OBJ].Lines, (const MovLine *)BORK_MPKT2);
wait_auto_obj(BORK_OBJ);
flic_cut(FCUT_009, CFO_MODE);
flic_cut(FCUT_009);
register_cutscene(3);
_G(det)->show_static_spr(4);
_G(atds)->del_steuer_bit(81, ATS_AKTIV_BIT, ATS_DATEI);
@ -185,7 +185,7 @@ int16 Room22::malen() {
action_flag = true;
_G(flags).AutoAniPlay = true;
auto_move(8, P_CHEWY);
flic_cut(FCUT_008, CFO_MODE);
flic_cut(FCUT_008);
_G(atds)->set_ats_str(82, TXT_MARK_LOOK, 1, ATS_DATEI);
_G(spieler).R22Paint = true;
_G(obj)->calc_rsi_flip_flop(SIB_PAINT_R22);

View File

@ -88,7 +88,7 @@ int16 Room23::start_gleiter() {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(FCUT_012, CFO_MODE);
flic_cut(FCUT_012);
register_cutscene(7);
_G(out)->cls();
_G(spieler).R23GleiterExit = 16;
@ -106,7 +106,7 @@ int16 Room23::start_gleiter() {
} else if (_G(spieler).R23GleiterExit == 16) {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
flic_cut(FCUT_019_01, CFO_MODE);
flic_cut(FCUT_019_01);
_G(spieler).R23GleiterExit = 25;
register_cutscene(9);

View File

@ -72,7 +72,7 @@ void Room25::entry() {
_G(spieler).R25FirstEntry = true;
_G(spieler).PersonHide[P_CHEWY] = true;
flic_cut(FCUT_029, CFO_MODE);
flic_cut(FCUT_029);
g_engine->_sound->playSound(0, 0);
_G(fx_blend) = BLEND_NONE;
set_person_pos(219, 141, P_CHEWY, P_RIGHT);
@ -102,7 +102,7 @@ int16 Room25::gleiter_loesch() {
action_flag = true;
_G(spieler).R25GleiteLoesch = true;
auto_move(2, P_CHEWY);
flic_cut(FCUT_030, CFO_MODE);
flic_cut(FCUT_030);
_G(obj)->calc_rsi_flip_flop(SIB_SCHLAUCH_R25);
_G(atds)->set_ats_str(219, 1, ATS_DATEI);
_G(atds)->set_ats_str(187, 1, ATS_DATEI);

View File

@ -77,7 +77,7 @@ void Room28::entry(int16 eib_nr) {
auto_scroll(0, 0);
_G(flc)->set_flic_user_function(cut_serv1);
flic_cut(FCUT_064, CFO_MODE);
flic_cut(FCUT_064);
_G(flc)->remove_flic_user_function();
_G(det)->show_static_spr(6);
@ -107,7 +107,7 @@ void Room28::entry(int16 eib_nr) {
_G(spieler).R28PostCar = false;
_G(out)->set_pointer(nullptr);
_G(out)->cls();
flic_cut(FCUT_063, CFO_MODE);
flic_cut(FCUT_063);
_G(spieler).R28ChewyPump = false;
invent_2_slot(K_MASKE_INV);
_G(atds)->set_ats_str(209, 0, ATS_DATEI);
@ -219,10 +219,10 @@ void Room28::use_surimy() {
_G(spieler).R28SurimyCar = true;
start_spz_wait(CH_LGET_U, 1, false, P_CHEWY);
_G(flc)->set_flic_user_function(cut_serv2);
flic_cut(FCUT_055, CFO_MODE);
flic_cut(FCUT_055);
_G(flc)->remove_flic_user_function();
_G(flc)->set_flic_user_function(cut_serv1);
flic_cut(FCUT_056, CFO_MODE);
flic_cut(FCUT_056);
_G(flc)->remove_flic_user_function();
ani_nr = CH_TALK3;
dia_nr = 140;

View File

@ -181,7 +181,7 @@ int16 Room31::use_topf() {
} else {
close_luke_proc3();
auto_move(3, P_CHEWY);
flic_cut(FCUT_046, CFO_MODE);
flic_cut(FCUT_046);
register_cutscene(13);
_G(spieler).R31SurFurz = true;
ani_nr = CH_TALK6;

View File

@ -46,7 +46,7 @@ int16 Room32::use_howard() {
cur_2_inventory();
remove_inventory(MUNTER_INV);
register_cutscene(11);
flic_cut(FCUT_043, CFO_MODE);
flic_cut(FCUT_043);
_G(atds)->set_steuer_bit(230, ATS_AKTIV_BIT, ATS_DATEI);
start_spz(CH_TALK12, 255, ANI_VOR, P_CHEWY);
start_aad_wait(75, -1);
@ -107,7 +107,7 @@ void Room32::use_schreibmaschine() {
auto_move(3, P_CHEWY);
_G(spieler).R32UseSchreib = true;
cur_2_inventory();
flic_cut(FCUT_044, CFO_MODE);
flic_cut(FCUT_044);
register_cutscene(12);
_G(det)->show_static_spr(5);
_G(atds)->set_ats_str(203, 1, ATS_DATEI);

View File

@ -163,7 +163,7 @@ void Room33::use_maschine() {
if (_G(spieler).R33MunterOk) {
_G(spieler).PersonHide[P_CHEWY] = true;
start_detail_wait(2, 1, ANI_VOR);
flic_cut(FCUT_031, CFO_MODE);
flic_cut(FCUT_031);
_G(spieler).PersonHide[P_CHEWY] = false;
start_spz(CH_TALK3, 255, ANI_VOR, P_CHEWY);
start_aad_wait(71, -1);

View File

@ -81,7 +81,7 @@ int16 Room35::use_cat() {
auto_move(4, P_CHEWY);
_G(spieler).R35TransCat = true;
start_spz_wait(CH_TRANS, 1, false, P_CHEWY);
flic_cut(FCUT_045, CFO_MODE);
flic_cut(FCUT_045);
start_spz(CH_TRANS, 1, ANI_VOR, P_CHEWY);
start_aad_wait(94, -1);
} else if (is_cur_inventar(PUTENKEULE_INV)) {

View File

@ -114,7 +114,7 @@ short Room37::use_wippe() {
start_aad_wait(159, -1);
del_inventar(_G(spieler).AkInvent);
_G(flc)->set_flic_user_function(cut_serv1);
flic_cut(FCUT_047, CFO_MODE);
flic_cut(FCUT_047);
_G(flc)->remove_flic_user_function();
_G(flags).NoScroll = false;
show_cur();
@ -180,9 +180,9 @@ int16 Room37::use_glas() {
start_aad_wait(147, -1);
del_inventar(_G(spieler).AkInvent);
_G(flc)->set_flic_user_function(cut_serv2);
flic_cut(FCUT_048, CFO_MODE);
flic_cut(FCUT_048);
_G(flc)->remove_flic_user_function();
flic_cut(FCUT_049, CFO_MODE);
flic_cut(FCUT_049);
invent_2_slot(GEBISS_INV);
_G(det)->hide_static_spr(9);
_G(atds)->set_ats_str(250, 1, ATS_DATEI);
@ -226,7 +226,7 @@ void Room37::dog_bell() {
start_detail_wait(6, 1, ANI_VOR);
_G(spieler).PersonHide[P_CHEWY] = true;
_G(det)->start_detail(11, 255, ANI_VOR);
flic_cut(FCUT_050, CFO_MODE);
flic_cut(FCUT_050);
start_detail_wait(6, 1, ANI_RUECK);
_G(det)->stop_detail(11);
set_person_pos(326, 85, P_CHEWY, P_LEFT);
@ -249,9 +249,9 @@ void Room37::dog_bell() {
_G(det)->del_static_ani(3);
_G(det)->stop_detail(3);
start_detail_wait(4, 1, ANI_VOR);
flic_cut(FCUT_051, CFO_MODE);
flic_cut(FCUT_051);
_G(spieler).scrollx = 104;
flic_cut(FCUT_054, CFO_MODE);
flic_cut(FCUT_054);
register_cutscene(10);
_G(det)->show_static_spr(0);
@ -293,7 +293,7 @@ void Room37::use_hahn() {
auto_move(7, P_CHEWY);
_G(spieler).R37TransHahn = true;
start_spz_wait(CH_TRANS, 1, false, P_CHEWY);
flic_cut(FCUT_052, CFO_MODE);
flic_cut(FCUT_052);
cur_2_inventory();
_G(menu_item) = CUR_TALK;
cursor_wahl(_G(menu_item));
@ -324,7 +324,7 @@ void Room37::use_hahn() {
_G(det)->hide_static_spr(0);
_G(det)->start_detail(10, 10, ANI_VOR);
auto_move(8, P_CHEWY);
flic_cut(FCUT_053, CFO_MODE);
flic_cut(FCUT_053);
_G(det)->stop_detail(10);
_G(spieler).scrollx = 320;

View File

@ -184,14 +184,14 @@ int16 Room39::use_tv() {
_G(flags).NoPalAfterFlc = true;
_G(out)->set_pointer(nullptr);
_G(out)->cls();
flic_cut(FCUT_042, CFO_MODE);
flic_cut(FCUT_042);
++_G(spieler).R39TvKanal;
_G(flags).NoPalAfterFlc = true;
if (_G(spieler).R39TvKanal == 2)
flic_cut(FCUT_036, CFO_MODE);
flic_cut(FCUT_036);
else if (_G(spieler).R39TvKanal == 5)
flic_cut(FCUT_033, CFO_MODE);
flic_cut(FCUT_033);
look_tv(false);
set_tv();
@ -219,14 +219,14 @@ int16 Room39::use_tv() {
start_spz_wait(CH_TRANS, 1, false, P_CHEWY);
_G(spieler).R39TransMensch = true;
_G(flags).NoPalAfterFlc = true;
flic_cut(FCUT_041, CFO_MODE);
flic_cut(FCUT_041);
_G(spieler).R39TvKanal = 0;
_G(spieler).R39ClintNews = 0;
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(out)->set_palette(_G(pal));
_G(flags).NoPalAfterFlc = true;
flic_cut(TV_FLIC[0], CFO_MODE);
flic_cut(TV_FLIC[0]);
_G(out)->cls();
_G(out)->set_pointer(nullptr);
@ -321,7 +321,7 @@ void Room39::look_tv(bool cls_mode) {
}
_G(flc)->set_custom_user_function(setup_func);
flic_cut(flic_nr, CFO_MODE);
flic_cut(flic_nr);
_G(flc)->remove_custom_user_function();
if (cls_mode) {

View File

@ -127,7 +127,7 @@ void Room40::xit(int16 eib_nr) {
register_cutscene(15);
_G(flags).NoPalAfterFlc = true;
flic_cut(FCUT_073, CFO_MODE);
flic_cut(FCUT_073);
if (_G(spieler).ChewyAni != CHEWY_ROCKER)
_G(spieler).PersonGlobalDia[1] = 10023;
@ -553,7 +553,7 @@ void Room40::bmeister_dia(int16 aad_nr) {
if (aad_nr == 237) {
start_aad_wait(aad_nr, -1);
_G(flags).NoPalAfterFlc = true;
flic_cut(FCUT_062, CFO_MODE);
flic_cut(FCUT_062);
_G(fx_blend) = BLEND3;
start_aad_wait(375, -1);
} else {

View File

@ -196,7 +196,7 @@ int16 Room41::use_lola() {
_G(spieler).R41LolaOk = true;
auto_move(4, P_CHEWY);
g_engine->_sound->stopSound(0);
flic_cut(FCUT_057, CFO_MODE);
flic_cut(FCUT_057);
set_person_pos(127, 112, P_CHEWY, P_LEFT);
_G(det)->stop_detail(6);

View File

@ -56,7 +56,7 @@ void Room43::night_small() {
_G(spieler).scrollx = 194;
start_aad_wait(191, -1);
flic_cut(FCUT_058, CFO_MODE);
flic_cut(FCUT_058);
g_engine->_sound->stopSound(0);
_G(flags).NoScroll = false;
_G(spieler).ScrollxStep = 1;
@ -80,7 +80,7 @@ void Room43::catch_pg() {
auto_scroll(194, 0);
start_aad_wait(235, -1);
_G(spieler).R43GetPgLady = true;
flic_cut(FCUT_058, CFO_MODE);
flic_cut(FCUT_058);
g_engine->_sound->stopSound(0);
register_cutscene(14);

View File

@ -89,7 +89,7 @@ void Room45::xit(int16 eib_nr) {
if (eib_nr == 87) {
_G(flags).NoPalAfterFlc = true;
flic_cut(FCUT_073, CFO_MODE);
flic_cut(FCUT_073);
}
}

View File

@ -130,7 +130,7 @@ void Room46::bodo() {
_G(det)->show_static_spr(3);
_G(spieler).PersonHide[P_CHEWY] = true;
start_detail_wait(1, 1, ANI_VOR);
flic_cut(FCUT_065, CFO_MODE);
flic_cut(FCUT_065);
_G(out)->set_pointer(nullptr);
_G(out)->cls();
register_cutscene(16);

View File

@ -182,7 +182,7 @@ void Room49::use_boy_cigar() {
_G(flags).NoScroll = true;
auto_scroll(164, 0);
flic_cut(67, CFO_MODE);
flic_cut(67);
register_cutscene(17);
_G(room)->set_timer_status(255, TIMER_STOP);

View File

@ -49,7 +49,7 @@ void Room50::entry(int16 eib_nr) {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(108, 0);
flic_cut(108);
show_cur();
switch_room(51);

View File

@ -172,7 +172,7 @@ void Room51::setup_func() {
_G(flags).NoPalAfterFlc = true;
_G(out)->set_pointer(nullptr);
_G(out)->cls();
flic_cut(115, 0);
flic_cut(115);
register_cutscene(28);
switch_room(91);
@ -262,7 +262,7 @@ int16 Room51::use_door(int16 txt_nr) {
_G(flags).NoPalAfterFlc = true;
_G(flc)->set_flic_user_function(cut_serv);
_G(det)->show_static_spr(16);
flic_cut(FCUT_068, CFO_MODE);
flic_cut(FCUT_068);
_G(flc)->remove_flic_user_function();
_G(det)->hide_static_spr(16);
@ -287,7 +287,7 @@ int16 Room51::use_door(int16 txt_nr) {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(114, 0);
flic_cut(114);
set_person_pos(115, 144, P_CHEWY, P_LEFT);
_G(fx_blend) = BLEND3;
set_up_screen(NO_SETUP);

View File

@ -241,7 +241,7 @@ int16 Room54::use_zelle() {
auto_scroll(176, 0);
go_auto_xy(239, 101, P_HOWARD, ANI_WAIT);
_G(flc)->set_flic_user_function(cut_serv);
flic_cut(FCUT_069, CFO_MODE);
flic_cut(FCUT_069);
_G(flc)->remove_flic_user_function();
del_inventar(_G(spieler).AkInvent);

View File

@ -212,7 +212,7 @@ int16 Room55::use_telefon() {
_G(det)->hide_static_spr(0);
_G(det)->hide_static_spr(8);
_G(atds)->set_ats_str(354, 1, ATS_DATEI);
flic_cut(FCUT_071, CFO_MODE);
flic_cut(FCUT_071);
_G(spieler).PersonRoomNr[P_HOWARD] = 55;
set_person_pos(178, 75, P_CHEWY, P_LEFT);
@ -238,7 +238,7 @@ int16 Room55::use_telefon() {
SHOULD_QUIT_RETURN0;
}
flic_cut(FCUT_072, CFO_MODE);
flic_cut(FCUT_072);
register_cutscene(19);
_G(flags).NoScroll = false;
@ -368,7 +368,7 @@ int16 Room55::use_kammeraus() {
start_detail_wait(5, 1, ANI_VOR);
_G(det)->show_static_spr(10);
_G(flc)->set_flic_user_function(cut_serv);
flic_cut(FCUT_070, CFO_MODE);
flic_cut(FCUT_070);
register_cutscene(18);
_G(flc)->remove_flic_user_function();

View File

@ -65,7 +65,7 @@ void Room56::entry() {
set_up_screen(DO_SETUP);
if (!_G(spieler).R56GetTabak) {
flic_cut(FCUT_074, CFO_MODE);
flic_cut(FCUT_074);
_G(det)->show_static_spr(2);
}
@ -101,7 +101,7 @@ void Room56::entry() {
hide_cur();
start_aad_wait(306, -1);
show_cur();
flic_cut(FCUT_076, CFO_MODE);
flic_cut(FCUT_076);
esi = 1;
cur_2_inventory();
remove_inventory(56);
@ -122,7 +122,7 @@ void Room56::entry() {
if (_G(spieler).flags33_80) {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
flic_cut(113, CFO_MODE);
flic_cut(113);
_G(spieler).PersonRoomNr[P_HOWARD] = 89;
load_chewy_taf(CHEWY_NORMAL);
_G(spieler).mi[P_HOWARD] = 0;
@ -163,7 +163,7 @@ void Room56::entry() {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(116, CFO_MODE);
flic_cut(116);
register_cutscene(21);
_G(out)->set_pointer(nullptr);
_G(out)->cls();
@ -174,7 +174,7 @@ void Room56::entry() {
case 2:
_G(out)->set_pointer(nullptr);
_G(out)->cls();
flic_cut(110, CFO_MODE);
flic_cut(110);
_G(spieler).flags34_20 = true;
_G(spieler).PersonRoomNr[P_HOWARD] = 90;
switch_room(90);
@ -299,7 +299,7 @@ int16 Room56::use_kneipe() {
_G(flags).NoScroll = true;
auto_scroll(0, 0);
start_detail_wait(12, 3, ANI_VOR);
flic_cut(75, CFO_MODE);
flic_cut(75);
g_engine->_sound->stopSound(0);
g_engine->_sound->playSound(9);
_G(det)->start_detail(10, 6, ANI_VOR);
@ -330,7 +330,7 @@ int16 Room56::use_kneipe() {
if (_G(spieler).flags34_10) {
_G(spieler).flags33_80 = true;
auto_move(4, P_CHEWY);
flic_cut(111, CFO_MODE);
flic_cut(111);
_G(fx_blend) = BLEND3;
start_aad_wait(522, -1);
start_spz_wait(66, 1, false, P_CHEWY);
@ -354,7 +354,7 @@ int16 Room56::use_kneipe() {
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
_G(flc)->set_custom_user_function(proc1);
flic_cut(112, CFO_MODE);
flic_cut(112);
_G(flc)->remove_custom_user_function();
register_cutscene(31);

View File

@ -110,7 +110,7 @@ int16 Room62::use_laura() {
_G(det)->start_detail(6, 255, ANI_VOR);
start_aad_wait(399, -1);
_G(spieler).PersonHide[P_CHEWY] = false;
flic_cut(FCUT_077, CFO_MODE);
flic_cut(FCUT_077);
show_cur();
_G(spieler).R64Moni1Ani = 0;
_G(spieler).R64Moni2Ani = 0;

View File

@ -133,8 +133,8 @@ void Room63::bork_platt() {
_G(spieler).R62LauraVerwandlung = false;
_G(r63Schalter) = false;
_G(spieler).room_e_obj[95].Attribut = AUSGANG_OBEN;
flic_cut(FCUT_081, CFO_MODE);
flic_cut(FCUT_082, CFO_MODE);
flic_cut(FCUT_081);
flic_cut(FCUT_082);
_G(spieler).PersonHide[P_CHEWY] = false;
check_shad(4, 1);
_G(spieler_mi)[P_CHEWY].Mode = true;
@ -146,7 +146,7 @@ void Room63::bork_platt() {
start_aad_wait(361, -1);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(FCUT_079, CFO_MODE);
flic_cut(FCUT_079);
_G(fx_blend) = BLEND3;
show_cur();
_G(flags).MainInput = true;
@ -310,7 +310,7 @@ int16 Room63::use_aschenbecher() {
_G(det)->hide_static_spr(10);
_G(det)->hide_static_spr(12);
start_aad_wait(368, -1);
flic_cut(FCUT_080, CFO_MODE);
flic_cut(FCUT_080);
_G(atds)->set_steuer_bit(381, ATS_AKTIV_BIT, ATS_DATEI);
_G(atds)->set_steuer_bit(382, ATS_AKTIV_BIT, ATS_DATEI);
_G(atds)->set_ats_str(383, 1, ATS_DATEI);

View File

@ -42,7 +42,7 @@ void Room64::entry() {
chewy_entry();
if (_G(spieler).R63Feuer) {
_G(flc)->set_flic_user_function(cut_sev);
flic_cut(FCUT_078, CFO_MODE);
flic_cut(FCUT_078);
_G(flc)->remove_flic_user_function();
_G(spieler).R64ManWeg = true;
_G(det)->del_static_ani(1);

View File

@ -319,7 +319,7 @@ int16 Room68::use_diva() {
_G(det)->hide_static_spr(3);
_G(spieler).R68DivaWeg = true;
start_ani_block(2, ABLOCK38);
flic_cut(FCUT_083, CFO_MODE);
flic_cut(FCUT_083);
_G(det)->del_static_ani(18);
register_cutscene(22);
_G(det)->del_static_ani(18);

View File

@ -89,7 +89,7 @@ void Room72::proc1(int16 flicNr) {
_G(spieler).flags28_10 = true;
wait_show_screen(7);
start_aad_wait(437, -1);
flic_cut(flicNr, CFO_MODE);
flic_cut(flicNr);
_G(spieler).PersonRoomNr[P_HOWARD] = 76;
_G(spieler).PersonRoomNr[P_NICHELLE] = 76;
_G(spieler).PersonHide[P_CHEWY] = true;

View File

@ -59,7 +59,7 @@ void Room78::entry() {
set_up_screen(DO_SETUP);
}
_G(flags).NoPalAfterFlc = true;
flic_cut(101, CFO_MODE);
flic_cut(101);
destRoom = 79;
} else {
_G(det)->start_detail(0, 255, false);
@ -98,7 +98,7 @@ void Room78::entry() {
if (flag1 == 0) {
_G(det)->start_detail(5, 1, false);
} else {
start_detail_wait(5, 1, CFO_MODE);
start_detail_wait(5, 1, ANI_VOR);
}
} else {
if (det4DestX <= 0)

View File

@ -84,18 +84,18 @@ void Room85::entry(int16 eib_nr) {
_G(det)->show_static_spr(5);
_G(det)->show_static_spr(6);
start_aad_wait(474, -1);
flic_cut(90, CFO_MODE);
flic_cut(90);
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(91, CFO_MODE);
flic_cut(91);
_G(det)->hide_static_spr(6);
_G(spieler).scrollx = 25;
_G(fx_blend) = BLEND3;
start_aad_wait(475, -1);
start_aad(476, -1);
_G(flc)->set_custom_user_function(Room87::proc5);
flic_cut(89, CFO_MODE);
flic_cut(89);
register_cutscene(25);
_G(flc)->remove_custom_user_function();

View File

@ -84,7 +84,7 @@ void Room86::entry(int16 eib_nr) {
_G(flags).NoScroll = true;
auto_scroll(246, 0);
proc3(false);
flic_cut(92, CFO_MODE);
flic_cut(92);
_G(flags).NoScroll = false;
auto_move(0, P_CHEWY);
_G(spieler).flags32_20 = true;

View File

@ -158,22 +158,22 @@ int Room87::proc4() {
hide_cur();
auto_move(1, P_CHEWY);
flic_cut(93, CFO_MODE);
flic_cut(93);
_G(flc)->set_custom_user_function(proc3);
flic_cut(94, CFO_MODE);
flic_cut(94);
_G(flc)->remove_custom_user_function();
_G(flc)->set_custom_user_function(proc5);
start_aad(472);
flic_cut(95, CFO_MODE);
flic_cut(95);
_G(flc)->remove_custom_user_function();
flic_cut(96, CFO_MODE);
flic_cut(96);
_G(det)->hide_static_spr(2);
_G(det)->start_detail(2, 255, false);
start_aad_wait(471, -1);
flic_cut(97, CFO_MODE);
flic_cut(98, CFO_MODE);
flic_cut(99, CFO_MODE);
flic_cut(100, CFO_MODE);
flic_cut(97);
flic_cut(98);
flic_cut(99);
flic_cut(100);
_G(spieler).PersonGlobalDia[P_HOWARD] = -1;
_G(spieler).PersonDiaRoom[P_HOWARD] = false;
_G(spieler).flags32_10 = true;

View File

@ -101,7 +101,7 @@ int Room88::proc3() {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(87, CFO_MODE);
flic_cut(87);
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(spieler).flags32_40 = true;
@ -123,7 +123,7 @@ int Room88::proc3() {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(88, CFO_MODE);
flic_cut(88);
_G(spieler).PersonHide[P_CHEWY] = true;
_G(spieler).flags32_1 = true;
_G(out)->raster_col(0, 0, 0, 0);
@ -133,7 +133,7 @@ int Room88::proc3() {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(86, CFO_MODE);
flic_cut(86);
register_cutscene(24);
_G(spieler).PersonHide[P_CHEWY] = false;

View File

@ -62,11 +62,11 @@ void Room89::entry() {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(103, CFO_MODE);
flic_cut(103);
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(118, CFO_MODE);
flic_cut(118);
_G(spieler).SVal1 = 89;
_G(spieler).SVal2 = 538;
switch_room(92);
@ -81,7 +81,7 @@ void Room89::entry() {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(117, CFO_MODE);
flic_cut(117);
register_cutscene(35);
_G(fx_blend) = BLEND3;
@ -89,7 +89,7 @@ void Room89::entry() {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(119, CFO_MODE);
flic_cut(119);
// Squash screen into a single point at the center
int edi = -20;
@ -180,7 +180,7 @@ int Room89::proc2() {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(102, CFO_MODE);
flic_cut(102);
register_cutscene(26);
_G(spieler).SVal1 = 89;

View File

@ -295,7 +295,7 @@ int Room90::shootControlUnit() {
start_detail_wait(13, 1, ANI_VOR);
_G(flc)->set_custom_user_function(Room90::proc5);
_G(flags).NoPalAfterFlc = true;
flic_cut(107, CFO_MODE);
flic_cut(107);
_G(flc)->remove_custom_user_function();
_G(spieler).scrollx = 0;
set_person_pos(76, 145, P_CHEWY, P_LEFT);
@ -334,7 +334,7 @@ int Room90::useSurimyOnWreck() {
_G(maus_links_click) = false;
_G(out)->set_pointer(nullptr);
_G(out)->cls();
flic_cut(109, CFO_MODE);
flic_cut(109);
register_cutscene(29);
_G(det)->hide_static_spr(4);

View File

@ -40,7 +40,7 @@ void Room92::entry() {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(103, CFO_MODE);
flic_cut(103);
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(spieler).scrollx = oldScrollX;
@ -49,20 +49,20 @@ void Room92::entry() {
break;
case 488:
_G(flags).StaticUseTxt = true;
flic_cut(106, CFO_MODE);
flic_cut(106);
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(105, CFO_MODE);
flic_cut(105);
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(104, CFO_MODE);
flic_cut(104);
register_cutscene(27);
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(103, CFO_MODE);
flic_cut(103);
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(spieler).PersonRoomNr[P_HOWARD] = 46;
@ -72,7 +72,7 @@ void Room92::entry() {
break;
case 538:
_G(flags).StaticUseTxt = true;
flic_cut(106, CFO_MODE);
flic_cut(106);
show_person();
_G(spieler).PersonRoomNr[P_HOWARD] = 94;
_G(spieler).flags35_8 = true;

View File

@ -55,7 +55,7 @@ void Room94::entry() {
set_person_pos(153, 122, P_HOWARD, P_RIGHT);
_G(out)->set_pointer(nullptr);
_G(out)->cls();
flic_cut(120, CFO_MODE);
flic_cut(120);
register_cutscene(30);
_G(fx_blend) = BLEND_NONE;
Room66::proc8(2, 3, 0, 539);
@ -74,7 +74,7 @@ void Room94::entry() {
_G(flags).NoScroll = true;
_G(out)->set_pointer(nullptr);
_G(out)->cls();
flic_cut(121, CFO_MODE);
flic_cut(121);
register_cutscene(32);
_G(fx_blend) = BLEND_NONE;
@ -136,7 +136,7 @@ int Room94::giveGhostBottle() {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(62, CFO_MODE);
flic_cut(62);
_G(fx_blend) = BLEND3;
_G(det)->start_detail(5, 255, false);
start_aad_wait(541, -1);

View File

@ -110,7 +110,7 @@ int Room95::proc2() {
_G(out)->set_pointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
flic_cut(133, CFO_MODE);
flic_cut(133);
register_cutscene(33);
_G(spieler).PersonRoomNr[P_HOWARD] = 97;
switch_room(97);

View File

@ -390,7 +390,7 @@ int Room97::proc5() {
SHOULD_QUIT_RETURN0;
}
flic_cut(122, CFO_MODE);
flic_cut(122);
register_cutscene(34);
g_engine->_sound->playSound(0, 0);

View File

@ -157,7 +157,7 @@ int16 ats_action(int16 txt_nr, int16 txt_mode, int16 mode) {
hide_cur();
auto_move(3, P_CHEWY);
_G(flc)->set_custom_user_function(Room6::cut_serv1);
flic_cut(FCUT_005, CFO_MODE);
flic_cut(FCUT_005);
_G(flc)->remove_custom_user_function();
start_spz(CH_TALK5, -1, false, P_CHEWY);
start_aad_wait(108, 0);