diff --git a/engines/chewy/global.h b/engines/chewy/global.h index 7b232f15463..1af98039793 100644 --- a/engines/chewy/global.h +++ b/engines/chewy/global.h @@ -483,8 +483,8 @@ void stop_auto_obj(int16 nr); void continue_auto_obj(int16 nr, int16 repeat); void new_auto_line(int16 nr); -void init_auto_obj(int16 auto_nr, int16 *phasen, int16 lines, - MovLine *pkt); +void init_auto_obj(int16 auto_nr, const int16 *phasen, int16 lines, + const MovLine *pkt); int16 mouse_auto_obj(int16 nr, int16 xoff, int16 yoff); diff --git a/engines/chewy/rooms/room12.cpp b/engines/chewy/rooms/room12.cpp index 4cc92559c1e..a2e0b47b787 100644 --- a/engines/chewy/rooms/room12.cpp +++ b/engines/chewy/rooms/room12.cpp @@ -31,14 +31,14 @@ namespace Rooms { #define R12_BORK_OBJ 0 -int16 r12_bork_phasen[4][2] = { +static const int16 R12_BORK_PHASEN[4][2] = { { 74, 79 }, { 80, 85 }, { 62, 67 }, { 68, 73 } }; -MovLine r12_bork_mpkt[5] = { +static const MovLine R12_BORK_MPKT[5] = { { { 207, 220, 199 }, 2, 6 }, { { 207, 145, 199 }, 2, 6 }, { { 30, 145, 199 }, 0, 6 }, @@ -46,12 +46,12 @@ MovLine r12_bork_mpkt[5] = { { { 207, 220, 199 }, 3, 6 } }; -MovLine r12_bork_mpkt1[2] = { +static const MovLine R12_BORK_MPKT1[2] = { { { 207, 220, 199 }, 0, 6 }, { { 170, 145, 199 }, 0, 6 } }; -MovLine r12_bork_mpkt2[3] = { +static const MovLine R12_BORK_MPKT2[3] = { { { 170, 145, 199 }, 1, 8 }, { { 180, 145, 120 }, 1, 8 }, { { 300, 80, 120 }, 1, 8 } @@ -100,8 +100,8 @@ void Room12::init_bork() { auto_mov_obj[R12_BORK_OBJ].Id = AUTO_OBJ0; auto_mov_vector[R12_BORK_OBJ].Delay = _G(spieler).DelaySpeed; auto_mov_obj[R12_BORK_OBJ].Mode = 1; - init_auto_obj(R12_BORK_OBJ, &r12_bork_phasen[0][0], mov_phasen[R12_BORK_OBJ].Lines, (MovLine - *)r12_bork_mpkt); + init_auto_obj(R12_BORK_OBJ, &R12_BORK_PHASEN[0][0], mov_phasen[R12_BORK_OBJ].Lines, + (const MovLine *)R12_BORK_MPKT); if (!_G(spieler).R12TalismanOk) { hide_cur(); auto_mov_vector[R12_BORK_OBJ].DelayCount = 1000; @@ -141,8 +141,8 @@ void Room12::bork_ok() { _G(spieler).R12BorkTalk = true; mov_phasen[R12_BORK_OBJ].Repeat = 1; mov_phasen[R12_BORK_OBJ].Lines = 2; - init_auto_obj(R12_BORK_OBJ, &r12_bork_phasen[0][0], mov_phasen[R12_BORK_OBJ].Lines, (MovLine - *)r12_bork_mpkt1); + init_auto_obj(R12_BORK_OBJ, &R12_BORK_PHASEN[0][0], mov_phasen[R12_BORK_OBJ].Lines, + (const MovLine *)R12_BORK_MPKT1); wait_auto_obj(R12_BORK_OBJ); _G(spieler).R12BorkInRohr = true; det->set_detail_pos(3, 170, 145); @@ -151,8 +151,8 @@ void Room12::bork_ok() { det->stop_detail(3); mov_phasen[R12_BORK_OBJ].Repeat = 1; mov_phasen[R12_BORK_OBJ].Lines = 3; - init_auto_obj(R12_BORK_OBJ, &r12_bork_phasen[0][0], mov_phasen[R12_BORK_OBJ].Lines, (MovLine - *)r12_bork_mpkt2); + init_auto_obj(R12_BORK_OBJ, &R12_BORK_PHASEN[0][0], mov_phasen[R12_BORK_OBJ].Lines, + (const MovLine *)R12_BORK_MPKT2); wait_auto_obj(R12_BORK_OBJ); det->hide_static_spr(10); start_detail_wait(4, 1, ANI_VOR); diff --git a/engines/chewy/rooms/room13.cpp b/engines/chewy/rooms/room13.cpp index 5d8854d8234..327f30f73c3 100644 --- a/engines/chewy/rooms/room13.cpp +++ b/engines/chewy/rooms/room13.cpp @@ -31,14 +31,14 @@ namespace Rooms { #define R13_BORK_OBJ 0 -int16 r13_bork_phasen[4][2] = { +static const int16 R13_BORK_PHASEN[4][2] = { { 92, 97 }, { 86, 91 }, { 86, 91 }, { 68, 73 } }; -MovLine r13_bork_mpkt[3] = { +static const MovLine R13_BORK_MPKT[3] = { { { 168, 140, 162 }, 0, 6 }, { { 50, 140, 162 }, 0, 6 }, { { 50, 107, 130 }, 2, 6 } @@ -99,7 +99,8 @@ void Room13::talk_bork() { auto_mov_obj[R13_BORK_OBJ].Id = AUTO_OBJ0; auto_mov_vector[R13_BORK_OBJ].Delay = _G(spieler).DelaySpeed; auto_mov_obj[R13_BORK_OBJ].Mode = 1; - init_auto_obj(R13_BORK_OBJ, &r13_bork_phasen[0][0], mov_phasen[R13_BORK_OBJ].Lines, (MovLine *)r13_bork_mpkt); + init_auto_obj(R13_BORK_OBJ, &R13_BORK_PHASEN[0][0], mov_phasen[R13_BORK_OBJ].Lines, + (const MovLine *)R13_BORK_MPKT); auto_move(9, P_CHEWY); wait_auto_obj(R13_BORK_OBJ); auto_move(11, P_CHEWY); diff --git a/engines/chewy/rooms/room17.cpp b/engines/chewy/rooms/room17.cpp index 686524dd226..a18175572b9 100644 --- a/engines/chewy/rooms/room17.cpp +++ b/engines/chewy/rooms/room17.cpp @@ -29,21 +29,22 @@ namespace Chewy { namespace Rooms { +#undef CHEWY_OBJ #define CHEWY_OBJ 0 -static int16 chewy_phasen[4][2] = { +static const int16 CHEWY_PHASEN[4][2] = { { 0, 0 }, { 0, 0 }, { 141, 144 }, { 177, 177 } }; -static MovLine chewy_mpkt[2] = { +static const MovLine CHEWY_MPKT[2] = { { { 241, 150, 0 }, 3, 8 }, { { 241, 350, 0 }, 3, 8 } }; -static MovLine chewy_mpkt1[2] = { +static const MovLine CHEWY_MPKT1[2] = { { { 243, 334, 0 }, 2, 6 }, { { 243, 150, 0 }, 2, 6 } }; @@ -135,8 +136,8 @@ void Room17::kletter_down() { room->set_zoom(32); _G(zoom_horizont) = 399; _G(auto_obj) = 1; - init_auto_obj(CHEWY_OBJ, &chewy_phasen[0][0], mov_phasen[CHEWY_OBJ].Lines, (MovLine - *)chewy_mpkt); + init_auto_obj(CHEWY_OBJ, &CHEWY_PHASEN[0][0], mov_phasen[CHEWY_OBJ].Lines, + (const MovLine *)CHEWY_MPKT); set_person_pos(242, 350, P_CHEWY, P_LEFT); } @@ -151,8 +152,8 @@ void Room17::kletter_up() { room->set_zoom(25); _G(zoom_horizont) = 0; _G(auto_obj) = 1; - init_auto_obj(CHEWY_OBJ, &chewy_phasen[0][0], mov_phasen[CHEWY_OBJ].Lines, (MovLine - *)chewy_mpkt1); + init_auto_obj(CHEWY_OBJ, &CHEWY_PHASEN[0][0], mov_phasen[CHEWY_OBJ].Lines, + (const MovLine *)CHEWY_MPKT1); set_person_pos(243, 146, P_CHEWY, P_LEFT); } diff --git a/engines/chewy/rooms/room18.cpp b/engines/chewy/rooms/room18.cpp index 7314fd02937..69db5c1b02c 100644 --- a/engines/chewy/rooms/room18.cpp +++ b/engines/chewy/rooms/room18.cpp @@ -29,32 +29,32 @@ namespace Chewy { namespace Rooms { -static int16 bork_spr[5] = { 15, 16, 17, 24, 25 }; -static int16 bork_spr1[4] = { 20, 21, 18, 19 }; +static const int16 BORK_SPR[5] = { 15, 16, 17, 24, 25 }; +static const int16 BORK_SPR1[4] = { 20, 21, 18, 19 }; -static int16 surimy_phasen[4][2] = { +static const int16 SURIMY_PHASEN[4][2] = { { 245, 252 }, { 0, 0 }, { 0, 0 }, { 0, 0 } }; -static MovLine surimy_mpkt[2] = { +static const MovLine SURIMY_MPKT[2] = { { { 453, 170, 190 }, 0, 6 }, { { 392, 170, 190 }, 0, 6 } }; -static MovLine surimy_mpkt1[2] = { +static const MovLine SURIMY_MPKT1[2] = { { { 392, 170, 190 }, 0, 6 }, { { 143, 170, 190 }, 0, 6 } }; -static MovLine surimy_mpkt2[2] = { +static const MovLine SURIMY_MPKT2[2] = { { { 143, 170, 190 }, 0, 6 }, { { 0, 170, 190 }, 0, 6 } }; -static MovLine surimy_mpkt3[2] = { +static const MovLine SURIMY_MPKT3[2] = { { { 500, 100, 190 }, 0, 12 }, { { 392, 170, 190 }, 0, 12 } }; @@ -71,9 +71,9 @@ void Room18::entry() { init_borks(); else { for (i = 0; i < 5; i++) - det->hide_static_spr(bork_spr[i]); + det->hide_static_spr(BORK_SPR[i]); for (i = 0; i < (4 - _G(spieler).R18Krone); i++) - det->show_static_spr(bork_spr1[i]); + det->show_static_spr(BORK_SPR1[i]); } if (_G(spieler).R16F5Exit) det->hide_static_spr(19); @@ -92,9 +92,9 @@ void Room18::entry() { void Room18::init_borks() { int16 i; for (i = 0; i < 5; i++) - det->show_static_spr(bork_spr[i]); + det->show_static_spr(BORK_SPR[i]); for (i = 0; i < 4; i++) - det->hide_static_spr(bork_spr1[i]); + det->hide_static_spr(BORK_SPR1[i]); _G(timer_nr)[0] = room->set_timer(255, 10); _G(timer_nr)[1] = room->set_timer(255, 15); _G(spieler).scrollx = 276; @@ -194,8 +194,8 @@ int16 Room18::calc_surimy() { if (spieler_vector[P_CHEWY].Xypos[1] < 150) { start_detail_frame(18, 1, ANI_VOR, 8); - init_auto_obj(SURIMY_OBJ, &surimy_phasen[0][0], mov_phasen[SURIMY_OBJ].Lines, (MovLine - *)surimy_mpkt3); + init_auto_obj(SURIMY_OBJ, &SURIMY_PHASEN[0][0], mov_phasen[SURIMY_OBJ].Lines, + (const MovLine *)SURIMY_MPKT3); wait_detail(18); } else { auto_move(1, P_CHEWY); @@ -204,8 +204,8 @@ int16 Room18::calc_surimy() { start_detail_frame(17, 1, ANI_VOR, 12); _G(maus_links_click) = false; - init_auto_obj(SURIMY_OBJ, &surimy_phasen[0][0], mov_phasen[SURIMY_OBJ].Lines, (MovLine - *)surimy_mpkt); + init_auto_obj(SURIMY_OBJ, &SURIMY_PHASEN[0][0], mov_phasen[SURIMY_OBJ].Lines, + (const MovLine *)SURIMY_MPKT); wait_detail(17); } _G(spieler).PersonHide[P_CHEWY] = false; @@ -232,8 +232,8 @@ int16 Room18::calc_surimy() { det->hide_static_spr(26); flags.NoScroll = true; mov_phasen[SURIMY_OBJ].Repeat = 1; - init_auto_obj(SURIMY_OBJ, &surimy_phasen[0][0], mov_phasen[SURIMY_OBJ].Lines, (MovLine - *)surimy_mpkt1); + init_auto_obj(SURIMY_OBJ, &SURIMY_PHASEN[0][0], mov_phasen[SURIMY_OBJ].Lines, + (const MovLine *)SURIMY_MPKT1); auto_scroll(70, 0); wait_auto_obj(SURIMY_OBJ); @@ -251,8 +251,8 @@ int16 Room18::calc_surimy() { det->hide_static_spr(26); mov_phasen[SURIMY_OBJ].Repeat = 1; - init_auto_obj(SURIMY_OBJ, &surimy_phasen[0][0], mov_phasen[SURIMY_OBJ].Lines, (MovLine - *)surimy_mpkt2); + init_auto_obj(SURIMY_OBJ, &SURIMY_PHASEN[0][0], mov_phasen[SURIMY_OBJ].Lines, + (const MovLine *)SURIMY_MPKT2); auto_scroll(0, 0); wait_auto_obj(SURIMY_OBJ); _G(spieler).ScrollxStep = 6; diff --git a/engines/chewy/rooms/room21.cpp b/engines/chewy/rooms/room21.cpp index 0987e9c0618..58fc9b62ed3 100644 --- a/engines/chewy/rooms/room21.cpp +++ b/engines/chewy/rooms/room21.cpp @@ -33,25 +33,25 @@ namespace Rooms { #define SPINNE2_OBJ 1 #define ENERGIE_OBJ 2 -static int16 spinne_phasen[4][2] = { +static const int16 SPINNE_PHASEN[4][2] = { { 58, 65 }, { 50, 57 }, { 42, 49 }, { 66, 89 } }; -static MovLine spinne_mpkt[3] = { +static const MovLine SPINNE_MPKT[3] = { { { 550, 275, 0 }, 0, 2 }, { { 396, 275, 0 }, 0, 2 }, { { 530, 275, 0 }, 1, 2 } }; -static MovLine spinne_mpkt1[2] = { +static const MovLine SPINNE_MPKT1[2] = { { { 104, 50, 0 }, 3, 3 }, { { 104, 430, 0 }, 3, 3 } }; -static MovLine energie_mpkt[2] = { +static const MovLine SPINNE_MPKT2[2] = { { { 115, 140, 0 }, 2, 1 }, { { 115, 190, 0 }, 2, 1 } }; @@ -106,7 +106,7 @@ void Room21::init_spinne() { auto_mov_obj[SPINNE1_OBJ].Id = AUTO_OBJ0; auto_mov_vector[SPINNE1_OBJ].Delay = _G(spieler).DelaySpeed; auto_mov_obj[SPINNE1_OBJ].Mode = 1; - init_auto_obj(SPINNE1_OBJ, &spinne_phasen[0][0], mov_phasen[SPINNE1_OBJ].Lines, (MovLine *)spinne_mpkt); + init_auto_obj(SPINNE1_OBJ, &SPINNE_PHASEN[0][0], mov_phasen[SPINNE1_OBJ].Lines, (const MovLine *)SPINNE_MPKT); mov_phasen[SPINNE2_OBJ].AtsText = 130; mov_phasen[SPINNE2_OBJ].Lines = 2; @@ -115,17 +115,16 @@ void Room21::init_spinne() { auto_mov_obj[SPINNE2_OBJ].Id = AUTO_OBJ1; auto_mov_vector[SPINNE2_OBJ].Delay = _G(spieler).DelaySpeed; auto_mov_obj[SPINNE2_OBJ].Mode = 1; - init_auto_obj(SPINNE2_OBJ, &spinne_phasen[0][0], mov_phasen[SPINNE2_OBJ].Lines, (MovLine *)spinne_mpkt1); + init_auto_obj(SPINNE2_OBJ, &SPINNE_PHASEN[0][0], mov_phasen[SPINNE2_OBJ].Lines, (const MovLine *)SPINNE_MPKT1); _G(timer_nr)[0] = room->set_timer(255, 21); _G(e_streifen) = false; } void Room21::restart_spinne2() { mov_phasen[SPINNE2_OBJ].Repeat = 1; - init_auto_obj(SPINNE2_OBJ, &spinne_phasen[0][0], mov_phasen[SPINNE2_OBJ].Lines, (MovLine *)spinne_mpkt1); + init_auto_obj(SPINNE2_OBJ, &SPINNE_PHASEN[0][0], mov_phasen[SPINNE2_OBJ].Lines, (const MovLine *)SPINNE_MPKT1); uhr->reset_timer(_G(timer_nr)[0], 0); _G(e_streifen) = false; - } void Room21::e_streifen() { @@ -137,8 +136,7 @@ void Room21::e_streifen() { auto_mov_obj[ENERGIE_OBJ].Id = AUTO_OBJ2; auto_mov_vector[ENERGIE_OBJ].Delay = _G(spieler).DelaySpeed; auto_mov_obj[ENERGIE_OBJ].Mode = 1; - init_auto_obj(ENERGIE_OBJ, &spinne_phasen[0][0], mov_phasen[ENERGIE_OBJ].Lines, (MovLine *)energie_mpkt); - + init_auto_obj(ENERGIE_OBJ, &SPINNE_PHASEN[0][0], mov_phasen[ENERGIE_OBJ].Lines, (const MovLine *)SPINNE_MPKT2); } void Room21::r21setup_func() { diff --git a/engines/chewy/rooms/room22.cpp b/engines/chewy/rooms/room22.cpp index 58d62981808..6657ebdb0dd 100644 --- a/engines/chewy/rooms/room22.cpp +++ b/engines/chewy/rooms/room22.cpp @@ -31,24 +31,24 @@ namespace Rooms { #define BORK_OBJ 0 -static int16 bork_phasen[4][2] = { +static const int16 BORK_PHASEN[4][2] = { { 51, 56 }, { 36, 41 }, { 36, 41 }, { 36, 41 } }; -static MovLine bork_mpkt[2] = { - { {-30, 125, 170} , 1, 6 }, +static const MovLine BORK_MPKT[2] = { + { { -30, 125, 170} , 1, 6 }, { { 155, 125, 170 }, 1, 6 }, }; -static MovLine bork_mpkt1[2] = { +static const MovLine BORK_MPKT1[2] = { { { 155, 125, 170}, 2, 6 }, { { -30, 125, 170}, 0, 6 } }; -static MovLine bork_mpkt2[2] = { +static const MovLine BORK_MPKT2[2] = { { { -30, 125, 170 }, 1, 6 }, { { 90, 125, 170 }, 1, 6 } }; @@ -110,21 +110,21 @@ void Room22::bork(int16 t_nr) { } void Room22::bork_walk1() { - init_auto_obj(BORK_OBJ, &bork_phasen[0][0], mov_phasen[BORK_OBJ].Lines, (MovLine - *)bork_mpkt); + init_auto_obj(BORK_OBJ, &BORK_PHASEN[0][0], mov_phasen[BORK_OBJ].Lines, + (const MovLine *)BORK_MPKT); wait_auto_obj(BORK_OBJ); start_detail_wait(2, 1, ANI_VOR); mov_phasen[BORK_OBJ].Repeat = 1; - init_auto_obj(BORK_OBJ, &bork_phasen[0][0], mov_phasen[BORK_OBJ].Lines, (MovLine - *)bork_mpkt1); + init_auto_obj(BORK_OBJ, &BORK_PHASEN[0][0], mov_phasen[BORK_OBJ].Lines, + (const MovLine *)BORK_MPKT1); wait_auto_obj(BORK_OBJ); } void Room22::bork_walk2() { - init_auto_obj(BORK_OBJ, &bork_phasen[0][0], mov_phasen[BORK_OBJ].Lines, (MovLine - *)bork_mpkt2); + init_auto_obj(BORK_OBJ, &BORK_PHASEN[0][0], mov_phasen[BORK_OBJ].Lines, + (const MovLine *)BORK_MPKT2); wait_auto_obj(BORK_OBJ); flic_cut(FCUT_009, CFO_MODE); diff --git a/engines/chewy/rooms/room24.cpp b/engines/chewy/rooms/room24.cpp index c0b3b1daf8b..7ef5825309b 100644 --- a/engines/chewy/rooms/room24.cpp +++ b/engines/chewy/rooms/room24.cpp @@ -29,9 +29,10 @@ namespace Chewy { namespace Rooms { -uint8 kristall_spr[3][3] = { {14, 20, 13}, - {20, 13, 14}, - {13, 14, 20}, +static const uint8 KRISTALL_SPR[3][3] = { + { 14, 20, 13 }, + { 20, 13, 14 }, + { 13, 14, 20 }, }; void Room24::entry() { @@ -53,7 +54,7 @@ void Room24::entry() { calc_hebel_spr(); calc_animation(255); for (i = 0; i < 3; i++) { - if (kristall_spr[i][_G(spieler).R24Hebel[i]] == 20) + if (KRISTALL_SPR[i][_G(spieler).R24Hebel[i]] == 20) det->start_detail(5 + i * 4, 255, ANI_RUECK); } } @@ -127,7 +128,7 @@ void Room24::calc_animation(int16 kristall_nr) { if (kristall_nr != 255) { hide_cur(); - if (kristall_spr[kristall_nr][_G(spieler).R24Hebel[kristall_nr]] == 20) { + if (KRISTALL_SPR[kristall_nr][_G(spieler).R24Hebel[kristall_nr]] == 20) { if (_G(spieler).R24KristallLast[kristall_nr] == 13) { ani_nr = 7; } else { @@ -143,7 +144,7 @@ void Room24::calc_animation(int16 kristall_nr) { else if (_G(spieler).R24KristallLast[kristall_nr] == 20) { - if (kristall_spr[kristall_nr][_G(spieler).R24Hebel[kristall_nr]] == 13) { + if (KRISTALL_SPR[kristall_nr][_G(spieler).R24Hebel[kristall_nr]] == 13) { ani_nr = 7; } else { ani_nr = 8; @@ -160,8 +161,8 @@ void Room24::calc_animation(int16 kristall_nr) { for (i = 0; i < 6; i++) det->hide_static_spr(13 + i); for (i = 0; i < 3; i++) { - det->show_static_spr(kristall_spr[i][_G(spieler).R24Hebel[i]] + i * 2); - _G(spieler).R24KristallLast[i] = kristall_spr[i][_G(spieler).R24Hebel[i]]; + det->show_static_spr(KRISTALL_SPR[i][_G(spieler).R24Hebel[i]] + i * 2); + _G(spieler).R24KristallLast[i] = KRISTALL_SPR[i][_G(spieler).R24Hebel[i]]; } } diff --git a/engines/chewy/rooms/room3.cpp b/engines/chewy/rooms/room3.cpp index cceb874a5fb..ff123b71444 100644 --- a/engines/chewy/rooms/room3.cpp +++ b/engines/chewy/rooms/room3.cpp @@ -43,12 +43,12 @@ namespace Rooms { #define SONDE_SPR_R 118 #define SONDE_SPR_L 120 -static MovLine SONDE_MPKT[3] = { +static const MovLine SONDE_MPKT[3] = { { { 13, 45, 75 }, 1, 2 }, { { 237, 52, 160 }, 1, 2 }, { { 4, 83, 180 }, 0, 2 } }; -static int16 SONDE_PHASEN[4][2] = { +static const int16 SONDE_PHASEN[4][2] = { { 120, 120 }, { 118, 118 }, { 141, 141 }, @@ -130,7 +130,7 @@ void Room3::init_sonde() { auto_mov_obj[SONDE_OBJ].Id = AUTO_OBJ0; auto_mov_vector[SONDE_OBJ].Delay = _G(spieler).DelaySpeed; auto_mov_obj[SONDE_OBJ].Mode = 1; - init_auto_obj(SONDE_OBJ, &SONDE_PHASEN[0][0], mov_phasen[SONDE_OBJ].Lines, (MovLine *)SONDE_MPKT); + init_auto_obj(SONDE_OBJ, &SONDE_PHASEN[0][0], mov_phasen[SONDE_OBJ].Lines, (const MovLine *)SONDE_MPKT); } void Room3::sonde_knarre() { diff --git a/engines/chewy/rooms/room4.cpp b/engines/chewy/rooms/room4.cpp index 40db986518f..9f2582cdf0d 100644 --- a/engines/chewy/rooms/room4.cpp +++ b/engines/chewy/rooms/room4.cpp @@ -40,14 +40,15 @@ int16 Room4::sonde_comp() { int16 spr_nr; int16 cur_x; - int16 cur_pos[3][2] = { { 83, 106 }, - { 136, 103 }, - { 188, 101 } + static const int16 CUR_POS[3][2] = { + { 83, 106 }, + { 136, 103 }, + { 188, 101 } }; - - int16 console[3][4] = { { 82, 158, 143, 199 }, - { 150, 159, 194, 193 }, - { 201, 154, 262, 193 } + static const int16 CONSOLE[3][4] = { + { 82, 158, 143, 199 }, + { 150, 159, 194, 193 }, + { 201, 154, 262, 193 } }; cur_2_inventory(); @@ -65,7 +66,7 @@ int16 Room4::sonde_comp() { while (!ende) { maus_action(); if (_G(maus_links_click)) { - switch (in->maus_vector(minfo.x + 17, minfo.y + 7, (int16 *)console, 3)) { + switch (in->maus_vector(minfo.x + 17, minfo.y + 7, (int16 *)CONSOLE, 3)) { case 0: if (cur_x > 0) --cur_x; @@ -93,8 +94,8 @@ int16 Room4::sonde_comp() { spr_info[0].Image = room_blk.DetImage[spr_nr]; spr_info[0].ZEbene = 0; - spr_info[0].X = cur_pos[cur_x][0]; - spr_info[0].Y = cur_pos[cur_x][1]; + spr_info[0].X = CUR_POS[cur_x][0]; + spr_info[0].Y = CUR_POS[cur_x][1]; if (minfo.button == 1 || kbinfo.key_code == ENTER) { curani.ani_anf = HAND_CLICK; curani.ani_end = HAND_CLICK; diff --git a/engines/chewy/rooms/room6.cpp b/engines/chewy/rooms/room6.cpp index 25088c7d755..b858efae321 100644 --- a/engines/chewy/rooms/room6.cpp +++ b/engines/chewy/rooms/room6.cpp @@ -29,14 +29,14 @@ namespace Chewy { namespace Rooms { -static int16 R6_ROBO_PHASEN[4][2] = { +static const int16 R6_ROBO_PHASEN[4][2] = { { 86, 86 }, { 86, 86 }, { 86, 86 }, { 86, 86 } }; -static MovLine R6_ROBO_MPKT[3] = { +static const MovLine R6_ROBO_MPKT[3] = { { { 168, 71, 180 }, 1, 1 }, { { 180, 71, 100 }, 1, 2 }, { { 60, 210, 110 }, 1, 16 } @@ -75,8 +75,8 @@ void Room6::init_robo() { auto_mov_obj[ROBO_OBJ].Id = AUTO_OBJ0; auto_mov_vector[ROBO_OBJ].Delay = _G(spieler).DelaySpeed; auto_mov_obj[ROBO_OBJ].Mode = 1; - init_auto_obj(ROBO_OBJ, &R6_ROBO_PHASEN[0][0], mov_phasen[ROBO_OBJ].Lines, (MovLine - *)R6_ROBO_MPKT); + init_auto_obj(ROBO_OBJ, &R6_ROBO_PHASEN[0][0], mov_phasen[ROBO_OBJ].Lines, + (const MovLine *)R6_ROBO_MPKT); } void Room6::bola_knopf() { diff --git a/engines/chewy/rooms/room9.cpp b/engines/chewy/rooms/room9.cpp index 5f7f9c8d8ab..4df7e4a41b6 100644 --- a/engines/chewy/rooms/room9.cpp +++ b/engines/chewy/rooms/room9.cpp @@ -31,19 +31,19 @@ namespace Rooms { #define SURIMY_OBJ 0 -static int16 surimy_phasen[4][2] = { +static const int16 SURIMY_PHASEN[4][2] = { { 91, 98 }, { 91, 98 }, { 91, 98 }, { 91, 98 } }; -static MovLine surimy_mpkt[2] = { +static const MovLine SURIMY_MPKT[2] = { { { 80, 170, 199 }, 2, 6 }, { { 210, 162, 199 }, 2, 6 } }; -static MovLine surimy_mpkt1[2] = { +static const MovLine SURIMY_MPKT1[2] = { { { 224, 158, 199 }, 2, 6 }, { { 330, 162, 199 }, 2, 6 } }; @@ -99,8 +99,8 @@ void Room9::surimy_ani() { auto_mov_obj[SURIMY_OBJ].Id = AUTO_OBJ0; auto_mov_vector[SURIMY_OBJ].Delay = _G(spieler).DelaySpeed; auto_mov_obj[SURIMY_OBJ].Mode = 1; - init_auto_obj(SURIMY_OBJ, &surimy_phasen[0][0], mov_phasen[SURIMY_OBJ].Lines, (MovLine - *)surimy_mpkt); + init_auto_obj(SURIMY_OBJ, &SURIMY_PHASEN[0][0], mov_phasen[SURIMY_OBJ].Lines, + (const MovLine *)SURIMY_MPKT); wait_auto_obj(SURIMY_OBJ); start_detail_frame(0, 1, ANI_VOR, 15); det->start_detail(2, 1, ANI_VOR); @@ -109,8 +109,8 @@ void Room9::surimy_ani() { start_spz(CH_EKEL, 2, ANI_VOR, P_CHEWY); det->hide_static_spr(4); mov_phasen[SURIMY_OBJ].Repeat = 1; - init_auto_obj(SURIMY_OBJ, &surimy_phasen[0][0], mov_phasen[SURIMY_OBJ].Lines, (MovLine - *)surimy_mpkt1); + init_auto_obj(SURIMY_OBJ, &SURIMY_PHASEN[0][0], mov_phasen[SURIMY_OBJ].Lines, + (const MovLine *)SURIMY_MPKT1); wait_auto_obj(SURIMY_OBJ); det->del_taf_tbl(91, 8, 0); } diff --git a/engines/chewy/sprite.cpp b/engines/chewy/sprite.cpp index ad6e884f722..25e8b405d21 100644 --- a/engines/chewy/sprite.cpp +++ b/engines/chewy/sprite.cpp @@ -537,10 +537,11 @@ void continue_auto_obj(int16 nr, int16 repeat) { } } -void init_auto_obj(int16 auto_nr, int16 *phasen, int16 lines, MovLine *mline) { +void init_auto_obj(int16 auto_nr, const int16 *phasen, int16 lines, const MovLine *mline) { int16 i; int16 *tmp; - MovLine *tmp1, *tmp2; + MovLine *tmp1; + const MovLine *tmp2; tmp2 = mline; tmp = (int16 *)mov_phasen[auto_nr].Phase; for (i = 0; i < 8; i++)