diff options
| author | Oliver Kiehl | 2003-05-21 20:20:20 +0000 |
|---|---|---|
| committer | Oliver Kiehl | 2003-05-21 20:20:20 +0000 |
| commit | 2f01855ed5e110299c03e8d36a3485cc53f5727f (patch) | |
| tree | c414f6bdca90f4577f03b3e5af41107d1176484d | |
| parent | 2dcd2531cf836f6896d0faa0cdae3d27286a0720 (diff) | |
| download | scummvm-rg350-2f01855ed5e110299c03e8d36a3485cc53f5727f.tar.gz scummvm-rg350-2f01855ed5e110299c03e8d36a3485cc53f5727f.tar.bz2 scummvm-rg350-2f01855ed5e110299c03e8d36a3485cc53f5727f.zip | |
pedantic warning fixes
svn-id: r7802
76 files changed, 7144 insertions, 2374 deletions
diff --git a/sky/compacts/0compact.h b/sky/compacts/0compact.h index 8bf60f68a7..fab8ea5d06 100644 --- a/sky/compacts/0compact.h +++ b/sky/compacts/0compact.h @@ -109,7 +109,7 @@ uint16 slide2_seq[] = { 241, 21, 0, - 0, + 0 }; uint16 m_ss_st_up[] = { @@ -117,7 +117,7 @@ uint16 m_ss_st_up[] = { 1, 1, 36, - 0, + 0 }; uint16 crouch_seq[] = { @@ -143,7 +143,7 @@ uint16 crouch_seq[] = { 1, 1, 3, - 0, + 0 }; uint16 fost_open_cup[] = { @@ -199,7 +199,7 @@ uint16 fost_open_cup[] = { 1, 1, 0, - 0, + 0 }; Compact fan3 = { @@ -231,6 +231,7 @@ Compact fan3 = { C_BASE_MODE, // mode FAN3_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 ss_smokes_1[] = { @@ -374,7 +375,7 @@ uint16 ss_smokes_1[] = { 223, 6, 0, - 0, + 0 }; Compact fan7 = { @@ -406,6 +407,7 @@ Compact fan7 = { C_BASE_MODE, // mode FAN7_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 slide_seq[] = { @@ -444,7 +446,7 @@ uint16 slide_seq[] = { 259, 10, 0, - 0, + 0 }; uint16 f_ss_st_right[] = { @@ -452,7 +454,7 @@ uint16 f_ss_st_right[] = { 1, 1, 38, - 0, + 0 }; uint32 *c74 = 0; @@ -490,7 +492,7 @@ uint16 f_ss_left[] = { 23+99*64, 65532, 0, - 0, + 0 }; uint16 m_ss_down[] = { @@ -526,7 +528,7 @@ uint16 m_ss_down[] = { 15+75*64, 0, 1, - 0, + 0 }; uint16 s2_pal[] = { @@ -913,7 +915,7 @@ uint16 s2_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 foster_hanging[] = { @@ -961,7 +963,7 @@ uint16 foster_hanging[] = { 202, 13, 0, - 0, + 0 }; Compact fan4 = { @@ -993,6 +995,7 @@ Compact fan4 = { C_BASE_MODE, // mode FAN4_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_ss_to_1[] = { @@ -1004,7 +1007,7 @@ uint16 rs_ss_to_1[] = { 1, C_PLACE, 95, - 65535, + 65535 }; uint16 rs_foster_to_one[] = { @@ -1016,17 +1019,17 @@ uint16 rs_foster_to_one[] = { 1, C_PLACE, 95, - 65535, + 65535 }; uint16 m_ss_r_to_d[] = { 47-8+75*64, - 0, + 0 }; uint16 f_ss_l_to_u[] = { 43-8+99*64, - 0, + 0 }; Compact load_point = { @@ -1058,6 +1061,7 @@ Compact load_point = { C_BASE_MODE, // mode LOAD_POINT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_5_0[] = { @@ -1075,7 +1079,7 @@ uint16 rs_foster_5_0[] = { 42+13*64, C_MEGA_SET, 0, - 65535, + 65535 }; uint16 fost_pull_knob[] = { @@ -1107,12 +1111,12 @@ uint16 fost_pull_knob[] = { 1, 1, 0, - 0, + 0 }; uint16 m_ss_r_to_u[] = { 45-8+75*64, - 0, + 0 }; uint16 rs_foster_to_1[] = { @@ -1124,7 +1128,7 @@ uint16 rs_foster_to_1[] = { 1, C_PLACE, 95, - 65535, + 65535 }; uint32 *rs_jobs_4_2 = 0; @@ -1144,7 +1148,7 @@ uint16 monitor_seq[] = { 200, 3, 0, - 0, + 0 }; uint16 joey_door_seq[] = { @@ -1336,7 +1340,7 @@ uint16 joey_door_seq[] = { 172, 0, 0, - 0, + 0 }; uint16 small_opens[] = { @@ -1353,7 +1357,7 @@ uint16 small_opens[] = { 1, 1, 0, - 0, + 0 }; uint16 fost_knob_locked[] = { @@ -1388,7 +1392,7 @@ uint16 fost_knob_locked[] = { 1, 1, 0, - 0, + 0 }; uint16 s4_pal[] = { @@ -1775,7 +1779,7 @@ uint16 s4_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 alarm_seq[] = { @@ -1810,7 +1814,7 @@ uint16 alarm_seq[] = { 284, 208, 9, - 0, + 0 }; uint16 reverse_seq[] = { @@ -1827,7 +1831,7 @@ uint16 reverse_seq[] = { 240, 256, 10, - 0, + 0 }; Compact press = { @@ -1859,6 +1863,7 @@ Compact press = { C_BASE_MODE, // mode PRESS_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 furnace_seq[] = { @@ -1896,7 +1901,7 @@ uint16 furnace_seq[] = { 226, 239, 10, - 0, + 0 }; uint16 load_point_seq[] = { @@ -2022,7 +2027,7 @@ uint16 load_point_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 m_ss_right[] = { @@ -2058,7 +2063,7 @@ uint16 m_ss_right[] = { 31+75*64, 2, 0, - 0, + 0 }; uint16 use_bar2[] = { @@ -2081,7 +2086,7 @@ uint16 use_bar2[] = { 1, 1, 0, - 0, + 0 }; uint16 fost_cant_open[] = { @@ -2122,21 +2127,21 @@ uint16 fost_cant_open[] = { 1, 1, 142*64+1, - 0, + 0 }; uint16 f_ss_l_to_r[] = { 41-8+99*64, 40-8+99*64, 47-8+99*64, - 0, + 0 }; uint16 f_ss_u_to_d[] = { 43-8+99*64, 42-8+99*64, 41-8+99*64, - 0, + 0 }; uint16 push_small[] = { @@ -2171,14 +2176,14 @@ uint16 push_small[] = { 165, 260, 0, - 0, + 0 }; uint8 ss_auto[64]; uint16 m_ss_l_to_d[] = { 41-8+75*64, - 0, + 0 }; uint16 s0_pal[] = { @@ -2565,7 +2570,7 @@ uint16 s0_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint32 *grid3 = 0; @@ -2645,7 +2650,7 @@ uint16 foster_shot[] = { 318, 23, 0, - 0, + 0 }; uint16 lazer_stop_seq[] = { @@ -2662,13 +2667,13 @@ uint16 lazer_stop_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 rs_start_alarm[] = { C_STATUS, ST_FOREGROUND+ST_LOGIC, - 65535, + 65535 }; Compact fan1 = { @@ -2700,13 +2705,14 @@ Compact fan1 = { C_BASE_MODE, // mode FAN1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 f_ss_d_to_u[] = { 47-8+99*64, 46-8+99*64, 45-8+99*64, - 0, + 0 }; uint32 *grid4 = 0; @@ -2747,7 +2753,7 @@ uint16 ss_smokes_3[] = { 220, 0, 0, - 0, + 0 }; uint16 lights1_seq[] = { @@ -2806,7 +2812,7 @@ uint16 lights1_seq[] = { 248, 194, 8, - 0, + 0 }; uint16 eye_open[] = { @@ -2817,7 +2823,7 @@ uint16 eye_open[] = { 1, 1, 2, - 0, + 0 }; uint16 press_seq[] = { @@ -2888,7 +2894,7 @@ uint16 press_seq[] = { 269, 246, 0, - 0, + 0 }; uint16 cup_close_seq[] = { @@ -2902,7 +2908,7 @@ uint16 cup_close_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 low_lift_down_seq1[] = { @@ -2943,7 +2949,7 @@ uint16 low_lift_down_seq1[] = { 250, 141, 0, - 0, + 0 }; uint16 barrel_in_seq[] = { @@ -3005,7 +3011,7 @@ uint16 barrel_in_seq[] = { 227, 258, 6, - 0, + 0 }; uint16 rs_big_foster[] = { @@ -3021,7 +3027,7 @@ uint16 rs_big_foster[] = { 17, C_GET_TO_FLAG, 0, - 65535, + 65535 }; uint16 screen0_low_logic[] = { @@ -3051,7 +3057,7 @@ uint16 screen0_low_logic[] = { ID_LIGHT1, ID_PANEL, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 rs_foster_2_0[] = { @@ -3067,7 +3073,7 @@ uint16 rs_foster_2_0[] = { 2, C_FRAME, 42+13*64, - 65535, + 65535 }; uint16 foster_g_d[] = { @@ -3096,7 +3102,7 @@ uint16 foster_g_d[] = { 1, 1, 6, - 0, + 0 }; uint16 fost_but_seq[] = { @@ -3150,7 +3156,7 @@ uint16 fost_but_seq[] = { 146, 7, 0, - 0, + 0 }; uint16 jobs_look_scrn[] = { @@ -3234,7 +3240,7 @@ uint16 jobs_look_scrn[] = { 191, 2, 0, - 0, + 0 }; uint16 jobs_chuck_look[] = { @@ -3287,7 +3293,7 @@ uint16 jobs_chuck_look[] = { 1, 1, 0, - 0, + 0 }; uint16 eye_blink[] = { @@ -3301,7 +3307,7 @@ uint16 eye_blink[] = { 1, 1, 2, - 0, + 0 }; uint16 fan1_seq[] = { @@ -3315,7 +3321,7 @@ uint16 fan1_seq[] = { 283, 137, 2, - 0, + 0 }; uint16 m_ss_st_right[] = { @@ -3323,7 +3329,7 @@ uint16 m_ss_st_right[] = { 1, 1, 38, - 0, + 0 }; uint16 screen0_low_mouse[] = { @@ -3339,7 +3345,7 @@ uint16 screen0_low_mouse[] = { ID_LOW_FLOOR, 18, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 fan7_seq[] = { @@ -3359,12 +3365,12 @@ uint16 fan7_seq[] = { 388, 172, 4, - 0, + 0 }; uint16 f_ss_r_to_d[] = { 47-8+99*64, - 0, + 0 }; uint16 r1_opens[] = { @@ -3396,12 +3402,12 @@ uint16 r1_opens[] = { 1, 1, 0, - 0, + 0 }; uint16 f_ss_u_to_l[] = { 43-8+99*64, - 0, + 0 }; uint16 rs_mini_ss[] = { @@ -3419,7 +3425,7 @@ uint16 rs_mini_ss[] = { 192, C_YCOOD, 280, - 65535, + 65535 }; uint16 s3_pal[] = { @@ -3806,7 +3812,7 @@ uint16 s3_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 ss_smokes_2[] = { @@ -3914,7 +3920,7 @@ uint16 ss_smokes_2[] = { 222, 16, 0, - 0, + 0 }; uint16 m_ss_up[] = { @@ -3950,7 +3956,7 @@ uint16 m_ss_up[] = { 7+75*64, 0, 65535, - 0, + 0 }; uint16 m_ss_left[] = { @@ -3986,7 +3992,7 @@ uint16 m_ss_left[] = { 23+75*64, 65534, 0, - 0, + 0 }; uint16 m_ss_st_down[] = { @@ -3994,7 +4000,7 @@ uint16 m_ss_st_down[] = { 1, 1, 32, - 0, + 0 }; uint16 m_ss_st_left[] = { @@ -4002,7 +4008,7 @@ uint16 m_ss_st_left[] = { 1, 1, 34, - 0, + 0 }; uint16 m_ss_st_talk[] = { @@ -4010,60 +4016,60 @@ uint16 m_ss_st_talk[] = { 1, 1, 0, - 0, + 0 }; uint16 m_ss_u_to_d[] = { 43-8+75*64, 42-8+75*64, 41-8+75*64, - 0, + 0 }; uint16 m_ss_u_to_l[] = { 43-8+75*64, - 0, + 0 }; uint16 m_ss_u_to_r[] = { 45-8+75*64, - 0, + 0 }; uint16 m_ss_d_to_u[] = { 47-8+75*64, 46-8+75*64, 45-8+75*64, - 0, + 0 }; uint16 m_ss_d_to_l[] = { 41-8+75*64, - 0, + 0 }; uint16 m_ss_d_to_r[] = { 47-8+75*64, - 0, + 0 }; uint16 m_ss_l_to_u[] = { 43-8+75*64, - 0, + 0 }; uint16 m_ss_l_to_r[] = { 41-8+75*64, 40-8+75*64, 47-8+75*64, - 0, + 0 }; uint16 m_ss_r_to_l[] = { 45-8+75*64, 44-8+75*64, 43-8+75*64, - 0, + 0 }; TurnTable mini_so_turnTable0 = { @@ -4101,7 +4107,7 @@ TurnTable mini_so_turnTable0 = { 0, 0, 0 - }, + } }; MegaSet mini_so_megaSet0 = { @@ -4118,7 +4124,7 @@ MegaSet mini_so_megaSet0 = { m_ss_st_left, // standLeft m_ss_st_right, // standRight m_ss_st_talk, // standTalk - &mini_so_turnTable0, + &mini_so_turnTable0 }; ExtCompact mini_so_ext = { @@ -4148,6 +4154,9 @@ ExtCompact mini_so_ext = { ss_auto, // animScratch 0, // megaSet &mini_so_megaSet0, + 0, + 0, + 0 }; Compact mini_so = { @@ -4179,7 +4188,7 @@ Compact mini_so = { 0, // mode START_MINI_SS, // baseSub 0, // baseSub_off - &mini_so_ext, + &mini_so_ext }; uint16 unload_seq1[] = { @@ -4223,7 +4232,7 @@ uint16 unload_seq1[] = { 1, 1, 12, - 0, + 0 }; uint16 open_r1[] = { @@ -4252,7 +4261,7 @@ uint16 open_r1[] = { 196, 202, 7, - 0, + 0 }; uint16 get_bar_out[] = { @@ -4299,7 +4308,7 @@ uint16 get_bar_out[] = { 1, 1, 0, - 0, + 0 }; uint16 fost_close_cup[] = { @@ -4352,7 +4361,7 @@ uint16 fost_close_cup[] = { 1, 1, 0, - 0, + 0 }; uint16 barrel_down_seq2[] = { @@ -4393,7 +4402,7 @@ uint16 barrel_down_seq2[] = { 270, 257, 8, - 0, + 0 }; uint16 ss_kick[] = { @@ -4419,7 +4428,7 @@ uint16 ss_kick[] = { 1, 1, 6, - 0, + 0 }; uint32 *grid1 = 0; @@ -4459,7 +4468,7 @@ uint16 f_ss_up[] = { 7+99*64, 0, 65534, - 0, + 0 }; uint16 f_ss_down[] = { @@ -4495,7 +4504,7 @@ uint16 f_ss_down[] = { 15+99*64, 0, 2, - 0, + 0 }; uint16 f_ss_right[] = { @@ -4531,7 +4540,7 @@ uint16 f_ss_right[] = { 31+99*64, 4, 0, - 0, + 0 }; uint16 f_ss_st_up[] = { @@ -4539,7 +4548,7 @@ uint16 f_ss_st_up[] = { 1, 1, 36, - 0, + 0 }; uint16 f_ss_st_down[] = { @@ -4547,7 +4556,7 @@ uint16 f_ss_st_down[] = { 1, 1, 32, - 0, + 0 }; uint16 f_ss_st_left[] = { @@ -4555,39 +4564,39 @@ uint16 f_ss_st_left[] = { 1, 1, 34, - 0, + 0 }; uint16 f_ss_u_to_r[] = { 45-8+99*64, - 0, + 0 }; uint16 f_ss_d_to_l[] = { 41-8+99*64, - 0, + 0 }; uint16 f_ss_d_to_r[] = { 47-8+99*64, - 0, + 0 }; uint16 f_ss_l_to_d[] = { 41-8+99*64, - 0, + 0 }; uint16 f_ss_r_to_u[] = { 45-8+99*64, - 0, + 0 }; uint16 f_ss_r_to_l[] = { 45-8+99*64, 44-8+99*64, 43-8+99*64, - 0, + 0 }; TurnTable full_so_turnTable0 = { @@ -4625,7 +4634,7 @@ TurnTable full_so_turnTable0 = { 0, 0, 0 - }, + } }; MegaSet full_so_megaSet0 = { @@ -4642,7 +4651,7 @@ MegaSet full_so_megaSet0 = { f_ss_st_left, // standLeft f_ss_st_right, // standRight 0, // standTalk - &full_so_turnTable0, + &full_so_turnTable0 }; ExtCompact full_so_ext = { @@ -4672,6 +4681,9 @@ ExtCompact full_so_ext = { full_ss_auto, // animScratch 0, // megaSet &full_so_megaSet0, + 0, + 0, + 0 }; Compact full_so = { @@ -4703,7 +4715,7 @@ Compact full_so = { 0, // mode FULL_SS_CUT, // baseSub 0, // baseSub_off - &full_so_ext, + &full_so_ext }; uint16 panel_seq[] = { @@ -4721,7 +4733,7 @@ uint16 panel_seq[] = { 187, 3, 0, - 0, + 0 }; uint16 chip_list_0[] = { @@ -4759,7 +4771,7 @@ uint16 chip_list_0[] = { 17, 227+0X8000, 99, - 0, + 0 }; uint16 use_the_bar[] = { @@ -4878,7 +4890,7 @@ uint16 use_the_bar[] = { 1, 1, 5, - 0, + 0 }; uint16 small_closes[] = { @@ -4895,7 +4907,7 @@ uint16 small_closes[] = { 1, 1, 4, - 0, + 0 }; uint16 jobs_buttons[] = { @@ -4937,7 +4949,7 @@ uint16 jobs_buttons[] = { 183, 0, 0, - 0, + 0 }; uint16 up_stairs[] = { @@ -5135,7 +5147,7 @@ uint16 up_stairs[] = { 232, 49, 0, - 0, + 0 }; uint16 chuck_seq[] = { @@ -5150,7 +5162,7 @@ uint16 chuck_seq[] = { 222, 2, 0, - 0, + 0 }; uint16 rs_foster_to_0[] = { @@ -5162,7 +5174,7 @@ uint16 rs_foster_to_0[] = { 0, C_PLACE, 17, - 65535, + 65535 }; Compact fire_notice = { @@ -5194,6 +5206,7 @@ Compact fire_notice = { C_BASE_MODE, // mode NOTICE_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 screen0_high_mouse[] = { @@ -5205,7 +5218,7 @@ uint16 screen0_high_mouse[] = { 90, 18, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 foster_g_up[] = { @@ -5234,7 +5247,7 @@ uint16 foster_g_up[] = { 1, 1, 0, - 0, + 0 }; uint16 rs_foster_s3[] = { @@ -5246,7 +5259,7 @@ uint16 rs_foster_s3[] = { ID_S3_FLOOR, C_STATUS, ST_SORT+ST_RECREATE+ST_LOGIC+ST_AR_PRIORITY+ST_GRID_PLOT+ST_COLLISION, - 65535, + 65535 }; uint16 rs_mini_foster[] = { @@ -5262,7 +5275,7 @@ uint16 rs_mini_foster[] = { 69, C_GET_TO_FLAG, 0, - 65535, + 65535 }; uint16 bolt1_seq[] = { @@ -5276,7 +5289,7 @@ uint16 bolt1_seq[] = { 294, 227, 2, - 0, + 0 }; uint16 rs_foster_4_2[] = { @@ -5290,7 +5303,7 @@ uint16 rs_foster_4_2[] = { 115, C_DIR, 2, - 65535, + 65535 }; uint16 screen0_high_logic[] = { @@ -5322,7 +5335,7 @@ uint16 screen0_high_logic[] = { 4344, ID_TOP_BARREL, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 fan6_seq[] = { @@ -5339,7 +5352,7 @@ uint16 fan6_seq[] = { 368, 156, 3, - 0, + 0 }; uint16 fexit_opens[] = { @@ -5356,7 +5369,7 @@ uint16 fexit_opens[] = { 1, 1, 3, - 0, + 0 }; uint16 fost_push_knob[] = { @@ -5388,7 +5401,7 @@ uint16 fost_push_knob[] = { 1, 1, 0, - 0, + 0 }; uint16 lazer_run_seq[] = { @@ -5405,7 +5418,7 @@ uint16 lazer_run_seq[] = { 1, 1, 7, - 0, + 0 }; uint16 try_to_open_r0[] = { @@ -5452,7 +5465,7 @@ uint16 try_to_open_r0[] = { 1, 1, 0, - 0, + 0 }; uint16 fast_list_cut2[] = { @@ -5460,7 +5473,7 @@ uint16 fast_list_cut2[] = { 65, 66, 162, - 0, + 0 }; uint16 knob_down[] = { @@ -5474,7 +5487,7 @@ uint16 knob_down[] = { 1, 1, 3, - 0, + 0 }; uint16 chip_list_sc0[] = { @@ -5498,7 +5511,7 @@ uint16 chip_list_sc0[] = { 66, 75, 23, - 0, + 0 }; uint16 sc0_cut_logic[] = { @@ -5525,7 +5538,7 @@ uint16 sc0_cut_logic[] = { ID_CAR_UP, ID_CAR_DOWN, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; Compact lazer_gun = { @@ -5557,6 +5570,7 @@ Compact lazer_gun = { C_BASE_MODE, // mode LAZER_GUN_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 up_stairs2[] = { @@ -5712,7 +5726,7 @@ uint16 up_stairs2[] = { 166, 49, 0, - 0, + 0 }; uint16 barrel_down_seq[] = { @@ -5765,7 +5779,7 @@ uint16 barrel_down_seq[] = { 270, 201, 15, - 0, + 0 }; uint16 daft_seq[] = { @@ -5945,7 +5959,7 @@ uint16 daft_seq[] = { 268, 36, 0, - 0, + 0 }; uint16 down_stairs2[] = { @@ -6101,7 +6115,7 @@ uint16 down_stairs2[] = { 296, 31, 0, - 0, + 0 }; uint16 joey_jump_seq[] = { @@ -6293,7 +6307,7 @@ uint16 joey_jump_seq[] = { 172, 0, 0, - 0, + 0 }; uint16 fost_lean_seq[] = { @@ -6383,7 +6397,7 @@ uint16 fost_lean_seq[] = { 201, 11, 0, - 0, + 0 }; uint16 joey_wake_seq[] = { @@ -6476,7 +6490,7 @@ uint16 joey_wake_seq[] = { 291, 10, 0, - 0, + 0 }; uint16 low_lift_down_seq2[] = { @@ -6517,7 +6531,7 @@ uint16 low_lift_down_seq2[] = { 250, 156, 0, - 0, + 0 }; uint16 lazer_start_seq[] = { @@ -6534,7 +6548,7 @@ uint16 lazer_start_seq[] = { 1, 1, 3, - 0, + 0 }; uint16 get_the_bar[] = { @@ -6683,7 +6697,7 @@ uint16 get_the_bar[] = { 1, 1, 9, - 0, + 0 }; uint16 fan4_seq[] = { @@ -6703,7 +6717,7 @@ uint16 fan4_seq[] = { 428, 216, 4, - 0, + 0 }; uint16 tv_seq[] = { @@ -6733,7 +6747,7 @@ uint16 tv_seq[] = { 190, 7, 0, - 0, + 0 }; uint16 bolt2_seq[] = { @@ -6747,7 +6761,7 @@ uint16 bolt2_seq[] = { 296, 239, 2, - 0, + 0 }; Compact fan6 = { @@ -6779,6 +6793,7 @@ Compact fan6 = { C_BASE_MODE, // mode FAN6_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 jobs_pull_knob[] = { @@ -6798,7 +6813,7 @@ uint16 jobs_pull_knob[] = { 1, 1, 3, - 0, + 0 }; uint16 convey_seq[] = { @@ -6815,7 +6830,7 @@ uint16 convey_seq[] = { 250, 268, 3, - 0, + 0 }; uint16 fan5_seq[] = { @@ -6835,7 +6850,7 @@ uint16 fan5_seq[] = { 374, 165, 4, - 0, + 0 }; uint32 *grid2 = 0; @@ -6851,7 +6866,7 @@ uint16 guard_lean_out[] = { 1, 1, 2, - 0, + 0 }; uint32 *c101 = 0; @@ -6900,7 +6915,7 @@ uint16 put_bar_away[] = { 1, 1, 6, - 0, + 0 }; uint16 fan3_seq[] = { @@ -6917,7 +6932,7 @@ uint16 fan3_seq[] = { 229, 137, 3, - 0, + 0 }; uint16 s1_pal[] = { @@ -7304,7 +7319,7 @@ uint16 s1_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 eye_shoot[] = { @@ -7327,7 +7342,7 @@ uint16 eye_shoot[] = { 1, 1, 2, - 0, + 0 }; uint16 furnace_door_open[] = { @@ -7368,7 +7383,7 @@ uint16 furnace_door_open[] = { 398, 222, 11, - 0, + 0 }; uint16 ss_smokes_4[] = { @@ -7428,7 +7443,7 @@ uint16 ss_smokes_4[] = { 221, 8, 0, - 0, + 0 }; Compact fan5 = { @@ -7460,6 +7475,7 @@ Compact fan5 = { C_BASE_MODE, // mode FAN5_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 jobs_close[] = { @@ -7491,7 +7507,7 @@ uint16 jobs_close[] = { 1, 1, 0, - 0, + 0 }; uint16 cup_open_seq[] = { @@ -7505,7 +7521,7 @@ uint16 cup_open_seq[] = { 1, 1, 3, - 0, + 0 }; uint16 guard_lean_back[] = { @@ -7519,7 +7535,7 @@ uint16 guard_lean_back[] = { 1, 1, 0, - 0, + 0 }; uint16 ss_kick_2[] = { @@ -7536,7 +7552,7 @@ uint16 ss_kick_2[] = { 1, 1, 10, - 0, + 0 }; uint16 shot1_seq[] = { @@ -7640,7 +7656,7 @@ uint16 shot1_seq[] = { 376, 249, 23, - 0, + 0 }; uint16 fexit_closes[] = { @@ -7654,7 +7670,7 @@ uint16 fexit_closes[] = { 1, 1, 0, - 0, + 0 }; uint16 low_lift_down_seq3[] = { @@ -7695,7 +7711,7 @@ uint16 low_lift_down_seq3[] = { 250, 210, 0, - 0, + 0 }; uint16 rs_restart_barrel[] = { @@ -7707,7 +7723,7 @@ uint16 rs_restart_barrel[] = { 240, C_FRAME, 155*64, - 65535, + 65535 }; uint16 open_r0[] = { @@ -7746,7 +7762,7 @@ uint16 open_r0[] = { 214, 0, 0, - 0, + 0 }; uint16 rs_foster_2_4[] = { @@ -7760,7 +7776,7 @@ uint16 rs_foster_2_4[] = { ID_S4_FLOOR, C_DIR, 3, - 65535, + 65535 }; uint16 ss_shoot_seq[] = { @@ -7817,7 +7833,7 @@ uint16 ss_shoot_seq[] = { 261, 16, 0, - 0, + 0 }; uint16 shut_r1[] = { @@ -7849,7 +7865,7 @@ uint16 shut_r1[] = { 227, 194, 8, - 0, + 0 }; uint16 down_stairs[] = { @@ -8046,7 +8062,7 @@ uint16 down_stairs[] = { 212, 240, 63, - 0, + 0 }; uint16 barrel_seq[] = { @@ -8069,7 +8085,7 @@ uint16 barrel_seq[] = { 264, 240, 5, - 0, + 0 }; uint16 jobs_scratch[] = { @@ -8135,7 +8151,7 @@ uint16 jobs_scratch[] = { 191, 0, 0, - 0, + 0 }; uint16 unload_seq2[] = { @@ -8155,7 +8171,7 @@ uint16 unload_seq2[] = { 1, 1, 18, - 0, + 0 }; uint16 rs_foster_0_2[] = { @@ -8171,7 +8187,7 @@ uint16 rs_foster_0_2[] = { 3, C_FRAME, 46+12*64, - 65535, + 65535 }; uint16 r1_closes[] = { @@ -8203,13 +8219,13 @@ uint16 r1_closes[] = { 1, 1, 9, - 0, + 0 }; uint16 rs_convey[] = { C_STATUS, ST_LOGIC+ST_RECREATE+ST_NO_VMASK, - 65535, + 65535 }; uint16 jobs_push_knob[] = { @@ -8229,7 +8245,7 @@ uint16 jobs_push_knob[] = { 1, 1, 0, - 0, + 0 }; uint16 knob_up[] = { @@ -8243,7 +8259,7 @@ uint16 knob_up[] = { 1, 1, 0, - 0, + 0 }; uint16 crouch_talk[] = { @@ -8381,7 +8397,7 @@ uint16 crouch_talk[] = { 265, 192, 0, - 0, + 0 }; uint16 shot2_seq[] = { @@ -8434,7 +8450,7 @@ uint16 shot2_seq[] = { 373, 273, 15, - 0, + 0 }; uint16 joey_fly2[] = { @@ -8632,7 +8648,7 @@ uint16 joey_fly2[] = { 246, 15, 0, - 0, + 0 }; uint16 jobs_key_seq[] = { @@ -8665,7 +8681,7 @@ uint16 jobs_key_seq[] = { 198, 0, 0, - 0, + 0 }; uint16 rs_mega_2_0[] = { @@ -8687,7 +8703,7 @@ uint16 rs_mega_2_0[] = { 8, C_MOUSE_SIZE_Y, 28, - 65535, + 65535 }; uint16 uncrouch_seq[] = { @@ -8710,7 +8726,7 @@ uint16 uncrouch_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 fost_must_close[] = { @@ -8742,7 +8758,7 @@ uint16 fost_must_close[] = { 1, 1, 0, - 0, + 0 }; uint16 joey_fly1[] = { @@ -8940,7 +8956,7 @@ uint16 joey_fly1[] = { 201, 7, 0, - 0, + 0 }; uint16 lazer_gun_seq[] = { @@ -8958,7 +8974,7 @@ uint16 lazer_gun_seq[] = { 247, 3, 0, - 0, + 0 }; uint16 rs_mega_0_2[] = { @@ -8980,7 +8996,7 @@ uint16 rs_mega_0_2[] = { 32, C_MOUSE_SIZE_Y, 48, - 65535, + 65535 }; Compact fan2 = { @@ -9012,6 +9028,7 @@ Compact fan2 = { C_BASE_MODE, // mode FAN2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 fan2_seq[] = { @@ -9025,7 +9042,7 @@ uint16 fan2_seq[] = { 255, 137, 2, - 0, + 0 }; uint32 *grid0 = 0; @@ -9302,7 +9319,7 @@ void *data_1[] = { &car_up, car_up_seq, &car_down, - car_down_seq, + car_down_seq }; }; // namespace SkyCompact diff --git a/sky/compacts/101comp.h b/sky/compacts/101comp.h index ebf32cf0da..801b1d954f 100644 --- a/sky/compacts/101comp.h +++ b/sky/compacts/101comp.h @@ -56,6 +56,7 @@ Compact cancel_button = { C_BASE_MODE, // mode FS_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact button_4 = { @@ -87,6 +88,7 @@ Compact button_4 = { C_BASE_MODE, // mode FS_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact full_screen = { @@ -118,6 +120,7 @@ Compact full_screen = { C_BASE_MODE, // mode FULL_SCREEN_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact button_5 = { @@ -149,6 +152,7 @@ Compact button_5 = { C_BASE_MODE, // mode FS_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s101_logic[] = { @@ -167,7 +171,7 @@ uint16 s101_logic[] = { 132, 173, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; Compact button_7 = { @@ -199,6 +203,7 @@ Compact button_7 = { C_BASE_MODE, // mode FS_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s101_mouse[] = { @@ -214,7 +219,7 @@ uint16 s101_mouse[] = { 131, 132, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact button_1 = { @@ -246,6 +251,7 @@ Compact button_1 = { C_BASE_MODE, // mode FS_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s101_pal[] = { @@ -632,7 +638,7 @@ uint16 s101_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact button_0 = { @@ -664,6 +670,7 @@ Compact button_0 = { C_BASE_MODE, // mode FS_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact button_9 = { @@ -695,6 +702,7 @@ Compact button_9 = { C_BASE_MODE, // mode FS_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact button_8 = { @@ -726,6 +734,7 @@ Compact button_8 = { C_BASE_MODE, // mode FS_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact retina_scan = { @@ -757,6 +766,7 @@ Compact retina_scan = { C_BASE_MODE, // mode FS_RETINA_SCAN_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact button_6 = { @@ -788,6 +798,7 @@ Compact button_6 = { C_BASE_MODE, // mode FS_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact button_3 = { @@ -819,6 +830,7 @@ Compact button_3 = { C_BASE_MODE, // mode FS_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact button_2 = { @@ -850,6 +862,7 @@ Compact button_2 = { C_BASE_MODE, // mode FS_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s101_chip_list[] = { @@ -866,7 +879,7 @@ uint16 s101_chip_list[] = { 149+DISK_1, 150+DISK_1, 151+DISK_1, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/102comp.h b/sky/compacts/102comp.h index 03a18588aa..92d2b507a4 100644 --- a/sky/compacts/102comp.h +++ b/sky/compacts/102comp.h @@ -35,7 +35,7 @@ uint16 restore_seq[] = { 1, 1, 0, - 0, + 0 }; Compact restore_butt = { @@ -67,6 +67,7 @@ Compact restore_butt = { C_BASE_MODE, // mode RESTORE_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s102_logic[] = { @@ -75,7 +76,7 @@ uint16 s102_logic[] = { 164, 175, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 exit_seq[] = { @@ -86,7 +87,7 @@ uint16 exit_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 restart_seq[] = { @@ -97,7 +98,7 @@ uint16 restart_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 s102_mouse[] = { @@ -105,7 +106,7 @@ uint16 s102_mouse[] = { 164, 175, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact exit_butt = { @@ -137,6 +138,7 @@ Compact exit_butt = { C_BASE_MODE, // mode EXIT_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s102_pal[] = { @@ -523,7 +525,7 @@ uint16 s102_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 s102_chip_list[] = { @@ -531,7 +533,7 @@ uint16 s102_chip_list[] = { 181, 182, 183, - 0, + 0 }; Compact restart_butt = { @@ -563,6 +565,7 @@ Compact restart_butt = { C_BASE_MODE, // mode RESTART_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/10comp.h b/sky/compacts/10comp.h index 58deba3cee..049da99892 100644 --- a/sky/compacts/10comp.h +++ b/sky/compacts/10comp.h @@ -155,7 +155,7 @@ uint16 liyt_4_seq[] = { 128, 147, 2, - 0, + 0 }; uint16 litebank_seq[] = { @@ -286,7 +286,7 @@ uint16 litebank_seq[] = { 226, 198, 4, - 0, + 0 }; uint16 rs_foster_from_linc[] = { @@ -302,7 +302,7 @@ uint16 rs_foster_from_linc[] = { 10, C_STATUS, ST_SORT+ST_RECREATE+ST_LOGIC+ST_AR_PRIORITY+ST_GRID_PLOT+ST_COLLISION, - 65535, + 65535 }; uint16 stand_10_seq[] = { @@ -337,7 +337,7 @@ uint16 stand_10_seq[] = { 223, 226, 9, - 0, + 0 }; uint16 pod_up[] = { @@ -489,7 +489,7 @@ uint16 pod_up[] = { 204, 181, 0, - 0, + 0 }; uint16 rs_foster_11_10[] = { @@ -501,7 +501,7 @@ uint16 rs_foster_11_10[] = { 10, C_PLACE, ID_S10_FLOOR, - 65535, + 65535 }; uint16 lift_10_close[] = { @@ -536,7 +536,7 @@ uint16 lift_10_close[] = { 1, 1, 0, - 0, + 0 }; uint16 s10_floor_table[] = { @@ -558,7 +558,7 @@ uint16 s10_floor_table[] = { GT_SCANNER_10, ID_LIFT_10, GT_DOOR_10, - 65535, + 65535 }; uint16 monitor_10_seq[] = { @@ -614,7 +614,7 @@ uint16 monitor_10_seq[] = { 322, 229, 16, - 0, + 0 }; uint16 sit_10_seq[] = { @@ -649,7 +649,7 @@ uint16 sit_10_seq[] = { 207, 225, 8, - 0, + 0 }; Compact lift_slot_10 = { @@ -671,6 +671,17 @@ Compact lift_slot_10 = { 366-361, // mouseSize_x 258-245, // mouseSize_y SLOT_10_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 scanline_seq[] = { @@ -780,7 +791,7 @@ uint16 scanline_seq[] = { 1, 1, 0, - 0, + 0 }; Compact s10_floor = { @@ -802,6 +813,17 @@ Compact s10_floor = { 320, // mouseSize_x (312-264)-1, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_foster_10_11[] = { @@ -813,7 +835,7 @@ uint16 rs_foster_10_11[] = { 11, C_PLACE, ID_S11_FLOOR, - 65535, + 65535 }; Compact terminal_10 = { @@ -835,6 +857,17 @@ Compact terminal_10 = { 26, // mouseSize_x 308-265, // mouseSize_y TERMINAL_10_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 linc_card_seq[] = { @@ -866,7 +899,7 @@ uint16 linc_card_seq[] = { 224, 224, 0, - 0, + 0 }; uint16 liyt_1_seq[] = { @@ -901,7 +934,7 @@ uint16 liyt_1_seq[] = { 413, 270, 1, - 0, + 0 }; uint16 fsit_talk_seq[] = { @@ -1123,7 +1156,7 @@ uint16 fsit_talk_seq[] = { 207, 225, 3, - 0, + 0 }; Compact scanner_10 = { @@ -1155,6 +1188,7 @@ Compact scanner_10 = { C_BASE_MODE, // mode SCANNER_10_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact pod_light = { @@ -1186,6 +1220,7 @@ Compact pod_light = { C_BASE_MODE, // mode POD_LIGHT_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact pod = { @@ -1217,6 +1252,7 @@ Compact pod = { C_BASE_MODE, // mode POD_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact fake_floor_10 = { @@ -1237,6 +1273,18 @@ Compact fake_floor_10 = { 0, // mouseRel_y 320, // mouseSize_x 12, // mouseSize_y + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 lift_10_open[] = { @@ -1271,7 +1319,7 @@ uint16 lift_10_open[] = { 1, 1, 10, - 0, + 0 }; uint16 linc_10_table[] = { @@ -1291,7 +1339,7 @@ uint16 linc_10_table[] = { GT_FLOOR_FROM_CHAIR10, ID_LINC_10, RET_OK, - 65535, + 65535 }; Compact linc_10 = { @@ -1313,6 +1361,17 @@ Compact linc_10 = { 231-203, // mouseSize_x 269-222, // mouseSize_y LINC_10_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s10_logic[] = { @@ -1327,7 +1386,7 @@ uint16 s10_logic[] = { ID_LIYT_4, ID_LITEBANK, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 liyt_2_seq[] = { @@ -1353,7 +1412,7 @@ uint16 liyt_2_seq[] = { 409, 274, 1, - 0, + 0 }; uint16 s10_chip_list[] = { @@ -1376,7 +1435,7 @@ uint16 s10_chip_list[] = { 31+DISK_1, 32+DISK_1, 72+DISK_1, - 0, + 0 }; uint16 pod_down[] = { @@ -1501,7 +1560,7 @@ uint16 pod_down[] = { 204, 216, 1, - 0, + 0 }; Compact monitor_10 = { @@ -1533,6 +1592,7 @@ Compact monitor_10 = { C_BASE_MODE, // mode ANIMATE_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 liyt_3_seq[] = { @@ -1663,7 +1723,7 @@ uint16 liyt_3_seq[] = { 325, 170, 0, - 0, + 0 }; Compact lift_10 = { @@ -1695,6 +1755,7 @@ Compact lift_10 = { C_BASE_MODE, // mode LIFT_10_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact litebank = { @@ -1726,6 +1787,7 @@ Compact litebank = { C_BASE_MODE, // mode ANIMATE_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 pod_light_seq[] = { @@ -1760,7 +1822,7 @@ uint16 pod_light_seq[] = { 239, 244, 0, - 0, + 0 }; uint32 *grid10 = 0; @@ -1803,7 +1865,7 @@ uint16 card2_seq[] = { 328, 224, 0, - 0, + 0 }; Compact liyt_3 = { @@ -1835,6 +1897,7 @@ Compact liyt_3 = { C_BASE_MODE, // mode ANIMATE_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact liyt_2 = { @@ -1866,6 +1929,7 @@ Compact liyt_2 = { C_BASE_MODE, // mode ANIMATE_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s10_pal[] = { @@ -2252,7 +2316,7 @@ uint16 s10_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 s10_mouse[] = { @@ -2267,7 +2331,7 @@ uint16 s10_mouse[] = { ID_FAKE_FLOOR_10, ID_S10_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact liyt_4 = { @@ -2299,6 +2363,7 @@ Compact liyt_4 = { C_BASE_MODE, // mode ANIMATE_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact left_exit_10 = { @@ -2320,6 +2385,17 @@ Compact left_exit_10 = { 171-154, // mouseSize_x 288-226, // mouseSize_y EL10_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact liyt_1 = { @@ -2351,6 +2427,7 @@ Compact liyt_1 = { C_BASE_MODE, // mode ANIMATE_LOGIC, // baseSub 0, // baseSub_off + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/11comp.h b/sky/compacts/11comp.h index e89f8bf597..df94bef56c 100644 --- a/sky/compacts/11comp.h +++ b/sky/compacts/11comp.h @@ -46,6 +46,17 @@ Compact slat_3 = { 3, // mouseSize_x 7, // mouseSize_y SLAT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 fallin_seq[] = { @@ -77,7 +88,7 @@ uint16 fallin_seq[] = { 306, 259, 8, - 0, + 0 }; uint16 s11_mouse[] = { @@ -99,7 +110,7 @@ uint16 s11_mouse[] = { ID_S11_FLOOR, ID_SPY_11, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 s11_pal[] = { @@ -486,7 +497,7 @@ uint16 s11_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact locker_11 = { @@ -518,6 +529,7 @@ Compact locker_11 = { C_BASE_MODE, // mode LOCKER_11_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 locker_11_open[] = { @@ -546,7 +558,7 @@ uint16 locker_11_open[] = { 1, 1, 8, - 0, + 0 }; uint16 bits2_seq[] = { @@ -566,7 +578,7 @@ uint16 bits2_seq[] = { 219, 245, 4, - 0, + 0 }; Compact soccer_2 = { @@ -588,6 +600,17 @@ Compact soccer_2 = { 271-257, // mouseSize_x 260-217, // mouseSize_y SOCCER_1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 usecard_11_seq[] = { @@ -619,7 +642,7 @@ uint16 usecard_11_seq[] = { 258, 173, 0, - 0, + 0 }; Compact bits = { @@ -651,6 +674,7 @@ Compact bits = { C_BASE_MODE, // mode BITS_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact cable_fall = { @@ -682,6 +706,7 @@ Compact cable_fall = { C_BASE_MODE, // mode CABLE_FALL_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact soccer_4 = { @@ -703,6 +728,17 @@ Compact soccer_4 = { 307-291, // mouseSize_x 260-217, // mouseSize_y SOCCER_1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s11_floor_table[] = { @@ -738,7 +774,7 @@ uint16 s11_floor_table[] = { GT_RIGHT_EXIT_11, 0, S11_LEFT_ON, - 65535, + 65535 }; Compact soccer_1 = { @@ -760,6 +796,17 @@ Compact soccer_1 = { 255-238, // mouseSize_x 260-217, // mouseSize_y SOCCER_1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_foster_1_11[] = { @@ -771,7 +818,7 @@ uint16 rs_foster_1_11[] = { 11, C_PLACE, ID_S11_FLOOR, - 65535, + 65535 }; uint16 s11_logic[] = { @@ -784,7 +831,7 @@ uint16 s11_logic[] = { ID_SPY_11, ID_LOCKER_11, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 close_11_locker[] = { @@ -810,7 +857,7 @@ uint16 close_11_locker[] = { 1, 1, 0, - 0, + 0 }; uint16 s11_chip_list[] = { @@ -829,7 +876,7 @@ uint16 s11_chip_list[] = { 14+DISK_1, 15+DISK_1, 85+DISK_1, - 0, + 0 }; Compact slat_1 = { @@ -851,6 +898,17 @@ Compact slat_1 = { 3, // mouseSize_x 7, // mouseSize_y SLAT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 locker_11_close[] = { @@ -879,7 +937,7 @@ uint16 locker_11_close[] = { 1, 1, 0, - 0, + 0 }; Compact bits2 = { @@ -911,6 +969,7 @@ Compact bits2 = { C_BASE_MODE, // mode BITS_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact slot_11 = { @@ -932,6 +991,17 @@ Compact slot_11 = { 3, // mouseSize_x 7, // mouseSize_y SLOT_11_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 bits_seq[] = { @@ -951,7 +1021,7 @@ uint16 bits_seq[] = { 266, 180, 4, - 0, + 0 }; Compact slat_4 = { @@ -973,6 +1043,17 @@ Compact slat_4 = { 3, // mouseSize_x 7, // mouseSize_y SLAT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 fallin2_seq[] = { @@ -1019,7 +1100,7 @@ uint16 fallin2_seq[] = { 317, 272, 13, - 0, + 0 }; uint16 smashed_window_seq[] = { @@ -1060,7 +1141,7 @@ uint16 smashed_window_seq[] = { 201, 153, 3, - 0, + 0 }; Compact spy_11 = { @@ -1092,6 +1173,7 @@ Compact spy_11 = { C_BASE_MODE, // mode SPY11_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact soccer_3 = { @@ -1113,6 +1195,17 @@ Compact soccer_3 = { 289-273, // mouseSize_x 260-217, // mouseSize_y SOCCER_1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 cable_fall1_seq[] = { @@ -1192,7 +1285,7 @@ uint16 cable_fall1_seq[] = { 195, 178, 22, - 0, + 0 }; Compact cable_fall2 = { @@ -1224,6 +1317,7 @@ Compact cable_fall2 = { C_BASE_MODE, // mode CABLE2_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact right_exit_11 = { @@ -1245,6 +1339,17 @@ Compact right_exit_11 = { 364-359, // mouseSize_x 282-223, // mouseSize_y ER11_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact smashed_window = { @@ -1276,6 +1381,7 @@ Compact smashed_window = { C_BASE_MODE, // mode SMASHED_WINDOW_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact soccer_5 = { @@ -1297,6 +1403,17 @@ Compact soccer_5 = { 343-327, // mouseSize_x 260-217, // mouseSize_y SOCCER_1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *grid11 = 0; @@ -1327,7 +1444,7 @@ uint16 open_11_locker[] = { 237, 184, 6, - 0, + 0 }; Compact slat_2 = { @@ -1349,6 +1466,17 @@ Compact slat_2 = { 3, // mouseSize_x 7, // mouseSize_y SLAT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 fallin3_seq[] = { @@ -1371,7 +1499,7 @@ uint16 fallin3_seq[] = { 314, 243, 5, - 0, + 0 }; Compact s11_floor = { @@ -1393,6 +1521,17 @@ Compact s11_floor = { 400-184, // mouseSize_x 4242, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 get_cable_11[] = { @@ -1439,7 +1578,7 @@ uint16 get_cable_11[] = { 293, 252, 0, - 0, + 0 }; uint16 cant_open_locker[] = { @@ -1462,7 +1601,7 @@ uint16 cant_open_locker[] = { 1, 1, 0, - 0, + 0 }; Compact slat_5 = { @@ -1484,6 +1623,17 @@ Compact slat_5 = { 3, // mouseSize_x 7, // mouseSize_y SLAT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 cable_fall2_seq[] = { @@ -1572,7 +1722,7 @@ uint16 cable_fall2_seq[] = { 209, 242, 13, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/12comp.h b/sky/compacts/12comp.h index 21ac1b3640..12ccf2b0ac 100644 --- a/sky/compacts/12comp.h +++ b/sky/compacts/12comp.h @@ -215,7 +215,7 @@ uint16 botbelt_seq[] = { 280, 295, 33, - 0, + 0 }; uint16 s12_floor_table[] = { @@ -247,7 +247,7 @@ uint16 s12_floor_table[] = { GT_L_TALK_12, ID_STD_RIGHT_TALK, GT_R_TALK_12, - 65535, + 65535 }; uint16 swap1_seq[] = { @@ -315,7 +315,7 @@ uint16 swap1_seq[] = { 248, 184, 19, - 0, + 0 }; uint16 rs_joey_start_12[] = { @@ -337,7 +337,7 @@ uint16 rs_joey_start_12[] = { ST_SORT+ST_RECREATE+ST_LOGIC+ST_GRID_PLOT+ST_COLLISION+ST_MOUSE, C_DIR, RIGHT, - 65535, + 65535 }; uint16 rs_lamb_start_fact[] = { @@ -351,7 +351,7 @@ uint16 rs_lamb_start_fact[] = { ID_S12_FLOOR, C_STATUS, ST_SORT+ST_RECREATE+ST_LOGIC+ST_GRID_PLOT+ST_COLLISION+ST_MOUSE, - 65535, + 65535 }; uint16 welder_seq[] = { @@ -383,7 +383,7 @@ uint16 welder_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 rs_foster_7_12[] = { @@ -395,7 +395,7 @@ uint16 rs_foster_7_12[] = { 12, C_PLACE, ID_S12_FLOOR, - 65535, + 65535 }; uint16 factory_spanner_seq[] = { @@ -457,7 +457,7 @@ uint16 factory_spanner_seq[] = { 239, 195, 12, - 0, + 0 }; uint16 pipes_seq[] = { @@ -648,7 +648,7 @@ uint16 pipes_seq[] = { 281, 206, 2, - 0, + 0 }; uint16 swap3_seq[] = { @@ -728,7 +728,7 @@ uint16 swap3_seq[] = { 220, 186, 19, - 0, + 0 }; Compact fact1_right_exit = { @@ -750,6 +750,17 @@ Compact fact1_right_exit = { 1000, // mouseSize_x 295-190, // mouseSize_y FACT1_EXIT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact pipes = { @@ -781,6 +792,7 @@ Compact pipes = { C_BASE_MODE, // mode STD_FACT_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact botbelt = { @@ -812,6 +824,7 @@ Compact botbelt = { C_BASE_MODE, // mode BOTBELT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 joey_list_12[] = { @@ -820,7 +833,7 @@ uint16 joey_list_12[] = { 256, 272, 1, - 0, + 0 }; Compact welder = { @@ -852,6 +865,7 @@ Compact welder = { C_BASE_MODE, // mode WELDER_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact factory_exit = { @@ -873,6 +887,17 @@ Compact factory_exit = { 190-171, // mouseSize_x 248-190, // mouseSize_y FACTORY_EXIT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *grid12 = 0; @@ -1261,7 +1286,7 @@ uint16 s12_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 cant_lift_seq[] = { @@ -1329,7 +1354,7 @@ uint16 cant_lift_seq[] = { 1, 1, 1, - 0, + 0 }; Compact topbelt = { @@ -1361,6 +1386,7 @@ Compact topbelt = { C_BASE_MODE, // mode STD_FACT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s12_fast_list[] = { @@ -1373,7 +1399,7 @@ uint16 s12_fast_list[] = { 14+DISK_3, 16+DISK_3, 91+DISK_3, - 0, + 0 }; uint16 s12_new_chip[] = { @@ -1391,7 +1417,7 @@ uint16 s12_new_chip[] = { 71+DISK_3+0X8000, 15+DISK_3, 92+DISK_3, - 0, + 0 }; Compact console_12 = { @@ -1413,6 +1439,17 @@ Compact console_12 = { 368-341, // mouseSize_x 6, // mouseSize_y CONSOLE_12_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 anita_walk_seq[] = { @@ -1540,7 +1577,7 @@ uint16 anita_walk_seq[] = { 425, 215, 21, - 0, + 0 }; uint16 anita_work_seq[] = { @@ -1740,7 +1777,7 @@ uint16 anita_work_seq[] = { 0X157, 0XB3, 0, - 0, + 0 }; uint16 anita_turn_seq[] = { @@ -1763,7 +1800,7 @@ uint16 anita_turn_seq[] = { 343, 178, 5, - 0, + 0 }; uint16 anita_turn_back[] = { @@ -1786,7 +1823,7 @@ uint16 anita_turn_back[] = { 1, 1, 0, - 0, + 0 }; uint16 rs_foster_12_7[] = { @@ -1798,7 +1835,7 @@ uint16 rs_foster_12_7[] = { 7, C_PLACE, ID_S7_FLOOR, - 65535, + 65535 }; uint16 s12_mouse[] = { @@ -1813,7 +1850,7 @@ uint16 s12_mouse[] = { ID_ANITA_SPY, ID_WELDER, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 s12_chip_list[] = { @@ -1833,7 +1870,7 @@ uint16 s12_chip_list[] = { 90+DISK_3+0X8000, 15+DISK_3, 92+DISK_3, - 0, + 0 }; Compact stump = { @@ -1855,6 +1892,17 @@ Compact stump = { 279-249, // mouseSize_x 230-208, // mouseSize_y STUMP_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 swap2_seq[] = { @@ -1895,7 +1943,7 @@ uint16 swap2_seq[] = { 235, 183, 11, - 0, + 0 }; Compact anita_spy = { @@ -1927,6 +1975,7 @@ Compact anita_spy = { C_BASE_MODE, // mode ANITA_SPY_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact s12_floor = { @@ -1948,6 +1997,17 @@ Compact s12_floor = { 320, // mouseSize_x 79, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s12_logic[] = { @@ -1973,7 +2033,7 @@ uint16 s12_logic[] = { ID_WELDER, ID_CABLE_7, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 topbelt_seq[] = { @@ -2164,7 +2224,7 @@ uint16 topbelt_seq[] = { 222, 180, 42, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/13comp.h b/sky/compacts/13comp.h index 756e1cb09e..887e169426 100644 --- a/sky/compacts/13comp.h +++ b/sky/compacts/13comp.h @@ -31,13 +31,13 @@ uint16 foreman_l_to_r[] = { 41-8+63*64, 40-8+63*64, 47-8+63*64, - 0, + 0 }; uint16 rs_foster[] = { C_STATUS, ST_SORT+ST_RECREATE+ST_LOGIC+ST_AR_PRIORITY+ST_GRID_PLOT+ST_COLLISION, - 65535, + 65535 }; uint16 gears_seq[] = { @@ -51,7 +51,7 @@ uint16 gears_seq[] = { 284, 291, 2, - 0, + 0 }; Compact fact2_exit_left = { @@ -73,6 +73,17 @@ Compact fact2_exit_left = { 11, // mouseSize_x 300, // mouseSize_y FACT2_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact fact_console = { @@ -104,6 +115,7 @@ Compact fact_console = { C_BASE_MODE, // mode FACT_CONSOLE_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact pipe1 = { @@ -135,12 +147,13 @@ Compact pipe1 = { C_BASE_MODE, // mode STD_FACT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 lite1_table[] = { ID_STD_RIGHT_TALK, GT_R_TALK_13, - 65535, + 65535 }; Compact sensor = { @@ -172,11 +185,12 @@ Compact sensor = { C_BASE_MODE, // mode SENSOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 foreman_l_to_d[] = { 41-8+63*64, - 0, + 0 }; uint16 foreman_st_up[] = { @@ -184,7 +198,7 @@ uint16 foreman_st_up[] = { 1, 1, 36, - 0, + 0 }; uint16 foreman_work_seq[] = { @@ -381,7 +395,7 @@ uint16 foreman_work_seq[] = { 259, 190, 16, - 0, + 0 }; uint16 nu_s13_chip[] = { @@ -407,7 +421,7 @@ uint16 nu_s13_chip[] = { 106+DISK_6, 17+DISK_3, 18+DISK_3, - 0, + 0 }; uint16 rs_storeman[] = { @@ -431,7 +445,7 @@ uint16 rs_storeman[] = { L_SCRIPT, C_STATUS, ST_SORT+ST_RECREATE+ST_LOGIC+ST_GRID_PLOT+ST_MOUSE, - 65535, + 65535 }; uint16 foreman_left[] = { @@ -467,7 +481,7 @@ uint16 foreman_left[] = { 23+63*64, 65532, 0, - 0, + 0 }; uint16 closecoat[] = { @@ -499,7 +513,7 @@ uint16 closecoat[] = { 1, 1, 0, - 0, + 0 }; uint16 pipe1_seq[] = { @@ -693,14 +707,14 @@ uint16 pipe1_seq[] = { 0XEC, 0XC4, 0, - 0, + 0 }; uint16 foreman_r_to_l[] = { 45-8+63*64, 44-8+63*64, 43-8+63*64, - 0, + 0 }; Compact fact2_exit_right = { @@ -722,11 +736,22 @@ Compact fact2_exit_right = { 16, // mouseSize_x 267-174, // mouseSize_y FACT2_RIGHT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 foreman_l_to_u[] = { 43-8+63*64, - 0, + 0 }; Compact lite1 = { @@ -758,6 +783,7 @@ Compact lite1 = { C_BASE_MODE, // mode ANIMATE_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s13_floor_table[] = { @@ -795,7 +821,7 @@ uint16 s13_floor_table[] = { GT_SENSORS, ID_FACT_CONSOLE, GT_FACT_CONSOLE, - 65535, + 65535 }; uint16 fsearch_seq[] = { @@ -839,7 +865,7 @@ uint16 fsearch_seq[] = { 367, 163, 12, - 0, + 0 }; Compact fact2_store_exit = { @@ -861,6 +887,17 @@ Compact fact2_store_exit = { 8, // mouseSize_x 238-175, // mouseSize_y FACT2_STORE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact pipe4 = { @@ -892,13 +929,14 @@ Compact pipe4 = { C_BASE_MODE, // mode STD_FACT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 foreman_u_to_d[] = { 43-8+63*64, 42-8+63*64, 41-8+63*64, - 0, + 0 }; uint16 foreman_right[] = { @@ -934,7 +972,7 @@ uint16 foreman_right[] = { 31+63*64, 4, 0, - 0, + 0 }; uint16 belts2_seq[] = { @@ -1125,7 +1163,7 @@ uint16 belts2_seq[] = { 368, 184, 41, - 0, + 0 }; uint16 forfrisk_seq[] = { @@ -1184,13 +1222,13 @@ uint16 forfrisk_seq[] = { 243, 163, 0, - 0, + 0 }; uint16 rs_foreman[] = { C_STATUS, ST_SORT+ST_RECREATE+ST_LOGIC+ST_GRID_PLOT+ST_MOUSE+ST_COLLISION, - 65535, + 65535 }; uint16 pipe2_seq[] = { @@ -1384,7 +1422,7 @@ uint16 pipe2_seq[] = { 0X120, 0XC9, 0, - 0, + 0 }; uint16 rs_foster_13_12[] = { @@ -1394,7 +1432,7 @@ uint16 rs_foster_13_12[] = { 12, C_PLACE, ID_S12_FLOOR, - 65535, + 65535 }; Compact s13_floor = { @@ -1416,6 +1454,17 @@ Compact s13_floor = { 320, // mouseSize_x 71, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact cogs = { @@ -1447,11 +1496,12 @@ Compact cogs = { C_BASE_MODE, // mode STD_FACT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 foreman_r_to_u[] = { 45-8+63*64, - 0, + 0 }; Compact belts2 = { @@ -1483,11 +1533,12 @@ Compact belts2 = { C_BASE_MODE, // mode STD_FACT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 foreman_d_to_l[] = { 41-8+63*64, - 0, + 0 }; uint16 s13_chip_list[] = { @@ -1512,7 +1563,7 @@ uint16 s13_chip_list[] = { 143+DISK_3+0X8000, 17+DISK_3, 18+DISK_3, - 0, + 0 }; uint16 foreman_st_talk[] = { @@ -1520,7 +1571,7 @@ uint16 foreman_st_talk[] = { 1, 1, 0, - 0, + 0 }; uint16 fact_console_dead[] = { @@ -1546,7 +1597,7 @@ uint16 fact_console_dead[] = { 1, 1, 6, - 0, + 0 }; uint16 foreman_st_down[] = { @@ -1554,7 +1605,7 @@ uint16 foreman_st_down[] = { 1, 1, 32, - 0, + 0 }; Compact lite2 = { @@ -1586,6 +1637,7 @@ Compact lite2 = { C_BASE_MODE, // mode ANIMATE_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact gears = { @@ -1617,6 +1669,7 @@ Compact gears = { C_BASE_MODE, // mode STD_FACT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 fost_cog_seq[] = { @@ -1693,7 +1746,7 @@ uint16 fost_cog_seq[] = { 288, 184, 0, - 0, + 0 }; uint16 cogs_seq[] = { @@ -1707,7 +1760,7 @@ uint16 cogs_seq[] = { 294, 218, 2, - 0, + 0 }; Compact pipe3 = { @@ -1739,6 +1792,7 @@ Compact pipe3 = { C_BASE_MODE, // mode STD_FACT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 lite2_seq[] = { @@ -1773,7 +1827,7 @@ uint16 lite2_seq[] = { 417, 206, 1, - 0, + 0 }; Compact belts1 = { @@ -1805,6 +1859,7 @@ Compact belts1 = { C_BASE_MODE, // mode STD_FACT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s13_logic[] = { @@ -1834,7 +1889,7 @@ uint16 s13_logic[] = { ID_FACT2_SPY, 177, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 s13_mouse[] = { @@ -1849,7 +1904,7 @@ uint16 s13_mouse[] = { ID_FACT_CONSOLE, ID_S13_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sensors = { @@ -1871,6 +1926,17 @@ Compact sensors = { 229-212, // mouseSize_x 241-195, // mouseSize_y SENSORS_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 fact_console_seq[] = { @@ -2247,7 +2313,7 @@ uint16 fact_console_seq[] = { 418, 196, 16, - 0, + 0 }; uint16 foreman_down[] = { @@ -2283,7 +2349,7 @@ uint16 foreman_down[] = { 15+63*64, 0, 2, - 0, + 0 }; uint8 foreman_auto[64]; @@ -2321,7 +2387,7 @@ uint16 foreman_up[] = { 7+63*64, 0, 65534, - 0, + 0 }; uint16 foreman_st_left[] = { @@ -2329,7 +2395,7 @@ uint16 foreman_st_left[] = { 1, 1, 34, - 0, + 0 }; uint16 foreman_st_right[] = { @@ -2337,34 +2403,34 @@ uint16 foreman_st_right[] = { 1, 1, 38, - 0, + 0 }; uint16 foreman_u_to_l[] = { 43-8+63*64, - 0, + 0 }; uint16 foreman_u_to_r[] = { 45-8+63*64, - 0, + 0 }; uint16 foreman_d_to_u[] = { 47-8+63*64, 46-8+63*64, 45-8+63*64, - 0, + 0 }; uint16 foreman_d_to_r[] = { 47-8+63*64, - 0, + 0 }; uint16 foreman_r_to_d[] = { 47-8+63*64, - 0, + 0 }; TurnTable foreman_turnTable0 = { @@ -2402,7 +2468,7 @@ TurnTable foreman_turnTable0 = { 0, 0, 0 - }, + } }; MegaSet foreman_megaSet0 = { @@ -2419,7 +2485,7 @@ MegaSet foreman_megaSet0 = { foreman_st_left, // standLeft foreman_st_right, // standRight foreman_st_talk, // standTalk - &foreman_turnTable0, + &foreman_turnTable0 }; ExtCompact foreman_ext = { @@ -2449,6 +2515,9 @@ ExtCompact foreman_ext = { foreman_auto, // animScratch 0, // megaSet &foreman_megaSet0, + 0, + 0, + 0 }; Compact foreman = { @@ -2480,7 +2549,7 @@ Compact foreman = { 0, // mode FOREMAN_LOGIC, // baseSub 0, // baseSub_off - &foreman_ext, + &foreman_ext }; uint16 lite1_seq[] = { @@ -2503,7 +2572,7 @@ uint16 lite1_seq[] = { 417, 203, 1, - 0, + 0 }; uint16 pipe3_seq[] = { @@ -2697,7 +2766,7 @@ uint16 pipe3_seq[] = { 0X146, 0XC4, 0, - 0, + 0 }; uint16 opencoat_seq[] = { @@ -2729,7 +2798,7 @@ uint16 opencoat_seq[] = { 198, 163, 8, - 0, + 0 }; uint16 sensor_seq[] = { @@ -2743,7 +2812,7 @@ uint16 sensor_seq[] = { 222, 194, 2, - 0, + 0 }; Compact fact2_spy_and_window = { @@ -2775,6 +2844,7 @@ Compact fact2_spy_and_window = { C_BASE_MODE, // mode FACT2_SPY_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 belts1_seq[] = { @@ -2965,7 +3035,7 @@ uint16 belts1_seq[] = { 217, 174, 41, - 0, + 0 }; Compact pipe2 = { @@ -2997,6 +3067,7 @@ Compact pipe2 = { C_BASE_MODE, // mode STD_FACT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s13_pal[] = { @@ -3383,7 +3454,7 @@ uint16 s13_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 new_13_chip[] = { @@ -3405,7 +3476,7 @@ uint16 new_13_chip[] = { 89+DISK_3, 17+DISK_3, 18+DISK_3, - 0, + 0 }; uint32 *grid13 = 0; @@ -3419,7 +3490,7 @@ uint16 rs_foster_12_13[] = { 13, C_PLACE, ID_S13_FLOOR, - 65535, + 65535 }; uint16 s13_fast_list[] = { @@ -3438,7 +3509,7 @@ uint16 s13_fast_list[] = { 57+DISK_3, 58+DISK_3, 59+DISK_3, - 0, + 0 }; uint16 pipe4_seq[] = { @@ -3632,7 +3703,7 @@ uint16 pipe4_seq[] = { 0X14C, 0X123, 0, - 0, + 0 }; uint16 armsup_seq[] = { @@ -3691,7 +3762,7 @@ uint16 armsup_seq[] = { 400, 246, 0, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/14comp.h b/sky/compacts/14comp.h index 43b4c91ed6..4b28155b5a 100644 --- a/sky/compacts/14comp.h +++ b/sky/compacts/14comp.h @@ -36,7 +36,7 @@ uint16 rs_foster_14_13[] = { 13, C_PLACE, ID_S13_FLOOR, - 65535, + 65535 }; uint16 rs_foster_13_14[] = { @@ -48,14 +48,14 @@ uint16 rs_foster_13_14[] = { 14, C_PLACE, ID_S14_FLOOR, - 65535, + 65535 }; uint16 radman_l_to_r[] = { 41+90*64, 40+90*64, 47+90*64, - 0, + 0 }; uint8 radman_auto[64]; @@ -101,7 +101,7 @@ uint16 radman_up[] = { 9+90*64, 0, 65534, - 0, + 0 }; uint16 radman_down[] = { @@ -145,7 +145,7 @@ uint16 radman_down[] = { 19+90*64, 0, 2, - 0, + 0 }; uint16 radman_left[] = { @@ -189,7 +189,7 @@ uint16 radman_left[] = { 29+90*64, 65532, 0, - 0, + 0 }; uint16 radman_right[] = { @@ -233,7 +233,7 @@ uint16 radman_right[] = { 39+90*64, 4, 0, - 0, + 0 }; uint16 radman_st_up[] = { @@ -241,7 +241,7 @@ uint16 radman_st_up[] = { 1, 0, 44, - 0, + 0 }; uint16 radman_st_down[] = { @@ -249,7 +249,7 @@ uint16 radman_st_down[] = { 1, 0, 40, - 0, + 0 }; uint16 radman_st_left[] = { @@ -257,7 +257,7 @@ uint16 radman_st_left[] = { 1, 0, 42, - 0, + 0 }; uint16 radman_st_right[] = { @@ -265,7 +265,7 @@ uint16 radman_st_right[] = { 1, 0, 46, - 0, + 0 }; uint16 radman_st_talk[] = { @@ -273,68 +273,68 @@ uint16 radman_st_talk[] = { 1, 0, 0, - 0, + 0 }; uint16 radman_u_to_d[] = { 43+90*64, 42+90*64, 41+90*64, - 0, + 0 }; uint16 radman_u_to_l[] = { 43+90*64, - 0, + 0 }; uint16 radman_u_to_r[] = { 45+90*64, - 0, + 0 }; uint16 radman_d_to_u[] = { 47+90*64, 46+90*64, 45+90*64, - 0, + 0 }; uint16 radman_d_to_l[] = { 41+90*64, - 0, + 0 }; uint16 radman_d_to_r[] = { 47+90*64, - 0, + 0 }; uint16 radman_l_to_u[] = { 43+90*64, - 0, + 0 }; uint16 radman_l_to_d[] = { 41+90*64, - 0, + 0 }; uint16 radman_r_to_u[] = { 45+90*64, - 0, + 0 }; uint16 radman_r_to_d[] = { 47+90*64, - 0, + 0 }; uint16 radman_r_to_l[] = { 45+90*64, 44+90*64, 43+90*64, - 0, + 0 }; TurnTable radman_turnTable0 = { @@ -372,7 +372,7 @@ TurnTable radman_turnTable0 = { 0, 0, 0 - }, + } }; MegaSet radman_megaSet0 = { @@ -389,7 +389,7 @@ MegaSet radman_megaSet0 = { radman_st_left, // standLeft radman_st_right, // standRight radman_st_talk, // standTalk - &radman_turnTable0, + &radman_turnTable0 }; ExtCompact radman_ext = { @@ -419,6 +419,9 @@ ExtCompact radman_ext = { radman_auto, // animScratch 0, // megaSet &radman_megaSet0, + 0, + 0, + 0 }; Compact radman = { @@ -450,7 +453,7 @@ Compact radman = { 0, // mode RADMAN_LOGIC, // baseSub 0, // baseSub_off - &radman_ext, + &radman_ext }; Compact locker2 = { @@ -482,6 +485,7 @@ Compact locker2 = { C_BASE_MODE, // mode LOCKER2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 start_joey_14[] = { @@ -503,7 +507,7 @@ uint16 start_joey_14[] = { ST_SORT+ST_RECREATE+ST_LOGIC+ST_GRID_PLOT+ST_COLLISION+ST_MOUSE, C_DIR, RIGHT, - 65535, + 65535 }; Compact fact3_exit_left = { @@ -525,6 +529,17 @@ Compact fact3_exit_left = { 11, // mouseSize_x 272-175, // mouseSize_y FACT3_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_anita_to_14[] = { @@ -540,7 +555,7 @@ uint16 rs_anita_to_14[] = { ANITA_WORK, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint16 s14_logic[] = { @@ -557,7 +572,7 @@ uint16 s14_logic[] = { ID_LIFT_S7, ID_LIFT7_LIGHT, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 close_locker_seq[] = { @@ -583,7 +598,7 @@ uint16 close_locker_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 locker_close_seq[] = { @@ -615,7 +630,7 @@ uint16 locker_close_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 s14_floor_table[] = { @@ -651,7 +666,7 @@ uint16 s14_floor_table[] = { GT_L_TALK_14, ID_STD_RIGHT_TALK, GT_R_TALK_14, - 65535, + 65535 }; Compact s14_floor = { @@ -673,6 +688,17 @@ Compact s14_floor = { 320, // mouseSize_x 71, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rad_open_locker[] = { @@ -701,7 +727,7 @@ uint16 rad_open_locker[] = { 237, 184, 6, - 0, + 0 }; uint16 change_back6[] = { @@ -796,7 +822,7 @@ uint16 change_back6[] = { 162, 190, 21, - 0, + 0 }; uint16 change1_seq[] = { @@ -891,7 +917,7 @@ uint16 change1_seq[] = { 162, 190, 26, - 0, + 0 }; uint16 change_back3[] = { @@ -923,7 +949,7 @@ uint16 change_back3[] = { 0XB1, 0XC2, 0, - 0, + 0 }; uint16 rs_foster_16_14[] = { @@ -935,7 +961,7 @@ uint16 rs_foster_16_14[] = { 14, C_PLACE, ID_S14_FLOOR, - 65535, + 65535 }; Compact console_14 = { @@ -957,6 +983,17 @@ Compact console_14 = { 250-216, // mouseSize_x 214-204, // mouseSize_y CONSOLE_14_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s14_pal[] = { @@ -1343,7 +1380,7 @@ uint16 s14_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint32 *grid14 = 0; @@ -1380,7 +1417,7 @@ uint16 change3_seq[] = { 170, 193, 8, - 0, + 0 }; uint16 change_back4[] = { @@ -1415,7 +1452,7 @@ uint16 change_back4[] = { 0XAA, 0XC1, 0, - 0, + 0 }; uint16 open_locker_seq[] = { @@ -1444,7 +1481,7 @@ uint16 open_locker_seq[] = { 237, 184, 6, - 0, + 0 }; uint16 change4_seq[] = { @@ -1476,7 +1513,7 @@ uint16 change4_seq[] = { 177, 194, 8, - 0, + 0 }; uint16 foster_give_seq[] = { @@ -1502,7 +1539,7 @@ uint16 foster_give_seq[] = { 1, 1, 0, - 0, + 0 }; Compact locker3 = { @@ -1534,6 +1571,7 @@ Compact locker3 = { C_BASE_MODE, // mode LOCKER3_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact rad_screen = { @@ -1555,6 +1593,17 @@ Compact rad_screen = { 307-292, // mouseSize_x 245-195, // mouseSize_y RAD_SCREEN_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 change5_seq[] = { @@ -1577,7 +1626,7 @@ uint16 change5_seq[] = { 171, 194, 5, - 0, + 0 }; Compact locker1 = { @@ -1609,6 +1658,7 @@ Compact locker1 = { C_BASE_MODE, // mode LOCKER1_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact coat = { @@ -1640,6 +1690,7 @@ Compact coat = { C_BASE_MODE, // mode COAT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 change_back5[] = { @@ -1662,7 +1713,7 @@ uint16 change_back5[] = { 0XAA, 0XC1, 4, - 0, + 0 }; Compact machine = { @@ -1684,6 +1735,17 @@ Compact machine = { 359-316, // mouseSize_x 224-174, // mouseSize_y MACHINE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 anita_give_seq[] = { @@ -1703,7 +1765,7 @@ uint16 anita_give_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 s14_fast_list[] = { @@ -1717,7 +1779,7 @@ uint16 s14_fast_list[] = { 23+DISK_6, 92+DISK_6, 27+DISK_6, - 0, + 0 }; Compact fact3_exit_right = { @@ -1739,6 +1801,17 @@ Compact fact3_exit_right = { 403-381, // mouseSize_x 263-184, // mouseSize_y FACT3_R_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 joey_list_14[] = { @@ -1747,7 +1820,7 @@ uint16 joey_list_14[] = { 248, 272, 1, - 0, + 0 }; uint16 rad_close_locker[] = { @@ -1773,7 +1846,7 @@ uint16 rad_close_locker[] = { 1, 1, 0, - 0, + 0 }; uint16 locker_open_seq[] = { @@ -1808,7 +1881,7 @@ uint16 locker_open_seq[] = { 1, 1, 8, - 0, + 0 }; uint16 s14_mouse[] = { @@ -1826,7 +1899,7 @@ uint16 s14_mouse[] = { ID_14_CONSOLE, ID_S14_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 s14_chip_list[] = { @@ -1845,7 +1918,7 @@ uint16 s14_chip_list[] = { 44+DISK_6+0X8000, 21+DISK_6, 91+DISK_6, - 0, + 0 }; uint16 change_back2[] = { @@ -1868,7 +1941,7 @@ uint16 change_back2[] = { 0XAB, 0XC2, 0, - 0, + 0 }; uint16 change2_seq[] = { @@ -1903,7 +1976,7 @@ uint16 change2_seq[] = { 170, 193, 8, - 0, + 0 }; uint16 change_back1[] = { @@ -1950,7 +2023,7 @@ uint16 change_back1[] = { 0XB2, 0XBF, 0, - 0, + 0 }; uint16 change6_seq[] = { @@ -1997,7 +2070,7 @@ uint16 change6_seq[] = { 178, 191, 9, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/15comp.h b/sky/compacts/15comp.h index 66f253e104..29dc8dad56 100644 --- a/sky/compacts/15comp.h +++ b/sky/compacts/15comp.h @@ -34,7 +34,7 @@ uint16 rs_foster_13_15[] = { 240, C_SCREEN, 15, - 65535, + 65535 }; Compact flap = { @@ -66,6 +66,7 @@ Compact flap = { C_BASE_MODE, // mode FLAP_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 weld_seq[] = { @@ -94,7 +95,7 @@ uint16 weld_seq[] = { 369, 148, 7, - 0, + 0 }; uint16 rs_foster_15_13[] = { @@ -108,7 +109,7 @@ uint16 rs_foster_15_13[] = { ID_S13_FLOOR, C_STATUS, ST_SORT+ST_RECREATE+ST_LOGIC+ST_AR_PRIORITY, - 65535, + 65535 }; Compact whole_floor = { @@ -130,6 +131,17 @@ Compact whole_floor = { 2000, // mouseSize_x 2000, // mouseSize_y 0, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s15_logic[] = { @@ -141,7 +153,7 @@ uint16 s15_logic[] = { ID_WD40, 177, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint32 *grid15 = 0; @@ -184,7 +196,7 @@ uint16 flap_seq[] = { 1, 1, 9, - 0, + 0 }; uint16 s15_floor_table[] = { @@ -208,7 +220,7 @@ uint16 s15_floor_table[] = { GT_WD40, ID_FLOOR_PUTTY, GT_PUTTY, - 65535, + 65535 }; Compact s15_flooor = { @@ -230,6 +242,17 @@ Compact s15_flooor = { 424-208, // mouseSize_x 63, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 flip_seq[] = { @@ -309,7 +332,7 @@ uint16 flip_seq[] = { 203, 202, 21, - 0, + 0 }; Compact skey = { @@ -341,6 +364,7 @@ Compact skey = { C_BASE_MODE, // mode SHELF_OBJECT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s15_pal[] = { @@ -727,7 +751,7 @@ uint16 s15_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact wd40 = { @@ -759,6 +783,7 @@ Compact wd40 = { C_BASE_MODE, // mode SHELF_OBJECT_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact junction_box = { @@ -780,6 +805,17 @@ Compact junction_box = { 4, // mouseSize_x 16, // mouseSize_y JUNCTION_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_joey_15_13[] = { @@ -791,7 +827,7 @@ uint16 rs_joey_15_13[] = { 13, C_PLACE, ID_S13_FLOOR, - 65535, + 65535 }; Compact store_exit = { @@ -813,6 +849,17 @@ Compact store_exit = { 9, // mouseSize_x 249-184, // mouseSize_y STORE_EXIT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s15_fast_list[] = { @@ -828,7 +875,7 @@ uint16 s15_fast_list[] = { 26+DISK_3, 93+DISK_3, 94+DISK_3, - 0, + 0 }; Compact nu_floor = { @@ -850,6 +897,17 @@ Compact nu_floor = { 216+32, // mouseSize_x 63, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact floor_putty = { @@ -871,6 +929,17 @@ Compact floor_putty = { 5, // mouseSize_x 5, // mouseSize_y FLOOR_PUTTY_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s15_mouse[] = { @@ -884,7 +953,7 @@ uint16 s15_mouse[] = { ID_S15_FLOOR, ID_NU_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 joey_list_15[] = { @@ -893,7 +962,7 @@ uint16 joey_list_15[] = { 216, 272, 1, - 0, + 0 }; uint16 get_putty_seq[] = { @@ -928,7 +997,7 @@ uint16 get_putty_seq[] = { 220, 200, 5, - 0, + 0 }; uint16 shelf_get_seq[] = { @@ -1005,7 +1074,7 @@ uint16 shelf_get_seq[] = { 283, 221, 0, - 0, + 0 }; uint16 s15_fake_mouse[] = { @@ -1015,7 +1084,7 @@ uint16 s15_fake_mouse[] = { ID_FLAP, ID_FAKE_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 s15_chip_list[] = { @@ -1034,7 +1103,7 @@ uint16 s15_chip_list[] = { 148+DISK_3, 149+DISK_3, 150+DISK_3, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/16comp.h b/sky/compacts/16comp.h index d1401abb72..24944b3858 100644 --- a/sky/compacts/16comp.h +++ b/sky/compacts/16comp.h @@ -37,6 +37,26 @@ Compact reactor_lower = { 249, // xcood 226, // ycood 109*64, // frame + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 foster2_die_seq[] = { @@ -140,7 +160,7 @@ uint16 foster2_die_seq[] = { 184, 273, 27, - 0, + 0 }; Compact reactor_console = { @@ -172,6 +192,7 @@ Compact reactor_console = { C_BASE_MODE, // mode CONSOLE_16_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint32 *grid16 = 0; @@ -186,7 +207,7 @@ uint16 s16_fast_list[] = { 93+DISK_6, 94+DISK_6, 95+DISK_6, - 0, + 0 }; Compact entrance_exit = { @@ -208,6 +229,17 @@ Compact entrance_exit = { 203-186, // mouseSize_x 294-220, // mouseSize_y ENTRANCE_EXIT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 console_16_seq[] = { @@ -245,7 +277,7 @@ uint16 console_16_seq[] = { 368, 260, 10, - 0, + 0 }; uint16 s16_floor_table[] = { @@ -267,7 +299,7 @@ uint16 s16_floor_table[] = { GT_L_TALK_16, ID_STD_RIGHT_TALK, GT_R_TALK_16, - 65535, + 65535 }; Compact s16_floor = { @@ -289,6 +321,17 @@ Compact s16_floor = { 416-181, // mouseSize_x 321-277, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s16_pal[] = { @@ -675,7 +718,7 @@ uint16 s16_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 s16_chip_list[] = { @@ -693,7 +736,7 @@ uint16 s16_chip_list[] = { 147+DISK_6, 31+DISK_6, 32+DISK_6, - 0, + 0 }; uint16 rad_con_look[] = { @@ -728,7 +771,7 @@ uint16 rad_con_look[] = { 288, 201, 0, - 0, + 0 }; uint16 s16_logic[] = { @@ -740,7 +783,7 @@ uint16 s16_logic[] = { ID_REACTOR_LOWER, ID_REACTOR_PC, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 foster_die_seq[] = { @@ -844,7 +887,7 @@ uint16 foster_die_seq[] = { 296, 273, 27, - 0, + 0 }; Compact reactor_door = { @@ -866,6 +909,17 @@ Compact reactor_door = { 342-251, // mouseSize_x 266-176, // mouseSize_y REACTOR_DOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s16_mouse[] = { @@ -876,7 +930,7 @@ uint16 s16_mouse[] = { ID_REACTOR_DOOR, ID_S16_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 rs_foster_14_16[] = { @@ -888,7 +942,7 @@ uint16 rs_foster_14_16[] = { 16, C_PLACE, ID_S16_FLOOR, - 65535, + 65535 }; uint16 fost_con_look[] = { @@ -923,7 +977,7 @@ uint16 fost_con_look[] = { 264, 214, 3, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/17comp.h b/sky/compacts/17comp.h index fbb761888f..5ead9f80a8 100644 --- a/sky/compacts/17comp.h +++ b/sky/compacts/17comp.h @@ -131,7 +131,7 @@ uint16 pulseb_seq[] = { 256, 203, 0, - 0, + 0 }; uint16 s17_floor_table[] = { @@ -147,7 +147,7 @@ uint16 s17_floor_table[] = { GT_ANITA_CARD, ID_PULSE, GT_RODS, - 65535, + 65535 }; Compact s17_floor = { @@ -169,6 +169,17 @@ Compact s17_floor = { 216, // mouseSize_x 1024, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *grid17 = 0; @@ -205,7 +216,7 @@ uint16 get_card_seq[] = { 323, 248, 0, - 0, + 0 }; Compact core_exit = { @@ -227,6 +238,17 @@ Compact core_exit = { 12, // mouseSize_x 292-208, // mouseSize_y CORE_EXIT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_foster_17_16[] = { @@ -238,7 +260,7 @@ uint16 rs_foster_17_16[] = { 16, C_PLACE, ID_S16_FLOOR, - 65535, + 65535 }; uint16 s17_chip_list[] = { @@ -254,7 +276,7 @@ uint16 s17_chip_list[] = { 110+DISK_6, 132+DISK_6, 133+DISK_6, - 0, + 0 }; uint16 s17_pal[] = { @@ -641,7 +663,7 @@ uint16 s17_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 s17_mouse[] = { @@ -651,7 +673,7 @@ uint16 s17_mouse[] = { ID_PULSE, ID_S17_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact pulseb = { @@ -683,6 +705,7 @@ Compact pulseb = { C_BASE_MODE, // mode ANIMATE_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s17_fast_list[] = { @@ -695,7 +718,7 @@ uint16 s17_fast_list[] = { 129+DISK_6, 130+DISK_6, 131+DISK_6, - 0, + 0 }; uint16 pulse_seq[] = { @@ -802,7 +825,7 @@ uint16 pulse_seq[] = { 256, 247, 0, - 0, + 0 }; Compact anita_card = { @@ -824,6 +847,17 @@ Compact anita_card = { 5, // mouseSize_x 5, // mouseSize_y ANITA_CARD_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_foster_16_17[] = { @@ -835,7 +869,7 @@ uint16 rs_foster_16_17[] = { 17, C_PLACE, ID_S17_FLOOR, - 65535, + 65535 }; uint16 s17_logic[] = { @@ -845,7 +879,7 @@ uint16 s17_logic[] = { ID_PULSEB, ID_ANITA_CARD, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; Compact pulse = { @@ -877,6 +911,7 @@ Compact pulse = { C_BASE_MODE, // mode ANIMATE_LOGIC, // baseSub 0, // baseSub_off + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/18comp.h b/sky/compacts/18comp.h index 63dc8f7a32..d50eea42e8 100644 --- a/sky/compacts/18comp.h +++ b/sky/compacts/18comp.h @@ -53,7 +53,7 @@ uint16 steam_alert_seq[] = { 251, 233, 7, - 0, + 0 }; uint16 sleep_seq[] = { @@ -130,7 +130,7 @@ uint16 sleep_seq[] = { 250, 231, 7, - 0, + 0 }; Compact power_door = { @@ -162,6 +162,7 @@ Compact power_door = { C_BASE_MODE, // mode POWER_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 steam1_seq[] = { @@ -196,7 +197,7 @@ uint16 steam1_seq[] = { 386, 137, 9, - 0, + 0 }; uint16 unpush_but_seq[] = { @@ -207,7 +208,7 @@ uint16 unpush_but_seq[] = { 1, 1, 0, - 0, + 0 }; Compact right_lever = { @@ -239,6 +240,7 @@ Compact right_lever = { C_BASE_MODE, // mode RIGHT_LEVER_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 steam2_seq[] = { @@ -258,7 +260,7 @@ uint16 steam2_seq[] = { 382, 137, 4, - 0, + 0 }; uint16 blowoff_seq[] = { @@ -296,7 +298,7 @@ uint16 blowoff_seq[] = { 147, 279, 10, - 0, + 0 }; uint16 s18_mouse[] = { @@ -313,7 +315,7 @@ uint16 s18_mouse[] = { ID_LEFT_LEVER, ID_RIGHT_LEVER, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 power_start_seq[] = { @@ -333,7 +335,7 @@ uint16 power_start_seq[] = { 157, 315, 4, - 0, + 0 }; Compact power_switch = { @@ -365,6 +367,7 @@ Compact power_switch = { C_BASE_MODE, // mode POWER_SWITCH_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 power_stop_seq[] = { @@ -399,7 +402,7 @@ uint16 power_stop_seq[] = { 157, 315, 8, - 0, + 0 }; uint16 s18_floor_table[] = { @@ -429,7 +432,7 @@ uint16 s18_floor_table[] = { GET_TO_RIGHT_LEVER, ID_LEFT_LEVER, GET_TO_LEFT_LEVER, - 65535, + 65535 }; Compact s18_floor = { @@ -451,6 +454,17 @@ Compact s18_floor = { 320, // mouseSize_x 14+16, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 joey_list_s18[] = { @@ -459,7 +473,7 @@ uint16 joey_list_s18[] = { 280, 304, 1, - 0, + 0 }; uint16 nu_chip_18[] = { @@ -488,7 +502,7 @@ uint16 nu_chip_18[] = { 74+DISK_2, 76+DISK_2+0X8000, 75+DISK_2, - 0, + 0 }; Compact power_chair = { @@ -510,6 +524,17 @@ Compact power_chair = { 20, // mouseSize_x 24, // mouseSize_y CHAIR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 steam3_seq[] = { @@ -532,7 +557,7 @@ uint16 steam3_seq[] = { 380, 137, 5, - 0, + 0 }; Compact left_skull = { @@ -554,6 +579,17 @@ Compact left_skull = { 4, // mouseSize_x 5, // mouseSize_y LEFT_SKULL_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_gordon_end[] = { @@ -575,7 +611,7 @@ uint16 rs_gordon_end[] = { 276-244, C_FRAME, 75*64, - 65535, + 65535 }; Compact right_skull = { @@ -597,6 +633,17 @@ Compact right_skull = { 4, // mouseSize_x 5, // mouseSize_y RIGHT_SKULL_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 power_spin_seq[] = { @@ -613,7 +660,7 @@ uint16 power_spin_seq[] = { 157, 315, 3, - 0, + 0 }; uint16 s18_fast_list[] = { @@ -626,7 +673,7 @@ uint16 s18_fast_list[] = { 57+DISK_2, 58+DISK_2, 60+DISK_2, - 0, + 0 }; uint16 steam4_seq[] = { @@ -646,7 +693,7 @@ uint16 steam4_seq[] = { 380, 137, 4, - 0, + 0 }; Compact steam = { @@ -678,6 +725,7 @@ Compact steam = { C_BASE_MODE, // mode STEAM_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact socket = { @@ -709,6 +757,7 @@ Compact socket = { C_BASE_MODE, // mode POWER_PANEL_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact power_motor = { @@ -740,6 +789,7 @@ Compact power_motor = { C_BASE_MODE, // mode POWER_MOTOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 joey_unpush_seq[] = { @@ -765,7 +815,7 @@ uint16 joey_unpush_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 high_push_seq[] = { @@ -782,7 +832,7 @@ uint16 high_push_seq[] = { 1, 1, 3, - 0, + 0 }; Compact left_lever = { @@ -814,6 +864,7 @@ Compact left_lever = { C_BASE_MODE, // mode LEFT_LEVER_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s18_pal[] = { @@ -1200,7 +1251,7 @@ uint16 s18_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 rs_foster_to_18[] = { @@ -1212,7 +1263,7 @@ uint16 rs_foster_to_18[] = { 18, C_PLACE, ID_S18_FLOOR, - 65535, + 65535 }; uint16 power_bang_seq[] = { @@ -1265,7 +1316,7 @@ uint16 power_bang_seq[] = { 139, 167, 15, - 0, + 0 }; uint16 s18_logic[] = { @@ -1284,7 +1335,7 @@ uint16 s18_logic[] = { ID_LIFT_S7, ID_LIFT7_LIGHT, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 high_unpush_seq[] = { @@ -1295,7 +1346,7 @@ uint16 high_unpush_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 s18_chip_list[] = { @@ -1324,7 +1375,7 @@ uint16 s18_chip_list[] = { 74+DISK_2, 76+DISK_2+0X8000, 75+DISK_2, - 0, + 0 }; Compact power_bang = { @@ -1356,6 +1407,7 @@ Compact power_bang = { C_BASE_MODE, // mode POWER_BANG_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 push_but_seq[] = { @@ -1369,7 +1421,7 @@ uint16 push_but_seq[] = { 1, 1, 2, - 0, + 0 }; uint16 door_blast_seq[] = { @@ -1386,7 +1438,7 @@ uint16 door_blast_seq[] = { 146, 229, 3, - 0, + 0 }; uint16 rs_gordon_start[] = { @@ -1406,7 +1458,7 @@ uint16 rs_gordon_start[] = { 32, C_MOUSE_SIZE_Y, 48, - 65535, + 65535 }; uint16 monhit_seq[] = { @@ -1423,7 +1475,7 @@ uint16 monhit_seq[] = { 250, 231, 3, - 0, + 0 }; uint16 spanner_seq[] = { @@ -1485,7 +1537,7 @@ uint16 spanner_seq[] = { 239, 195, 12, - 0, + 0 }; uint16 joey_push_seq[] = { @@ -1514,7 +1566,7 @@ uint16 joey_push_seq[] = { 1, 1, 7, - 0, + 0 }; Compact right_exit_s18 = { @@ -1536,6 +1588,17 @@ Compact right_exit_s18 = { 414-405, // mouseSize_x 280-221, // mouseSize_y ER18_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/19comp.h b/sky/compacts/19comp.h index 0bcbcd3d69..fc2f6a61f8 100644 --- a/sky/compacts/19comp.h +++ b/sky/compacts/19comp.h @@ -36,7 +36,7 @@ uint16 rs_foster_19_28[] = { 28, C_PLACE, ID_S28_FLOOR, - 65535, + 65535 }; uint16 s19_mouse[] = { @@ -47,7 +47,7 @@ uint16 s19_mouse[] = { ID_SMALL_19, ID_S19_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 s19_floor_table[] = { @@ -67,7 +67,7 @@ uint16 s19_floor_table[] = { GT_TOP_RIGHT_19, 12289, GET_TO_UCHAR, - 65535, + 65535 }; Compact s19_floor = { @@ -89,6 +89,17 @@ Compact s19_floor = { 320, // mouseSize_x 4242, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_28_sml_19[] = { @@ -102,7 +113,7 @@ uint16 rs_28_sml_19[] = { ID_S19_FLOOR, C_FRAME, 44+12*64, - 65535, + 65535 }; uint16 s19_logic[] = { @@ -115,7 +126,7 @@ uint16 s19_logic[] = { ID_LIFT_29, 12289, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; Compact right_exit_19 = { @@ -137,6 +148,17 @@ Compact right_exit_19 = { 30, // mouseSize_x 4242, // mouseSize_y ER19_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; ExtCompact useless_char_ext = { @@ -165,6 +187,10 @@ ExtCompact useless_char_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact useless_char = { @@ -196,7 +222,7 @@ Compact useless_char = { 0, // mode UCHAR_LOGIC, // baseSub 0, // baseSub_off - &useless_char_ext, + &useless_char_ext }; Compact left_exit_19 = { @@ -218,6 +244,17 @@ Compact left_exit_19 = { 10, // mouseSize_x 277-211, // mouseSize_y EL19_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 joey_list_s19[] = { @@ -226,7 +263,7 @@ uint16 joey_list_s19[] = { 240, 304, 1, - 0, + 0 }; uint16 rs_foster_28_19[] = { @@ -238,7 +275,7 @@ uint16 rs_foster_28_19[] = { 19, C_PLACE, ID_S19_FLOOR, - 65535, + 65535 }; Compact top_right_19 = { @@ -260,6 +297,17 @@ Compact top_right_19 = { 30, // mouseSize_x 265-137, // mouseSize_y TOP_R19_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *grid19 = 0; @@ -648,7 +696,7 @@ uint16 s19_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 s19_chip_list[] = { @@ -660,7 +708,7 @@ uint16 s19_chip_list[] = { 74+DISK_9, 75+DISK_9, 16+DISK_9, - 0, + 0 }; uint16 s19_fast_list[] = { @@ -670,7 +718,7 @@ uint16 s19_fast_list[] = { 53, 54, 135, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/1compact.h b/sky/compacts/1compact.h index 1a7eb4697b..bc54478a8f 100644 --- a/sky/compacts/1compact.h +++ b/sky/compacts/1compact.h @@ -95,7 +95,7 @@ uint16 car_down_seq[] = { 346, 298, 21, - 0, + 0 }; uint16 car_up_seq[] = { @@ -166,7 +166,7 @@ uint16 car_up_seq[] = { 250, 273, 20, - 0, + 0 }; uint16 smoke1_seq[] = { @@ -738,7 +738,7 @@ uint16 smoke1_seq[] = { 235, 137, 0, - 0, + 0 }; uint16 screen1_logic[] = { @@ -758,7 +758,7 @@ uint16 screen1_logic[] = { ID_CAR_UP, ID_CAR_DOWN, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 fast_list_cut[] = { @@ -775,7 +775,7 @@ uint16 fast_list_cut[] = { 26, 27, 28, - 0, + 0 }; uint16 lfan2_seq[] = { @@ -801,7 +801,7 @@ uint16 lfan2_seq[] = { 202, 196, 6, - 0, + 0 }; Compact smoke2 = { @@ -833,6 +833,7 @@ Compact smoke2 = { C_BASE_MODE, // mode SMOKE2_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact lfan2 = { @@ -864,6 +865,7 @@ Compact lfan2 = { C_BASE_MODE, // mode LFAN2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 lfan1_seq[] = { @@ -886,7 +888,7 @@ uint16 lfan1_seq[] = { 165, 230, 5, - 0, + 0 }; uint16 smoke2_seq[] = { @@ -1458,7 +1460,7 @@ uint16 smoke2_seq[] = { 297, 137, 0, - 0, + 0 }; Compact car_down = { @@ -1490,6 +1492,7 @@ Compact car_down = { C_BASE_MODE, // mode CAR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 fire2_seq[] = { @@ -1563,7 +1566,7 @@ uint16 fire2_seq[] = { 302, 136, 0, - 0, + 0 }; Compact smoke1 = { @@ -1595,6 +1598,7 @@ Compact smoke1 = { C_BASE_MODE, // mode SMOKE1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 fast_list_sc1[] = { @@ -1610,7 +1614,7 @@ uint16 fast_list_sc1[] = { 26, 27, 28, - 0, + 0 }; Compact fire_notice2 = { @@ -1642,6 +1646,7 @@ Compact fire_notice2 = { C_BASE_MODE, // mode NOTICE_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact car_up = { @@ -1673,6 +1678,7 @@ Compact car_up = { C_BASE_MODE, // mode CAR_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact fire1 = { @@ -1704,6 +1710,7 @@ Compact fire1 = { C_BASE_MODE, // mode FIRE1_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact ss_sign = { @@ -1725,6 +1732,17 @@ Compact ss_sign = { 25, // mouseSize_x 77, // mouseSize_y SS_SIGN_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact lfan1 = { @@ -1756,6 +1774,7 @@ Compact lfan1 = { C_BASE_MODE, // mode LFAN1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 chip_list_1[] = { @@ -1768,7 +1787,7 @@ uint16 chip_list_1[] = { 231, 99, 96, - 0, + 0 }; uint16 sc1_mouse[] = { @@ -1778,7 +1797,7 @@ uint16 sc1_mouse[] = { ID_SS_SIGN, 18, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact fire2 = { @@ -1810,6 +1829,7 @@ Compact fire2 = { C_BASE_MODE, // mode FIRE2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 fire1_seq[] = { @@ -1949,7 +1969,7 @@ uint16 fire1_seq[] = { 256, 136, 13, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/20comp.h b/sky/compacts/20comp.h index d46fc8814d..27d4f5e2ed 100644 --- a/sky/compacts/20comp.h +++ b/sky/compacts/20comp.h @@ -38,7 +38,7 @@ uint16 gal_look_up[] = { 1, 1, 2, - 0, + 0 }; uint16 rs_joey_start_20[] = { @@ -62,7 +62,7 @@ uint16 rs_joey_start_20[] = { ST_SORT+ST_RECREATE+ST_LOGIC+ST_COLLISION+ST_MOUSE+ST_GRID_PLOT, C_DIR, UP, - 65535, + 65535 }; uint16 s20_pal[] = { @@ -449,7 +449,7 @@ uint16 s20_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact lamb_door_20 = { @@ -481,6 +481,7 @@ Compact lamb_door_20 = { C_BASE_MODE, // mode LAMB_DOOR_20_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact reich_window = { @@ -502,6 +503,17 @@ Compact reich_window = { 223-194, // mouseSize_x 255-239, // mouseSize_y REICH_WINDOW_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 usecard_seq[] = { @@ -533,7 +545,7 @@ uint16 usecard_seq[] = { 258, 173, 0, - 0, + 0 }; uint16 s20_chip_list[] = { @@ -544,7 +556,7 @@ uint16 s20_chip_list[] = { 131+DISK_2, 132+DISK_2, 217+DISK_9, - 0, + 0 }; Compact down_exit_20 = { @@ -566,6 +578,17 @@ Compact down_exit_20 = { 193-128, // mouseSize_x 20, // mouseSize_y ED20_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s20_fast_list[] = { @@ -580,7 +603,7 @@ uint16 s20_fast_list[] = { 182+DISK_9, 183+DISK_9, 184+DISK_9, - 0, + 0 }; uint16 rs_all_28_20[] = { @@ -592,7 +615,7 @@ uint16 rs_all_28_20[] = { 20, C_PLACE, ID_S20_FLOOR, - 65535, + 65535 }; uint16 s20_floor_table[] = { @@ -632,7 +655,7 @@ uint16 s20_floor_table[] = { GT_L_TALK_20, ID_STD_RIGHT_TALK, GT_R_TALK_20, - 65535, + 65535 }; Compact s20_floor = { @@ -654,6 +677,17 @@ Compact s20_floor = { 4242, // mouseSize_x 4242, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 lamb_20_open[] = { @@ -688,7 +722,7 @@ uint16 lamb_20_open[] = { 1, 1, 10, - 0, + 0 }; Compact lamb_window = { @@ -710,6 +744,17 @@ Compact lamb_window = { 368-342, // mouseSize_x 257-240, // mouseSize_y LAMB_WINDOW_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *grid20 = 0; @@ -725,7 +770,7 @@ uint16 gal_look_down[] = { 1, 1, 0, - 0, + 0 }; Compact lamb_slot = { @@ -747,6 +792,17 @@ Compact lamb_slot = { 7, // mouseSize_x 11, // mouseSize_y LAMB_SLOT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 lamb_20_close[] = { @@ -781,7 +837,7 @@ uint16 lamb_20_close[] = { 1, 1, 0, - 0, + 0 }; Compact shrub_3 = { @@ -803,6 +859,17 @@ Compact shrub_3 = { 421-396, // mouseSize_x 298-257, // mouseSize_y SHRUB_3_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 reich_20_close[] = { @@ -837,7 +904,7 @@ uint16 reich_20_close[] = { 1, 1, 0, - 0, + 0 }; Compact reich_slot = { @@ -859,6 +926,17 @@ Compact reich_slot = { 7, // mouseSize_x 11, // mouseSize_y REICH_SLOT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact shrub_2 = { @@ -880,6 +958,17 @@ Compact shrub_2 = { 310-249, // mouseSize_x 4242, // mouseSize_y SHRUB_2_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 joey_list_20[] = { @@ -888,7 +977,7 @@ uint16 joey_list_20[] = { 296, 330, 1, - 0, + 0 }; uint16 reich_20_open[] = { @@ -923,7 +1012,7 @@ uint16 reich_20_open[] = { 1, 1, 10, - 0, + 0 }; Compact shrub_1 = { @@ -945,6 +1034,17 @@ Compact shrub_1 = { 193-156, // mouseSize_x 294-251, // mouseSize_y SHRUB_1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s20_logic[] = { @@ -959,7 +1059,7 @@ uint16 s20_logic[] = { ID_GALLAGER_BEL, ID_CAT, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 lamb_card_seq2[] = { @@ -991,7 +1091,7 @@ uint16 lamb_card_seq2[] = { 276, 231, 0, - 0, + 0 }; Compact reich_door_20 = { @@ -1023,6 +1123,7 @@ Compact reich_door_20 = { C_BASE_MODE, // mode REICH_DOOR_20_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_20_28[] = { @@ -1034,7 +1135,7 @@ uint16 rs_foster_20_28[] = { 28, C_PLACE, ID_S28_FLOOR, - 65535, + 65535 }; ExtCompact gallager_bel_ext = { @@ -1063,6 +1164,10 @@ ExtCompact gallager_bel_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact gallager_bel = { @@ -1094,7 +1199,7 @@ Compact gallager_bel = { 0, // mode GAL_LOGIC, // baseSub 0, // baseSub_off - &gallager_bel_ext, + &gallager_bel_ext }; uint16 s20_mouse[] = { @@ -1113,7 +1218,7 @@ uint16 s20_mouse[] = { ID_LAMB_WINDOW, ID_S20_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; }; // namespace SkyCompact diff --git a/sky/compacts/21comp.h b/sky/compacts/21comp.h index 681f4e6f52..66bf0efbb5 100644 --- a/sky/compacts/21comp.h +++ b/sky/compacts/21comp.h @@ -60,7 +60,7 @@ uint16 lamb_sit_up[] = { 268, 241, 0, - 0, + 0 }; uint16 s21_logic[] = { @@ -77,7 +77,7 @@ uint16 s21_logic[] = { ID_GALLAGER_BEL, ID_LIFT_29, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 cat1_seq[] = { @@ -253,7 +253,7 @@ uint16 cat1_seq[] = { 347, 214, 44, - 0, + 0 }; uint16 rs_foster_21_20[] = { @@ -265,7 +265,7 @@ uint16 rs_foster_21_20[] = { 20, C_PLACE, ID_S20_FLOOR, - 65535, + 65535 }; uint16 inner_lamb_close[] = { @@ -303,7 +303,7 @@ uint16 inner_lamb_close[] = { 1, 1, 0, - 0, + 0 }; uint16 push_dispensor[] = { @@ -341,7 +341,7 @@ uint16 push_dispensor[] = { 352, 224, 0, - 0, + 0 }; uint16 s21_floor_table[] = { @@ -375,7 +375,7 @@ uint16 s21_floor_table[] = { GT_VIDEO_SCREEN, ID_CAT, GT_CAT, - 65535, + 65535 }; Compact s21_floor = { @@ -397,6 +397,17 @@ Compact s21_floor = { 320, // mouseSize_x 4242, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s21_chip_list[] = { @@ -412,7 +423,7 @@ uint16 s21_chip_list[] = { 131+DISK_2, 132+DISK_2, 218+DISK_9, - 0, + 0 }; uint16 lamb_sit_seq[] = { @@ -447,7 +458,7 @@ uint16 lamb_sit_seq[] = { 248, 246, 9, - 0, + 0 }; Compact cat_food = { @@ -479,6 +490,7 @@ Compact cat_food = { 0, // mode CAT_FOOD_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact video = { @@ -510,6 +522,7 @@ Compact video = { 0, // mode VIDEO_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact video_screen = { @@ -541,6 +554,7 @@ Compact video_screen = { 0, // mode VIDEO_SCREEN_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_20_21[] = { @@ -552,7 +566,7 @@ uint16 rs_foster_20_21[] = { 21, C_PLACE, ID_S21_FLOOR, - 65535, + 65535 }; uint16 cat4_seq[] = { @@ -680,7 +694,7 @@ uint16 cat4_seq[] = { 347, 214, 23, - 0, + 0 }; uint16 video_out[] = { @@ -709,7 +723,7 @@ uint16 video_out[] = { 345, 259, 0, - 0, + 0 }; uint16 inner_lamb_open[] = { @@ -747,7 +761,7 @@ uint16 inner_lamb_open[] = { 1, 1, 11, - 0, + 0 }; uint16 s21_mouse[] = { @@ -769,7 +783,7 @@ uint16 s21_mouse[] = { ID_S21_FLOOR, ID_FAKE_FLOOR_21, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 video_in[] = { @@ -801,7 +815,7 @@ uint16 video_in[] = { 345, 259, 5, - 0, + 0 }; Compact lambs_books = { @@ -823,6 +837,17 @@ Compact lambs_books = { 227-202, // mouseSize_x 270-240, // mouseSize_y LAMBS_BOOKS_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 cat_walk_seq[] = { @@ -998,7 +1023,7 @@ uint16 cat_walk_seq[] = { 347, 269, 53, - 0, + 0 }; Compact big_pict1 = { @@ -1020,6 +1045,17 @@ Compact big_pict1 = { 211-195, // mouseSize_x 228-191, // mouseSize_y BIG_PICT1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact lambs_chair = { @@ -1041,6 +1077,17 @@ Compact lambs_chair = { 271-250, // mouseSize_x 293-262, // mouseSize_y LAMBS_CHAIR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 put_video_in[] = { @@ -1063,7 +1110,7 @@ uint16 put_video_in[] = { 322, 218, 4, - 0, + 0 }; uint16 watch_film[] = { @@ -1083,7 +1130,7 @@ uint16 watch_film[] = { 322, 218, 0, - 0, + 0 }; Compact cat = { @@ -1115,6 +1162,7 @@ Compact cat = { 0, // mode CAT_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact big_pict3 = { @@ -1136,6 +1184,17 @@ Compact big_pict3 = { 295-264, // mouseSize_x 213-190, // mouseSize_y BIG_PICT3_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 cat3_seq[] = { @@ -1227,7 +1286,7 @@ uint16 cat3_seq[] = { 347, 214, 28, - 0, + 0 }; uint16 s21_fast_list[] = { @@ -1242,7 +1301,7 @@ uint16 s21_fast_list[] = { 195+DISK_9, 219+DISK_9, 220+DISK_9, - 0, + 0 }; uint16 bend_down[] = { @@ -1262,7 +1321,7 @@ uint16 bend_down[] = { 322, 218, 4, - 0, + 0 }; uint16 take_video_out[] = { @@ -1282,7 +1341,7 @@ uint16 take_video_out[] = { 322, 218, 0, - 0, + 0 }; Compact big_pict2 = { @@ -1304,6 +1363,17 @@ Compact big_pict2 = { 236-227, // mouseSize_x 212-188, // mouseSize_y BIG_PICT2_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 cat_food_seq[] = { @@ -1383,7 +1453,7 @@ uint16 cat_food_seq[] = { 372, 263, 20, - 0, + 0 }; Compact left_exit_21 = { @@ -1405,6 +1475,17 @@ Compact left_exit_21 = { 181-173, // mouseSize_x 301-240, // mouseSize_y EL21_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *grid21 = 0; @@ -1438,6 +1519,7 @@ Compact inner_lamb_door = { C_BASE_MODE, // mode INNER_LAMB_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact fake_floor_21 = { @@ -1459,6 +1541,17 @@ Compact fake_floor_21 = { 320, // mouseSize_x 4242, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 cat_eat_seq[] = { @@ -1481,7 +1574,7 @@ uint16 cat_eat_seq[] = { 348, 269, 4, - 0, + 0 }; uint16 more_cassette_seq[] = { @@ -1495,7 +1588,7 @@ uint16 more_cassette_seq[] = { 217, 216, 0, - 0, + 0 }; Compact cassette = { @@ -1517,6 +1610,17 @@ Compact cassette = { 5, // mouseSize_x 8, // mouseSize_y CASSETTE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s21_pal[] = { @@ -1903,7 +2007,7 @@ uint16 s21_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact dispensor = { @@ -1925,6 +2029,17 @@ Compact dispensor = { 398-387, // mouseSize_x 280-228, // mouseSize_y DISPENSOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 cat2_seq[] = { @@ -1998,7 +2113,7 @@ uint16 cat2_seq[] = { 347, 214, 22, - 0, + 0 }; uint16 take_cassette_seq[] = { @@ -2024,7 +2139,7 @@ uint16 take_cassette_seq[] = { 217, 216, 3, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/22comp.h b/sky/compacts/22comp.h index 3f030361a8..213ffbf1a3 100644 --- a/sky/compacts/22comp.h +++ b/sky/compacts/22comp.h @@ -53,7 +53,7 @@ uint16 fost_replace_pill[] = { 320, 226, 0, - 0, + 0 }; uint16 rs_foster_20_22[] = { @@ -65,7 +65,7 @@ uint16 rs_foster_20_22[] = { 22, C_PLACE, ID_S22_FLOOR, - 65535, + 65535 }; Compact reich_picture = { @@ -87,6 +87,17 @@ Compact reich_picture = { 326-259, // mouseSize_x 210-175, // mouseSize_y REICH_PICTURE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact inner_reich_door = { @@ -118,6 +129,7 @@ Compact inner_reich_door = { C_BASE_MODE, // mode INNER_R_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_22_20[] = { @@ -129,7 +141,7 @@ uint16 rs_foster_22_20[] = { 20, C_PLACE, ID_S20_FLOOR, - 65535, + 65535 }; uint16 fost_remove_pill[] = { @@ -176,7 +188,7 @@ uint16 fost_remove_pill[] = { 320, 226, 4, - 0, + 0 }; uint16 inner_reich_open[] = { @@ -217,13 +229,13 @@ uint16 inner_reich_open[] = { 1, 1, 12, - 0, + 0 }; uint16 rs_magazine[] = { C_SCREEN, 424, - 65535, + 65535 }; uint32 *grid22 = 0; @@ -272,7 +284,7 @@ uint16 remove_pillow[] = { 1, 1, 4, - 0, + 0 }; uint16 s22_floor_table[] = { @@ -306,7 +318,7 @@ uint16 s22_floor_table[] = { GT_REICH_PICTURE, ID_FISH_FOOD, GT_FISH_FOOD, - 65535, + 65535 }; Compact pillow = { @@ -338,6 +350,7 @@ Compact pillow = { 0, // mode PILLOW_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 inner_reich_close[] = { @@ -378,7 +391,7 @@ uint16 inner_reich_close[] = { 1, 1, 0, - 0, + 0 }; Compact lamb_bed = { @@ -400,6 +413,17 @@ Compact lamb_bed = { 365-283, // mouseSize_x 275-251, // mouseSize_y BED_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 replace_pillow[] = { @@ -434,7 +458,7 @@ uint16 replace_pillow[] = { 1, 1, 0, - 0, + 0 }; uint16 get_magazine_seq[] = { @@ -466,7 +490,7 @@ uint16 get_magazine_seq[] = { 273, 218, 0, - 0, + 0 }; uint16 tank3_seq[] = { @@ -531,7 +555,7 @@ uint16 tank3_seq[] = { 245, 238, 19, - 0, + 0 }; uint16 tank2_seq[] = { @@ -626,7 +650,7 @@ uint16 tank2_seq[] = { 245, 238, 26, - 0, + 0 }; Compact s22_floor = { @@ -648,6 +672,17 @@ Compact s22_floor = { 320, // mouseSize_x 4242, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact right_exit_22 = { @@ -669,6 +704,17 @@ Compact right_exit_22 = { 402-393, // mouseSize_x 313-249, // mouseSize_y ER22_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact reich_chair = { @@ -690,6 +736,17 @@ Compact reich_chair = { 240-221, // mouseSize_x 314-287, // mouseSize_y REICH_CHAIR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s22_mouse[] = { @@ -710,7 +767,7 @@ uint16 s22_mouse[] = { ID_S22_FLOOR, ID_FAKE_FLOOR_22, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact fish_tank = { @@ -742,6 +799,7 @@ Compact fish_tank = { 0, // mode FISH_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact fake_floor_22 = { @@ -763,6 +821,17 @@ Compact fake_floor_22 = { 320, // mouseSize_x 4242, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s22_fast_list[] = { @@ -777,7 +846,7 @@ uint16 s22_fast_list[] = { 189+DISK_9, 190+DISK_9, 191+DISK_9, - 0, + 0 }; uint16 s22_logic[] = { @@ -793,7 +862,7 @@ uint16 s22_logic[] = { ID_GALLAGER_BEL, ID_LIFT_29, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 s22_chip_list[] = { @@ -805,7 +874,7 @@ uint16 s22_chip_list[] = { 92+DISK_9, 200+DISK_9, 85+DISK_9, - 0, + 0 }; Compact magazine = { @@ -827,6 +896,17 @@ Compact magazine = { 26, // mouseSize_x 16, // mouseSize_y MAGAZINE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 fish_seq[] = { @@ -951,7 +1031,7 @@ uint16 fish_seq[] = { 245, 238, 39, - 0, + 0 }; Compact cert = { @@ -973,6 +1053,17 @@ Compact cert = { 325-310, // mouseSize_x 224-215, // mouseSize_y CERT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s22_pal[] = { @@ -1359,7 +1450,7 @@ uint16 s22_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact cabinet = { @@ -1381,6 +1472,17 @@ Compact cabinet = { 340-312, // mouseSize_x 248-239, // mouseSize_y CABINET_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact lamb_tv = { @@ -1402,6 +1504,17 @@ Compact lamb_tv = { 225-203, // mouseSize_x 251-223, // mouseSize_y LAMB_TV_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact fish_food = { @@ -1423,6 +1536,17 @@ Compact fish_food = { 192-179, // mouseSize_x 289-236, // mouseSize_y FISH_FOOD_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact fish_poster = { @@ -1444,6 +1568,17 @@ Compact fish_poster = { 248-232, // mouseSize_x 232-193, // mouseSize_y FISH_POSTER_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/23comp.h b/sky/compacts/23comp.h index 86437dfb95..c3d5c6cc7b 100644 --- a/sky/compacts/23comp.h +++ b/sky/compacts/23comp.h @@ -48,6 +48,17 @@ Compact link_23 = { 212-191, // mouseSize_x 276-236, // mouseSize_y LINK_23_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s23_chip_list[] = { @@ -58,7 +69,7 @@ uint16 s23_chip_list[] = { 24+DISK_8, 23+DISK_8, 25+DISK_8, - 0, + 0 }; Compact sculpture = { @@ -80,6 +91,17 @@ Compact sculpture = { 309-274, // mouseSize_x 278-235, // mouseSize_y SCULPTURE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact wreck_23 = { @@ -101,6 +123,17 @@ Compact wreck_23 = { 4242, // mouseSize_x 4242, // mouseSize_y WRECK_23_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact anchor_exit_23 = { @@ -122,6 +155,17 @@ Compact anchor_exit_23 = { 12, // mouseSize_x 299-219, // mouseSize_y ANCHOR23_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact bin_23 = { @@ -143,6 +187,17 @@ Compact bin_23 = { 155-127, // mouseSize_x 4242, // mouseSize_y BIN_23_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s23_pal[] = { @@ -529,7 +584,7 @@ uint16 s23_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 s23_logic[] = { @@ -542,7 +597,7 @@ uint16 s23_logic[] = { ID_LIFT_29, ID_GALLAGER_BEL, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 s23_mouse[] = { @@ -557,7 +612,7 @@ uint16 s23_mouse[] = { ID_WRECK_23, ID_S23_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact small_exit_23 = { @@ -579,6 +634,17 @@ Compact small_exit_23 = { 227-217, // mouseSize_x 250-190, // mouseSize_y SML_EXIT_S23_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact travel_exit_23 = { @@ -600,6 +666,17 @@ Compact travel_exit_23 = { 342-315, // mouseSize_x 246-189, // mouseSize_y TRAVEL_23_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s23_fast_list[] = { @@ -609,7 +686,7 @@ uint16 s23_fast_list[] = { 53, 54, 135, - 0, + 0 }; Compact left_exit_23 = { @@ -631,6 +708,17 @@ Compact left_exit_23 = { 10, // mouseSize_x 288-226, // mouseSize_y EL23_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s23_floor_table[] = { @@ -660,7 +748,7 @@ uint16 s23_floor_table[] = { GT_WRECK_23, ID_SMALL_23, GT_SMALL_23, - 65535, + 65535 }; Compact s23_floor = { @@ -682,6 +770,17 @@ Compact s23_floor = { 1000, // mouseSize_x 1000, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_foster_29_23[] = { @@ -693,7 +792,7 @@ uint16 rs_foster_29_23[] = { 23, C_PLACE, ID_S23_FLOOR, - 65535, + 65535 }; }; // namespace SkyCompact diff --git a/sky/compacts/24comp.h b/sky/compacts/24comp.h index 2448ec6dfb..ed93c5aa75 100644 --- a/sky/compacts/24comp.h +++ b/sky/compacts/24comp.h @@ -56,7 +56,7 @@ uint16 give_mag_seq[] = { 131, 226, 4, - 0, + 0 }; uint16 trev_read_mag[] = { @@ -88,7 +88,7 @@ uint16 trev_read_mag[] = { 351, 239, 0, - 0, + 0 }; uint16 s24_floor_table[] = { @@ -114,7 +114,7 @@ uint16 s24_floor_table[] = { GT_TICKET, ID_GLOBE, GT_GLOBE, - 65535, + 65535 }; Compact s24_floor = { @@ -136,6 +136,17 @@ Compact s24_floor = { 320, // mouseSize_x 4242, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 mag_away[] = { @@ -155,7 +166,7 @@ uint16 mag_away[] = { 1, 1, 4, - 0, + 0 }; uint32 *grid24 = 0; @@ -179,6 +190,17 @@ Compact left_exit_24 = { 196-175, // mouseSize_x 308-247, // mouseSize_y EL24_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact mural = { @@ -200,6 +222,17 @@ Compact mural = { 383-244, // mouseSize_x 238-159, // mouseSize_y MURAL_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 trevor_relax[] = { @@ -219,7 +252,7 @@ uint16 trevor_relax[] = { 1, 1, 4, - 0, + 0 }; uint16 rs_foster_23_24[] = { @@ -231,7 +264,7 @@ uint16 rs_foster_23_24[] = { 24, C_PLACE, ID_S24_FLOOR, - 65535, + 65535 }; uint16 s24_mouse[] = { @@ -246,7 +279,7 @@ uint16 s24_mouse[] = { ID_GLOBE, ID_S24_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 trevor_unrelax[] = { @@ -266,7 +299,7 @@ uint16 trevor_unrelax[] = { 1, 1, 0, - 0, + 0 }; Compact pidgeons = { @@ -288,6 +321,17 @@ Compact pidgeons = { 291-246, // mouseSize_x 275-232, // mouseSize_y PIDGEONS_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 trev_get_mag[] = { @@ -322,7 +366,7 @@ uint16 trev_get_mag[] = { 351, 239, 6, - 0, + 0 }; uint16 s24_chip_list[] = { @@ -345,7 +389,7 @@ uint16 s24_chip_list[] = { 29+DISK_8, 30+DISK_8, 31+DISK_8, - 0, + 0 }; uint16 rs_foster_24_23[] = { @@ -357,7 +401,7 @@ uint16 rs_foster_24_23[] = { 23, C_PLACE, ID_S23_FLOOR, - 65535, + 65535 }; uint16 mag_back_seq[] = { @@ -398,7 +442,7 @@ uint16 mag_back_seq[] = { 253, 226, 7, - 0, + 0 }; uint16 push_globe[] = { @@ -421,7 +465,7 @@ uint16 push_globe[] = { 265, 193, 0, - 0, + 0 }; uint16 s24_pal[] = { @@ -808,7 +852,7 @@ uint16 s24_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 joey_list_s24[] = { @@ -822,7 +866,7 @@ uint16 joey_list_s24[] = { 264, 294, 0, - 0, + 0 }; uint16 mag_out[] = { @@ -842,7 +886,7 @@ uint16 mag_out[] = { 1, 1, 0, - 0, + 0 }; uint16 trev_turn_page[] = { @@ -868,7 +912,7 @@ uint16 trev_turn_page[] = { 351, 239, 0, - 0, + 0 }; ExtCompact trevor_ext = { @@ -897,6 +941,10 @@ ExtCompact trevor_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact trevor = { @@ -928,7 +976,7 @@ Compact trevor = { 0, // mode TREVOR_LOGIC, // baseSub 0, // baseSub_off - &trevor_ext, + &trevor_ext }; Compact ticket = { @@ -960,6 +1008,7 @@ Compact ticket = { 0, // mode TICKET_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact new_york_poster = { @@ -981,6 +1030,17 @@ Compact new_york_poster = { 200-162, // mouseSize_x 245-166, // mouseSize_y NEW_YORK_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact london_poster = { @@ -1002,6 +1062,17 @@ Compact london_poster = { 237-207, // mouseSize_x 226-166, // mouseSize_y LONDON_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 get_ticket[] = { @@ -1042,7 +1113,7 @@ uint16 get_ticket[] = { 1, 1, 0, - 0, + 0 }; uint16 s24_logic[] = { @@ -1057,7 +1128,7 @@ uint16 s24_logic[] = { ID_LIFT_29, ID_GALLAGER_BEL, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 globe_spin[] = { @@ -1122,7 +1193,7 @@ uint16 globe_spin[] = { 274, 275, 0, - 0, + 0 }; uint16 ticket_seq[] = { @@ -1148,7 +1219,7 @@ uint16 ticket_seq[] = { 352, 254, 6, - 0, + 0 }; Compact globe = { @@ -1180,6 +1251,7 @@ Compact globe = { 0, // mode GLOBE_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 trevor_scratch[] = { @@ -1226,7 +1298,7 @@ uint16 trevor_scratch[] = { 351, 239, 0, - 0, + 0 }; uint16 s24_fast_list[] = { @@ -1236,7 +1308,7 @@ uint16 s24_fast_list[] = { 53, 54, 135, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/25comp.h b/sky/compacts/25comp.h index 929b54d197..7f10c994e9 100644 --- a/sky/compacts/25comp.h +++ b/sky/compacts/25comp.h @@ -46,6 +46,17 @@ Compact sales_chart = { 346-273, // mouseSize_x 220-185, // mouseSize_y SALES_CHART_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 hook_seq[] = { @@ -71,7 +82,7 @@ uint16 hook_seq[] = { 359, 294, 2, - 0, + 0 }; uint16 s25_pal[] = { @@ -458,7 +469,7 @@ uint16 s25_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact statue_25 = { @@ -480,6 +491,17 @@ Compact statue_25 = { 424-363, // mouseSize_x 313-238, // mouseSize_y STATUE_25_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact anchor_exit_25 = { @@ -501,6 +523,17 @@ Compact anchor_exit_25 = { 203-185, // mouseSize_x 309-244, // mouseSize_y ANCHOR25_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 spark_25_seq[] = { @@ -517,7 +550,7 @@ uint16 spark_25_seq[] = { 348, 239, 3, - 0, + 0 }; uint16 rs_foster_23_25[] = { @@ -529,7 +562,7 @@ uint16 rs_foster_23_25[] = { 25, C_PLACE, ID_S25_FLOOR, - 65535, + 65535 }; ExtCompact anchor_ext = { @@ -558,6 +591,10 @@ ExtCompact anchor_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact anchor = { @@ -589,7 +626,7 @@ Compact anchor = { 0, // mode ANCHOR_LOGIC, // baseSub 0, // baseSub_off - &anchor_ext, + &anchor_ext }; uint16 s25_chip_list[] = { @@ -610,7 +647,7 @@ uint16 s25_chip_list[] = { 26+DISK_8, 27+DISK_8, 28+DISK_8, - 0, + 0 }; uint16 lazer_25_seq[] = { @@ -621,7 +658,7 @@ uint16 lazer_25_seq[] = { 344, 244, 1, - 0, + 0 }; uint16 s25_fast_list[] = { @@ -631,7 +668,7 @@ uint16 s25_fast_list[] = { 53, 54, 135, - 0, + 0 }; uint32 *grid25 = 0; @@ -704,7 +741,7 @@ uint16 anchor_leave_seq[] = { 252, 223, 15, - 0, + 0 }; uint16 joey_list_s25[] = { @@ -713,7 +750,7 @@ uint16 joey_list_s25[] = { 296, 304, 1, - 0, + 0 }; uint16 rs_foster_25_23[] = { @@ -725,7 +762,7 @@ uint16 rs_foster_25_23[] = { 23, C_PLACE, ID_S23_FLOOR, - 65535, + 65535 }; uint16 s25_mouse[] = { @@ -737,7 +774,7 @@ uint16 s25_mouse[] = { ID_SALES_CHART, ID_S25_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 s25_logic[] = { @@ -753,7 +790,7 @@ uint16 s25_logic[] = { ID_INNER_LAMB_DOOR, ID_LIFT_29, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 anchor_seq[] = { @@ -833,7 +870,7 @@ uint16 anchor_seq[] = { 258, 233, 0, - 0, + 0 }; uint16 anchor_return_seq[] = { @@ -895,7 +932,7 @@ uint16 anchor_return_seq[] = { 280, 233, 12, - 0, + 0 }; Compact hook = { @@ -927,6 +964,7 @@ Compact hook = { 0, // mode HOOK_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact spark_25 = { @@ -958,6 +996,7 @@ Compact spark_25 = { 0, // mode SPARK_25_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact lazer_25 = { @@ -989,6 +1028,7 @@ Compact lazer_25 = { 0, // mode LAZER_25_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s25_floor_table[] = { @@ -1010,7 +1050,7 @@ uint16 s25_floor_table[] = { GT_HOOK, ID_SALES_CHART, GT_SALES_CHART, - 65535, + 65535 }; uint16 get_anchor_seq[] = { @@ -1042,7 +1082,7 @@ uint16 get_anchor_seq[] = { 341, 264, 5, - 0, + 0 }; Compact s25_floor = { @@ -1064,6 +1104,17 @@ Compact s25_floor = { 320, // mouseSize_x 4242, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/26comp.h b/sky/compacts/26comp.h index db5cbe8fda..ad27d4652c 100644 --- a/sky/compacts/26comp.h +++ b/sky/compacts/26comp.h @@ -56,6 +56,7 @@ Compact bio_door = { C_BASE_MODE, // mode BIO_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact plant_26 = { @@ -77,6 +78,17 @@ Compact plant_26 = { 353-330, // mouseSize_x 237-211, // mouseSize_y PLANT_26_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s26_floor_table[] = { @@ -108,7 +120,7 @@ uint16 s26_floor_table[] = { GT_HOLO, ID_BIO_DOOR, GT_BIO_DOOR, - 65535, + 65535 }; uint16 s26_mouse[] = { @@ -125,7 +137,7 @@ uint16 s26_mouse[] = { ID_HOLO, ID_S26_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 s26_pal[] = { @@ -512,7 +524,7 @@ uint16 s26_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 helga_awake[] = { @@ -580,7 +592,7 @@ uint16 helga_awake[] = { 300, 212, 10, - 0, + 0 }; Compact right_exit_26 = { @@ -602,6 +614,17 @@ Compact right_exit_26 = { 398-389, // mouseSize_x 298-232, // mouseSize_y ER26_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 wobble2[] = { @@ -678,7 +701,7 @@ uint16 wobble2[] = { 378, 217, 23, - 0, + 0 }; uint16 helga_byeee[] = { @@ -722,7 +745,7 @@ uint16 helga_byeee[] = { 415, 217, 10, - 0, + 0 }; Compact left_exit_26 = { @@ -744,6 +767,17 @@ Compact left_exit_26 = { 192-181, // mouseSize_x 295-233, // mouseSize_y EL26_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_joey_start_26[] = { @@ -767,7 +801,7 @@ uint16 rs_joey_start_26[] = { ST_SORT+ST_RECREATE+ST_LOGIC+ST_COLLISION+ST_MOUSE+ST_GRID_PLOT, C_DIR, DOWN, - 65535, + 65535 }; uint16 bio_door_open[] = { @@ -787,7 +821,7 @@ uint16 bio_door_open[] = { 181, 232, 4, - 0, + 0 }; uint16 wobble1[] = { @@ -858,7 +892,7 @@ uint16 wobble1[] = { 340, 217, 21, - 0, + 0 }; ExtCompact holo_ext = { @@ -887,6 +921,10 @@ ExtCompact holo_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact holo = { @@ -918,7 +956,7 @@ Compact holo = { 0, // mode HELGA_LOGIC, // baseSub 0, // baseSub_off - &holo_ext, + &holo_ext }; Compact poster2 = { @@ -940,6 +978,17 @@ Compact poster2 = { 329-297, // mouseSize_x 204-184, // mouseSize_y POSTER2_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s26_fast_list[] = { @@ -952,7 +1001,7 @@ uint16 s26_fast_list[] = { 86+DISK_9, 87+DISK_9, 88+DISK_9, - 0, + 0 }; uint32 *grid26 = 0; @@ -963,7 +1012,7 @@ uint16 joey_list_s26[] = { 280, 321, 1, - 0, + 0 }; uint16 return_leaflet[] = { @@ -998,7 +1047,7 @@ uint16 return_leaflet[] = { 1, 1, 0, - 0, + 0 }; uint16 rs_foster_19_26[] = { @@ -1012,7 +1061,7 @@ uint16 rs_foster_19_26[] = { ID_S26_FLOOR, C_FRAME, 12*64+42, - 65535, + 65535 }; uint16 get_leaflet[] = { @@ -1047,7 +1096,7 @@ uint16 get_leaflet[] = { 1, 1, 9, - 0, + 0 }; Compact poster3 = { @@ -1069,6 +1118,17 @@ Compact poster3 = { 293-262, // mouseSize_x 225-208, // mouseSize_y POSTER3_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact leaflet = { @@ -1100,6 +1160,7 @@ Compact leaflet = { 0, // mode LEAFLET_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s26_chip_list[] = { @@ -1116,7 +1177,7 @@ uint16 s26_chip_list[] = { 140+DISK_9, 141+DISK_9, 142+DISK_9, - 0, + 0 }; uint16 rs_foster_26_19[] = { @@ -1128,7 +1189,7 @@ uint16 rs_foster_26_19[] = { 19, C_PLACE, ID_S19_FLOOR, - 65535, + 65535 }; Compact poster4 = { @@ -1150,6 +1211,17 @@ Compact poster4 = { 329-297, // mouseSize_x 225-208, // mouseSize_y POSTER4_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s26_logic[] = { @@ -1164,7 +1236,7 @@ uint16 s26_logic[] = { ID_INNER_LAMB_DOOR, ID_LIFT_29, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; Compact poster1 = { @@ -1186,6 +1258,17 @@ Compact poster1 = { 293-262, // mouseSize_x 204-184, // mouseSize_y POSTER1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact s26_floor = { @@ -1207,6 +1290,17 @@ Compact s26_floor = { 320, // mouseSize_x 4242, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/27comp.h b/sky/compacts/27comp.h index 73c0ccd7a2..c984d8e059 100644 --- a/sky/compacts/27comp.h +++ b/sky/compacts/27comp.h @@ -41,7 +41,7 @@ uint16 s27_logic[] = { ID_INNER_LAMB_DOOR, ID_LIFT_29, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 scan_27_seq[] = { @@ -52,7 +52,7 @@ uint16 scan_27_seq[] = { 308, 212, 1, - 0, + 0 }; uint16 body_table[] = { @@ -62,7 +62,7 @@ uint16 body_table[] = { GT_GAS, ID_STD_RIGHT_TALK, GT_R_TALK_27, - 65535, + 65535 }; uint16 glass_scan[] = { @@ -259,7 +259,7 @@ uint16 glass_scan[] = { 194, 264, 42, - 0, + 0 }; uint8 burke_auto[64]; @@ -359,19 +359,19 @@ uint16 put_glass_seq[] = { 241, 250, 15, - 0, + 0 }; uint16 burke_u_to_d[] = { 43-8+150*64, 42-8+150*64, 41-8+150*64, - 0, + 0 }; uint16 burke_l_to_u[] = { 43-8+150*64, - 0, + 0 }; Compact helmet_cole = { @@ -403,6 +403,7 @@ Compact helmet_cole = { 0, // mode HELMET_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_27_26[] = { @@ -414,14 +415,14 @@ uint16 rs_foster_27_26[] = { 26, C_PLACE, ID_S26_FLOOR, - 65535, + 65535 }; uint16 burke_d_to_u[] = { 47-8+150*64, 46-8+150*64, 45-8+150*64, - 0, + 0 }; uint16 burke_st_talk[] = { @@ -429,7 +430,7 @@ uint16 burke_st_talk[] = { 1, 1, 0, - 0, + 0 }; uint16 out_chair_seq[] = { @@ -476,7 +477,7 @@ uint16 out_chair_seq[] = { 258, 234, 13, - 0, + 0 }; uint16 burke_st_right[] = { @@ -484,12 +485,12 @@ uint16 burke_st_right[] = { 1, 1, 38, - 0, + 0 }; uint16 burke_u_to_l[] = { 43-8+150*64, - 0, + 0 }; uint16 hand_op_seq[] = { @@ -614,7 +615,7 @@ uint16 hand_op_seq[] = { 216, 240, 15, - 0, + 0 }; uint16 helmet_up[] = { @@ -640,7 +641,7 @@ uint16 helmet_up[] = { 1, 1, 0, - 0, + 0 }; uint16 hand_in_seq[] = { @@ -690,12 +691,12 @@ uint16 hand_in_seq[] = { 216, 240, 4, - 0, + 0 }; uint16 burke_r_to_u[] = { 45-8+150*64, - 0, + 0 }; uint16 burke_left[] = { @@ -731,7 +732,7 @@ uint16 burke_left[] = { 23+150*64, 65532, 0, - 0, + 0 }; uint16 burke_st_up[] = { @@ -739,7 +740,7 @@ uint16 burke_st_up[] = { 1, 1, 36, - 0, + 0 }; uint16 burke_st_left[] = { @@ -747,7 +748,7 @@ uint16 burke_st_left[] = { 1, 1, 34, - 0, + 0 }; uint16 chair_table[] = { @@ -773,7 +774,7 @@ uint16 chair_table[] = { GT_FLOOR_FROM_CHAIR, ID_HELMET_COLE, GT_FLOOR_FROM_CHAIR, - 65535, + 65535 }; Compact gas = { @@ -795,6 +796,17 @@ Compact gas = { 294-276, // mouseSize_x 326-269, // mouseSize_y GAS_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 lung_seq[] = { @@ -913,14 +925,14 @@ uint16 lung_seq[] = { 308, 212, 21, - 0, + 0 }; uint16 burke_l_to_r[] = { 41-8+150*64, 40-8+150*64, 47-8+150*64, - 0, + 0 }; uint16 glass_slot_open[] = { @@ -937,7 +949,7 @@ uint16 glass_slot_open[] = { 1, 1, 3, - 0, + 0 }; ExtCompact body_ext = { @@ -966,6 +978,10 @@ ExtCompact body_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact body = { @@ -997,7 +1013,7 @@ Compact body = { 0, // mode BODY_SSS, // baseSub 0, // baseSub_off - &body_ext, + &body_ext }; uint16 glove_off_seq[] = { @@ -1023,7 +1039,7 @@ uint16 glove_off_seq[] = { 328, 261, 0, - 0, + 0 }; uint16 rs_small_burke[] = { @@ -1031,12 +1047,12 @@ uint16 rs_small_burke[] = { 0, C_MOUSE_REL_Y, 0, - 65535, + 65535 }; uint16 burke_d_to_l[] = { 41-8+150*64, - 0, + 0 }; uint16 rs_foster_26_27[] = { @@ -1048,7 +1064,7 @@ uint16 rs_foster_26_27[] = { 27, C_PLACE, ID_S27_FLOOR, - 65535, + 65535 }; uint32 *grid27 = 0; @@ -1086,7 +1102,7 @@ uint16 burke_up[] = { 7+150*64, 0, 65534, - 0, + 0 }; uint16 operate_seq[] = { @@ -1214,7 +1230,7 @@ uint16 operate_seq[] = { 326, 260, 0, - 0, + 0 }; uint16 s27_floor_table[] = { @@ -1246,7 +1262,7 @@ uint16 s27_floor_table[] = { GT_HELMET, ID_BODY, GT_BODY, - 65535, + 65535 }; uint16 helmet_down[] = { @@ -1272,7 +1288,7 @@ uint16 helmet_down[] = { 1, 1, 7, - 0, + 0 }; uint32 *heart_seq = 0; @@ -1420,12 +1436,12 @@ uint16 squirm_seq[] = { 230, 234, 7, - 0, + 0 }; uint16 burke_r_to_d[] = { 47-8+150*64, - 0, + 0 }; uint16 glove_on_seq[] = { @@ -1451,7 +1467,7 @@ uint16 glove_on_seq[] = { 328, 261, 6, - 0, + 0 }; Compact chart2 = { @@ -1473,13 +1489,24 @@ Compact chart2 = { 416-395, // mouseSize_x 251-201, // mouseSize_y CHART2_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 burke_r_to_l[] = { 45-8+150*64, 44-8+150*64, 43-8+150*64, - 0, + 0 }; Compact chart1 = { @@ -1501,6 +1528,17 @@ Compact chart1 = { 289-263, // mouseSize_x 241-193, // mouseSize_y CHART1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_big_burke[] = { @@ -1508,7 +1546,7 @@ uint16 rs_big_burke[] = { 65520, C_MOUSE_REL_Y, 65488, - 65535, + 65535 }; uint16 burke_down[] = { @@ -1544,7 +1582,7 @@ uint16 burke_down[] = { 15+150*64, 0, 2, - 0, + 0 }; uint16 medi_comp_seq[] = { @@ -1693,7 +1731,7 @@ uint16 medi_comp_seq[] = { 194, 264, 30, - 0, + 0 }; uint16 helmet_op_seq[] = { @@ -1839,7 +1877,7 @@ uint16 helmet_op_seq[] = { 232, 207, 7, - 0, + 0 }; uint16 gas_seq[] = { @@ -1943,12 +1981,12 @@ uint16 gas_seq[] = { 288, 256, 0, - 0, + 0 }; uint16 burke_l_to_d[] = { 41-8+150*64, - 0, + 0 }; uint16 glass_slot_close[] = { @@ -1965,7 +2003,7 @@ uint16 glass_slot_close[] = { 1, 1, 0, - 0, + 0 }; uint16 s27_mouse[] = { @@ -1982,7 +2020,7 @@ uint16 s27_mouse[] = { ID_HELMET_COLE, ID_S27_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 burke_right[] = { @@ -2018,7 +2056,7 @@ uint16 burke_right[] = { 31+150*64, 4, 0, - 0, + 0 }; uint16 burke_st_down[] = { @@ -2026,17 +2064,17 @@ uint16 burke_st_down[] = { 1, 1, 32, - 0, + 0 }; uint16 burke_u_to_r[] = { 45-8+150*64, - 0, + 0 }; uint16 burke_d_to_r[] = { 47-8+150*64, - 0, + 0 }; TurnTable burke_turnTable0 = { @@ -2074,7 +2112,7 @@ TurnTable burke_turnTable0 = { 0, 0, 0 - }, + } }; MegaSet burke_megaSet0 = { @@ -2091,7 +2129,7 @@ MegaSet burke_megaSet0 = { burke_st_left, // standLeft burke_st_right, // standRight burke_st_talk, // standTalk - &burke_turnTable0, + &burke_turnTable0 }; ExtCompact burke_ext = { @@ -2121,6 +2159,9 @@ ExtCompact burke_ext = { burke_auto, // animScratch 0, // megaSet &burke_megaSet0, + 0, + 0, + 0 }; Compact burke = { @@ -2152,7 +2193,7 @@ Compact burke = { 0, // mode BURKE_LOGIC, // baseSub 0, // baseSub_off - &burke_ext, + &burke_ext }; uint16 shake_seq[] = { @@ -2211,7 +2252,7 @@ uint16 shake_seq[] = { 325, 256, 10, - 0, + 0 }; uint16 hands_out_seq[] = { @@ -2303,7 +2344,7 @@ uint16 hands_out_seq[] = { 216, 240, 4, - 0, + 0 }; uint16 s27_pal[] = { @@ -2690,7 +2731,7 @@ uint16 s27_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 s27_fast_list[] = { @@ -2709,7 +2750,7 @@ uint16 s27_fast_list[] = { 211+DISK_8, 213+DISK_8, 163+DISK_8+0X000, - 0, + 0 }; Compact medi_comp = { @@ -2741,6 +2782,7 @@ Compact medi_comp = { 0, // mode MEDIC_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact glass_slot = { @@ -2772,6 +2814,7 @@ Compact glass_slot = { 0, // mode GLASS_SLOT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 in_chair_seq[] = { @@ -2812,7 +2855,7 @@ uint16 in_chair_seq[] = { 233, 235, 11, - 0, + 0 }; uint16 s27_chip_list[] = { @@ -2832,7 +2875,7 @@ uint16 s27_chip_list[] = { 144+DISK_8, 145+DISK_8, 146+DISK_8, - 0, + 0 }; uint16 kidney_seq[] = { @@ -2975,7 +3018,7 @@ uint16 kidney_seq[] = { 308, 212, 0, - 0, + 0 }; Compact scanner_27 = { @@ -3007,6 +3050,7 @@ Compact scanner_27 = { 0, // mode SCANNER_27_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact s27_floor = { @@ -3028,6 +3072,17 @@ Compact s27_floor = { 320, // mouseSize_x 4242, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 fprint_seq[] = { @@ -3152,7 +3207,7 @@ uint16 fprint_seq[] = { 194, 264, 1, - 0, + 0 }; Compact right_exit_27 = { @@ -3174,6 +3229,17 @@ Compact right_exit_27 = { 382-363, // mouseSize_x 267-202, // mouseSize_y ER27_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact chair_27 = { @@ -3195,6 +3261,17 @@ Compact chair_27 = { 256-230, // mouseSize_x 283-236, // mouseSize_y CHAIR_27_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/28comp.h b/sky/compacts/28comp.h index ca3cd821c0..de28d3945b 100644 --- a/sky/compacts/28comp.h +++ b/sky/compacts/28comp.h @@ -41,7 +41,7 @@ uint16 s28_chip_list[] = { 13, 69+DISK_9, 18+DISK_8, - 0, + 0 }; uint16 s28_floor_table[] = { @@ -71,7 +71,7 @@ uint16 s28_floor_table[] = { GT_LIFT_28, ID_SLOT_28, GT_SLOT_28, - 65535, + 65535 }; uint16 s28_sml_table[] = { @@ -87,7 +87,7 @@ uint16 s28_sml_table[] = { SML_RIGHT_28, 5, SML_LEFT_28, - 65535, + 65535 }; Compact s28_sml_floor = { @@ -109,6 +109,17 @@ Compact s28_sml_floor = { 304-192, // mouseSize_x 16, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 slot_28_anim[] = { @@ -134,7 +145,7 @@ uint16 slot_28_anim[] = { 1, 1, 0, - 0, + 0 }; Compact left_exit_28 = { @@ -156,6 +167,17 @@ Compact left_exit_28 = { 144-127, // mouseSize_x 308-180, // mouseSize_y EL28_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_foster_28_29[] = { @@ -167,7 +189,7 @@ uint16 rs_foster_28_29[] = { 29, C_PLACE, ID_S29_FLOOR, - 65535, + 65535 }; Compact s28_floor = { @@ -189,6 +211,17 @@ Compact s28_floor = { 320, // mouseSize_x 312-248, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s28_logic[] = { @@ -205,7 +238,7 @@ uint16 s28_logic[] = { ID_CAT, ID_CATFOOD, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; Compact small_r_28 = { @@ -227,6 +260,17 @@ Compact small_r_28 = { 339-308, // mouseSize_x 186-137, // mouseSize_y R_28_SML_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s28_pal[] = { @@ -613,7 +657,7 @@ uint16 s28_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact up_exit_28 = { @@ -635,6 +679,17 @@ Compact up_exit_28 = { 394-369, // mouseSize_x 254-196, // mouseSize_y EU28_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact dustbin_28 = { @@ -656,6 +711,17 @@ Compact dustbin_28 = { 339-326, // mouseSize_x 253-236, // mouseSize_y DUSTBIN_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *grid28 = 0; @@ -673,7 +739,7 @@ uint16 rs_31_28[] = { DOWN, C_PLACE, ID_S28_FLOOR, - 65535, + 65535 }; Compact slot_28 = { @@ -695,6 +761,17 @@ Compact slot_28 = { 5, // mouseSize_x 8, // mouseSize_y S28_SLOT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s28_mouse[] = { @@ -708,7 +785,7 @@ uint16 s28_mouse[] = { ID_SLOT_28, ID_S28_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 lift_28_close[] = { @@ -740,7 +817,7 @@ uint16 lift_28_close[] = { 1, 1, 0, - 0, + 0 }; uint16 lift_28_open[] = { @@ -772,7 +849,7 @@ uint16 lift_28_open[] = { 1, 1, 9, - 0, + 0 }; Compact right_exit_28 = { @@ -794,6 +871,17 @@ Compact right_exit_28 = { 30, // mouseSize_x 306-189, // mouseSize_y ER28_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_lamb_28[] = { @@ -813,7 +901,7 @@ uint16 rs_lamb_28[] = { LAMB_BELL_LOGIC, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint16 rs_foster_29_28[] = { @@ -825,7 +913,7 @@ uint16 rs_foster_29_28[] = { 28, C_PLACE, ID_S28_FLOOR, - 65535, + 65535 }; uint16 s28_sml_mouse[] = { @@ -834,7 +922,7 @@ uint16 s28_sml_mouse[] = { ID_SMALL_R_28, ID_S28_SML_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact lift_28 = { @@ -866,6 +954,7 @@ Compact lift_28 = { C_BASE_MODE, // mode LIFT_28_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact small_l_28 = { @@ -887,6 +976,17 @@ Compact small_l_28 = { 200-173, // mouseSize_x 186-137, // mouseSize_y L_28_SML_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/29comp.h b/sky/compacts/29comp.h index 968031c34b..dec8854650 100644 --- a/sky/compacts/29comp.h +++ b/sky/compacts/29comp.h @@ -64,7 +64,7 @@ uint16 rs_joey_7_29[] = { 1*NEXT_MEGA_SET, C_FRAME, 136*64+2, - 65535, + 65535 }; uint16 s29_floor_table[] = { @@ -94,7 +94,7 @@ uint16 s29_floor_table[] = { GT_R_TALK_29, ID_CABLE_29, GT_CABLE_29, - 65535, + 65535 }; Compact s29_floor = { @@ -116,6 +116,17 @@ Compact s29_floor = { 320, // mouseSize_x 48, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *grid29 = 0; @@ -140,7 +151,7 @@ uint16 card_slot_29_anim[] = { 1, 1, 0, - 0, + 0 }; uint16 s29_lift_open[] = { @@ -172,7 +183,7 @@ uint16 s29_lift_open[] = { 1, 1, 9, - 0, + 0 }; uint16 rs_19_sml_28[] = { @@ -186,7 +197,7 @@ uint16 rs_19_sml_28[] = { ID_S28_SML_FLOOR, C_FRAME, 44+13*64, - 65535, + 65535 }; uint16 sml_joey_list_28[] = { @@ -195,7 +206,7 @@ uint16 sml_joey_list_28[] = { 166, 186, 1, - 0, + 0 }; Compact s29_card_slot = { @@ -217,6 +228,17 @@ Compact s29_card_slot = { 5, // mouseSize_x 8, // mouseSize_y S29_SLOT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s29_sml_mouse[] = { @@ -225,7 +247,7 @@ uint16 s29_sml_mouse[] = { ID_SMALL_L_29, ID_S29_SML_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 s29_logic[] = { @@ -238,7 +260,7 @@ uint16 s29_logic[] = { ID_LIFT29_LIGHT, ID_CABLE_29, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 s29_pal[] = { @@ -625,7 +647,7 @@ uint16 s29_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact small_l_29 = { @@ -647,6 +669,17 @@ Compact small_l_29 = { 179-156, // mouseSize_x 188-136, // mouseSize_y L_29_SML_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_foster_7_29[] = { @@ -662,7 +695,7 @@ uint16 rs_foster_7_29[] = { DOWN, C_PLACE, ID_S29_FLOOR, - 65535, + 65535 }; uint16 rs_28_sml_29[] = { @@ -674,7 +707,7 @@ uint16 rs_28_sml_29[] = { 29, C_PLACE, ID_S29_SML_FLOOR, - 65535, + 65535 }; uint16 s29_chip_list[] = { @@ -691,7 +724,7 @@ uint16 s29_chip_list[] = { 15+DISK_8, 16+DISK_8, 13, - 0, + 0 }; uint16 s29_lift_close[] = { @@ -723,7 +756,7 @@ uint16 s29_lift_close[] = { 1, 1, 0, - 0, + 0 }; uint16 rs_29_sml_23[] = { @@ -737,7 +770,7 @@ uint16 rs_29_sml_23[] = { ID_S23_FLOOR, C_FRAME, 44+12*64, - 65535, + 65535 }; uint16 rs_lamb_start_bel[] = { @@ -751,7 +784,7 @@ uint16 rs_lamb_start_bel[] = { ID_S28_FLOOR, C_STATUS, ST_SORT+ST_RECREATE+ST_LOGIC+ST_GRID_PLOT+ST_COLLISION+ST_MOUSE, - 65535, + 65535 }; uint16 s29_mouse[] = { @@ -764,7 +797,7 @@ uint16 s29_mouse[] = { ID_CABLE_29, ID_S29_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact lift_29 = { @@ -796,6 +829,7 @@ Compact lift_29 = { C_BASE_MODE, // mode S29_LIFT_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact lift29_light = { @@ -808,6 +842,26 @@ Compact lift29_light = { 0XEE, // xcood 0XBE, // ycood 20*64, // frame + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 joey_list_s29[] = { @@ -816,7 +870,7 @@ uint16 joey_list_s29[] = { 276, 304, 1, - 0, + 0 }; Compact right_exit_29 = { @@ -838,6 +892,17 @@ Compact right_exit_29 = { 414-397, // mouseSize_x 262-201, // mouseSize_y ER29_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_foster_23_29[] = { @@ -849,7 +914,7 @@ uint16 rs_foster_23_29[] = { 29, C_PLACE, ID_S29_FLOOR, - 65535, + 65535 }; Compact left_exit_29 = { @@ -871,6 +936,17 @@ Compact left_exit_29 = { 144-127, // mouseSize_x 300-180, // mouseSize_y EL29_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 lamb_card_29[] = { @@ -902,7 +978,7 @@ uint16 lamb_card_29[] = { 276, 231, 0, - 0, + 0 }; Compact cable_29 = { @@ -924,6 +1000,17 @@ Compact cable_29 = { 45, // mouseSize_x 20, // mouseSize_y CABLE_29_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 get_cable_29_seq[] = { @@ -970,7 +1057,7 @@ uint16 get_cable_29_seq[] = { 293, 252, 0, - 0, + 0 }; Compact small_r_29 = { @@ -992,6 +1079,17 @@ Compact small_r_29 = { 348-319, // mouseSize_x 186-137, // mouseSize_y R_29_SML_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s29_sml_table[] = { @@ -1007,7 +1105,7 @@ uint16 s29_sml_table[] = { SML_RIGHT_29, 5, SML_LEFT_29, - 65535, + 65535 }; Compact s29_sml_floor = { @@ -1029,6 +1127,17 @@ Compact s29_sml_floor = { 320-176, // mouseSize_x 16, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_23_sml_29[] = { @@ -1042,7 +1151,7 @@ uint16 rs_23_sml_29[] = { ID_S29_SML_FLOOR, C_FRAME, 44+13*64, - 65535, + 65535 }; uint16 rs_29_sml_28[] = { @@ -1054,7 +1163,7 @@ uint16 rs_29_sml_28[] = { 28, C_PLACE, ID_S28_SML_FLOOR, - 65535, + 65535 }; uint16 sml_joey_list_29[] = { @@ -1063,7 +1172,7 @@ uint16 sml_joey_list_29[] = { 166, 186, 1, - 0, + 0 }; void *data_3[] = { @@ -1478,7 +1587,7 @@ void *data_3[] = { lift_28_close, &slot_28, slot_28_anim, - rs_31_28, + rs_31_28 }; }; // namespace SkyCompact diff --git a/sky/compacts/2compact.h b/sky/compacts/2compact.h index 0a0ba1fba1..fb2ea5c687 100644 --- a/sky/compacts/2compact.h +++ b/sky/compacts/2compact.h @@ -29,7 +29,7 @@ namespace SkyCompact { uint16 sml_loaderb_l_to_u[] = { 24+158*64, - 0, + 0 }; uint16 joey_list_s2[] = { @@ -48,12 +48,12 @@ uint16 joey_list_s2[] = { 232, 248, 0, - 0, + 0 }; uint16 sml_loader_u_to_l[] = { 24+158*64, - 0, + 0 }; uint32 *c4121 = 0; @@ -75,7 +75,7 @@ uint16 loader_right[] = { 13+156*64, 2, 0, - 0, + 0 }; uint16 loaderb_st_left[] = { @@ -83,12 +83,12 @@ uint16 loaderb_st_left[] = { 1, 1, 3, - 0, + 0 }; uint16 loader_r_to_d[] = { 14+156*64, - 0, + 0 }; uint16 loader_st_down[] = { @@ -96,14 +96,14 @@ uint16 loader_st_down[] = { 1, 1, 3, - 0, + 0 }; uint16 sml_loaderb_l_to_r[] = { 20+159*64, 159*64, 19+159*64, - 0, + 0 }; uint16 loaderb_st_down[] = { @@ -111,12 +111,12 @@ uint16 loaderb_st_down[] = { 1, 1, 0, - 0, + 0 }; uint16 sml_loaderb_r_to_u[] = { 23+158*64, - 0, + 0 }; uint16 sml_loaderb_st_up[] = { @@ -124,12 +124,12 @@ uint16 sml_loaderb_st_up[] = { 1, 1, 0, - 0, + 0 }; uint16 loaderb_d_to_l[] = { 12+157*64, - 0, + 0 }; uint16 sml_loaderb_st_right[] = { @@ -137,19 +137,19 @@ uint16 sml_loaderb_st_right[] = { 1, 1, 11, - 0, + 0 }; uint16 sml_loader_r_to_l[] = { 23+158*64, 0+158*64, 24+158*64, - 0, + 0 }; uint16 sml_loader_r_to_u[] = { 23+158*64, - 0, + 0 }; uint16 sml_loader_st_down[] = { @@ -157,24 +157,24 @@ uint16 sml_loader_st_down[] = { 1, 1, 3, - 0, + 0 }; uint16 loader_l_to_r[] = { 17+156*64, 3+156*64, 14+156*64, - 0, + 0 }; uint16 sml_loaderb_d_to_l[] = { 20+159*64, - 0, + 0 }; uint16 loaderb_r_to_u[] = { 15+156*64, - 0, + 0 }; uint16 loader_left[] = { @@ -194,7 +194,7 @@ uint16 loader_left[] = { 9+156*64, 65534, 0, - 0, + 0 }; uint16 loaderb_right[] = { @@ -214,19 +214,19 @@ uint16 loaderb_right[] = { 10+157*64, 2, 0, - 0, + 0 }; uint16 loaderb_r_to_d[] = { 11+157*64, - 0, + 0 }; uint16 loader_d_to_u[] = { 14+156*64, 10+156*64, 15+156*64, - 0, + 0 }; uint16 sml_loaderb_st_down[] = { @@ -234,7 +234,7 @@ uint16 sml_loaderb_st_down[] = { 1, 1, 0, - 0, + 0 }; uint16 sml_loaderb_up[] = { @@ -250,12 +250,12 @@ uint16 sml_loaderb_up[] = { 2+158*64, 0, 65535, - 0, + 0 }; uint16 sml_loader_d_to_r[] = { 22+158*64, - 0, + 0 }; uint16 loader_st_up[] = { @@ -263,7 +263,7 @@ uint16 loader_st_up[] = { 1, 1, 0, - 0, + 0 }; Compact right_exit_rm2 = { @@ -285,6 +285,17 @@ Compact right_exit_rm2 = { 11, // mouseSize_x 71, // mouseSize_y ER2_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sml_loaderb_right[] = { @@ -320,12 +331,12 @@ uint16 sml_loaderb_right[] = { 18+159*64, 1, 0, - 0, + 0 }; uint16 loader_u_to_l[] = { 16+156*64, - 0, + 0 }; uint16 sml_loader_st_right[] = { @@ -333,7 +344,7 @@ uint16 sml_loader_st_right[] = { 1, 1, 14, - 0, + 0 }; Compact panel = { @@ -365,6 +376,7 @@ Compact panel = { C_BASE_MODE, // mode PANEL_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact alarm_flash = { @@ -396,6 +408,7 @@ Compact alarm_flash = { C_BASE_MODE, // mode ALARM_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 loader_st_right[] = { @@ -403,41 +416,41 @@ uint16 loader_st_right[] = { 1, 1, 10, - 0, + 0 }; uint16 sml_loader_l_to_u[] = { 24+158*64, - 0, + 0 }; uint8 loader_auto[64]; uint16 loaderb_u_to_r[] = { 15+156*64, - 0, + 0 }; uint16 sml_loader_u_to_r[] = { 23+158*64, - 0, + 0 }; uint16 loaderb_d_to_r[] = { 11+157*64, - 0, + 0 }; uint16 loaderb_u_to_l[] = { 16+156*64, - 0, + 0 }; uint16 sml_loaderb_d_to_u[] = { 19+159*64, 11+159*64, 23+158*64, - 0, + 0 }; uint16 loaderb_left[] = { @@ -457,17 +470,17 @@ uint16 loaderb_left[] = { 6+157*64, 65534, 0, - 0, + 0 }; uint16 sml_loaderb_r_to_d[] = { 19+159*64, - 0, + 0 }; uint16 loader_l_to_u[] = { 16+156*64, - 0, + 0 }; uint16 sml_loader_up[] = { @@ -483,18 +496,18 @@ uint16 sml_loader_up[] = { 2+158*64, 0, 65535, - 0, + 0 }; uint16 rs_test_jobs[] = { C_BASE_SUB, BASIC_JOBS, - 65535, + 65535 }; uint16 loaderb_l_to_d[] = { 12+157*64, - 0, + 0 }; uint16 sc2_mouse[] = { @@ -513,7 +526,7 @@ uint16 sc2_mouse[] = { ID_L_EXIT_S2, ID_R_EXIT_S2, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 loaderb_up[] = { @@ -529,21 +542,21 @@ uint16 loaderb_up[] = { 2+156*64, 0, 65535, - 0, + 0 }; uint16 loader_u_to_d[] = { 16+156*64, 6+156*64, 17+156*64, - 0, + 0 }; uint16 sml_loader_u_to_d[] = { 24+158*64, 6+158*64, 25+158*64, - 0, + 0 }; Compact hole = { @@ -565,6 +578,17 @@ Compact hole = { 45, // mouseSize_x 19, // mouseSize_y HOLE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 loaderb_st_up[] = { @@ -572,7 +596,7 @@ uint16 loaderb_st_up[] = { 1, 1, 0, - 0, + 0 }; uint16 sml_loader_down[] = { @@ -588,17 +612,17 @@ uint16 sml_loader_down[] = { 5+158*64, 0, 1, - 0, + 0 }; uint16 sml_loaderb_u_to_l[] = { 24+158*64, - 0, + 0 }; uint16 loader_l_to_d[] = { 17+156*64, - 0, + 0 }; uint16 *left_table2 = 0; @@ -607,31 +631,31 @@ uint16 sml_loaderb_u_to_d[] = { 24+158*64, 3+159*64, 20+159*64, - 0, + 0 }; uint16 loader_u_to_r[] = { 15+156*64, - 0, + 0 }; uint16 loaderb_l_to_r[] = { 12+157*64, 157*64, 11+157*64, - 0, + 0 }; uint16 sml_loader_d_to_l[] = { 25+158*64, - 0, + 0 }; uint16 loaderb_r_to_l[] = { 15+156*64, 0+156*64, 17+156*64, - 0, + 0 }; uint16 top_lift_table[] = { @@ -659,7 +683,7 @@ uint16 top_lift_table[] = { GT_JUNK1, ID_JUNK2, GT_JUNK2, - 65535, + 65535 }; Compact robot_shell = { @@ -691,6 +715,7 @@ Compact robot_shell = { C_BASE_MODE, // mode JOEY_START, // baseSub 0, // baseSub_off + 0 }; Compact junk1 = { @@ -712,6 +737,17 @@ Compact junk1 = { 306-276, // mouseSize_x 309-293, // mouseSize_y JUNK1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 loader_down[] = { @@ -727,12 +763,12 @@ uint16 loader_down[] = { 5+156*64, 0, 1, - 0, + 0 }; uint16 loader_d_to_r[] = { 14+156*64, - 0, + 0 }; uint16 top_lift_up[] = { @@ -759,7 +795,7 @@ uint16 top_lift_up[] = { 250, 0, 0, - 0, + 0 }; uint16 sml_loader_st_up[] = { @@ -767,7 +803,7 @@ uint16 sml_loader_st_up[] = { 1, 1, 0, - 0, + 0 }; uint16 transporter_table[] = { @@ -797,12 +833,12 @@ uint16 transporter_table[] = { GT_JUNK1, ID_JUNK2, GT_JUNK2, - 65535, + 65535 }; uint16 sml_loader_r_to_d[] = { 22+158*64, - 0, + 0 }; uint16 loaderb_st_right[] = { @@ -810,7 +846,7 @@ uint16 loaderb_st_right[] = { 1, 1, 7, - 0, + 0 }; uint16 chip_list_s2[] = { @@ -826,7 +862,7 @@ uint16 chip_list_s2[] = { 134, 150, 227, - 0, + 0 }; uint32 *exit_table = 0; @@ -835,7 +871,7 @@ uint16 sml_loaderb_r_to_l[] = { 23+158*64, 0+158*64, 24+158*64, - 0, + 0 }; Compact dead_loader = { @@ -867,6 +903,7 @@ Compact dead_loader = { 0, // mode DEAD_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 top_lift_2_up[] = { @@ -926,12 +963,12 @@ uint16 top_lift_2_up[] = { 196, 0, 0, - 0, + 0 }; uint16 loaderb_l_to_u[] = { 16+156*64, - 0, + 0 }; uint16 loaderb_down[] = { @@ -947,12 +984,12 @@ uint16 loaderb_down[] = { 2+157*64, 0, 1, - 0, + 0 }; uint16 loader_r_to_u[] = { 15+156*64, - 0, + 0 }; uint16 top_lift_2_down[] = { @@ -1011,7 +1048,7 @@ uint16 top_lift_2_down[] = { 284, 196, 17, - 0, + 0 }; Compact left_exit_rm2 = { @@ -1033,6 +1070,17 @@ Compact left_exit_rm2 = { 20, // mouseSize_x 150, // mouseSize_y EL2_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 loader_up[] = { @@ -1048,7 +1096,7 @@ uint16 loader_up[] = { 2+156*64, 0, 65535, - 0, + 0 }; uint16 loader_st_left[] = { @@ -1056,33 +1104,33 @@ uint16 loader_st_left[] = { 1, 1, 6, - 0, + 0 }; uint16 loader_d_to_l[] = { 17+156*64, - 0, + 0 }; uint16 loader_r_to_l[] = { 15+156*64, 0+156*64, 16+156*64, - 0, + 0 }; uint16 loaderb_u_to_d[] = { 17+156*64, 3+157*64, 12+157*64, - 0, + 0 }; uint16 loaderb_d_to_u[] = { 11+157*64, 7+157*64, 15+156*64, - 0, + 0 }; uint16 sml_loader_left[] = { @@ -1118,7 +1166,7 @@ uint16 sml_loader_left[] = { 13+158*64, 65535, 0, - 0, + 0 }; uint16 sml_loader_right[] = { @@ -1154,7 +1202,7 @@ uint16 sml_loader_right[] = { 21+158*64, 1, 0, - 0, + 0 }; uint16 sml_loader_st_left[] = { @@ -1162,26 +1210,26 @@ uint16 sml_loader_st_left[] = { 1, 1, 6, - 0, + 0 }; uint16 sml_loader_d_to_u[] = { 22+158*64, 14+158*64, 23+158*64, - 0, + 0 }; uint16 sml_loader_l_to_d[] = { 25+158*64, - 0, + 0 }; uint16 sml_loader_l_to_r[] = { 25+158*64, 3+158*64, 22+158*64, - 0, + 0 }; uint16 sml_loaderb_down[] = { @@ -1197,7 +1245,7 @@ uint16 sml_loaderb_down[] = { 2+159*64, 0, 1, - 0, + 0 }; uint16 sml_loaderb_left[] = { @@ -1233,7 +1281,7 @@ uint16 sml_loaderb_left[] = { 10+159*64, 65535, 0, - 0, + 0 }; uint16 sml_loaderb_st_left[] = { @@ -1241,22 +1289,22 @@ uint16 sml_loaderb_st_left[] = { 1, 1, 3, - 0, + 0 }; uint16 sml_loaderb_u_to_r[] = { 23+158*64, - 0, + 0 }; uint16 sml_loaderb_d_to_r[] = { 19+159*64, - 0, + 0 }; uint16 sml_loaderb_l_to_d[] = { 20+159*64, - 0, + 0 }; TurnTable loader_turnTable0 = { @@ -1408,7 +1456,7 @@ TurnTable loader_turnTable3 = { 0, 0, 0 - }, + } }; MegaSet loader_megaSet0 = { @@ -1476,7 +1524,7 @@ MegaSet loader_megaSet3 = { sml_loaderb_st_left, // standLeft sml_loaderb_st_right, // standRight 0, // standTalk - &loader_turnTable3, + &loader_turnTable3 }; ExtCompact loader_ext = { @@ -1508,7 +1556,7 @@ ExtCompact loader_ext = { &loader_megaSet0, &loader_megaSet1, &loader_megaSet2, - &loader_megaSet3, + &loader_megaSet3 }; Compact loader = { @@ -1540,7 +1588,7 @@ Compact loader = { 0, // mode LOADER_START, // baseSub 0, // baseSub_off - &loader_ext, + &loader_ext }; Compact junk2 = { @@ -1562,6 +1610,17 @@ Compact junk2 = { 355-332, // mouseSize_x 315-289, // mouseSize_y JUNK2_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 fast_list_sc2[] = { @@ -1582,7 +1641,7 @@ uint16 fast_list_sc2[] = { 164, 165, 149, - 0, + 0 }; Compact light_one = { @@ -1614,6 +1673,7 @@ Compact light_one = { C_BASE_MODE, // mode LIGHT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc2_logic[] = { @@ -1635,7 +1695,7 @@ uint16 sc2_logic[] = { ID_ROBOT_SHELL, ID_PRESS, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; Compact top_lift_2 = { @@ -1667,6 +1727,7 @@ Compact top_lift_2 = { C_BASE_MODE, // mode TOP_LIFT_2_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact top_lift = { @@ -1698,6 +1759,7 @@ Compact top_lift = { C_BASE_MODE, // mode TOP_LIFT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 top_lift_down[] = { @@ -1723,7 +1785,7 @@ uint16 top_lift_down[] = { 244, 250, 6, - 0, + 0 }; Compact top_barrel = { @@ -1755,6 +1817,7 @@ Compact top_barrel = { C_BASE_MODE, // mode TOP_BARREL_LOGIC, // baseSub 0, // baseSub_off + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/30comp.h b/sky/compacts/30comp.h index c19a988513..ecd6e246a2 100644 --- a/sky/compacts/30comp.h +++ b/sky/compacts/30comp.h @@ -239,7 +239,7 @@ uint16 sc32_vinc_talk[] = { 218, 188, 0, - 0, + 0 }; uint16 sc30_palette[] = { @@ -626,7 +626,7 @@ uint16 sc30_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint32 *sec4_compacts = 0; @@ -781,7 +781,7 @@ uint16 sc36_col_talk2[] = { 219, 226, 0, - 0, + 0 }; uint16 sc42_judge_point[] = { @@ -979,7 +979,7 @@ uint16 sc42_judge_point[] = { 269, 186, 8, - 0, + 0 }; uint16 sc30_floor_table[] = { @@ -1015,7 +1015,7 @@ uint16 sc30_floor_table[] = { GT_SC30_RIGHT_TALK, ID_JOEY_PARK, GT_DANI_WAIT, - 65535, + 65535 }; Compact sc30_floor = { @@ -1037,6 +1037,17 @@ Compact sc30_floor = { 447-184, // mouseSize_x 327-240, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 reset_33_30[] = { @@ -1048,7 +1059,7 @@ uint16 reset_33_30[] = { OFF_RIGHT, C_YCOOD, 312, - 65535, + 65535 }; uint16 sc30_hen_step_b[] = { @@ -1068,7 +1079,7 @@ uint16 sc30_hen_step_b[] = { 1, 1, 3, - 0, + 0 }; uint16 sc42_pros_talk[] = { @@ -1266,7 +1277,7 @@ uint16 sc42_pros_talk[] = { 197, 277, 2, - 0, + 0 }; uint16 sc36_col_talk1[] = { @@ -1419,7 +1430,7 @@ uint16 sc36_col_talk1[] = { 219, 226, 3, - 0, + 0 }; uint16 sc30_fast_list[] = { @@ -1430,7 +1441,7 @@ uint16 sc30_fast_list[] = { 54+DISK_12, 135+DISK_12, IT_SC30_HENRI_BLINK+DISK_12, - 0, + 0 }; uint16 sc30_chip_list[] = { @@ -1449,7 +1460,7 @@ uint16 sc30_chip_list[] = { IT_SC30_HENRI_STEP+DISK_12, IT_SC30_COURT_DOOR+DISK_12, IT_SC30_PUSH_DOOR+DISK_12, - 0, + 0 }; uint16 sc30_logic_list[] = { @@ -1461,7 +1472,7 @@ uint16 sc30_logic_list[] = { ID_SC30_COURT_DOOR, ID_SC32_LIFT, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc30_mouse_list[] = { @@ -1477,7 +1488,7 @@ uint16 sc30_mouse_list[] = { ID_SC30_COURT_DOOR, ID_SC30_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint32 *sc30_walk_grid = 0; @@ -1501,6 +1512,17 @@ Compact sc30_exit_31 = { 447-420, // mouseSize_x 256-190, // mouseSize_y SC30_EXIT_31_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc30_exit_33 = { @@ -1522,6 +1544,17 @@ Compact sc30_exit_33 = { 447-420, // mouseSize_x 327-270, // mouseSize_y SC30_EXIT_33_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 reset_31_30[] = { @@ -1533,7 +1566,7 @@ uint16 reset_31_30[] = { OFF_RIGHT, C_YCOOD, 248, - 65535, + 65535 }; Compact sc30_court_door = { @@ -1565,6 +1598,7 @@ Compact sc30_court_door = { C_BASE_MODE, // mode SC30_COURT_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc30_notice = { @@ -1586,6 +1620,17 @@ Compact sc30_notice = { 174-169, // mouseSize_x 227-218, // mouseSize_y SC30_NOTICE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc30_statue_1 = { @@ -1607,6 +1652,17 @@ Compact sc30_statue_1 = { 220-206, // mouseSize_x 244-215, // mouseSize_y SC30_STATUE_1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc30_statue_2 = { @@ -1628,6 +1684,17 @@ Compact sc30_statue_2 = { 360-330, // mouseSize_x 249-220, // mouseSize_y SC30_STATUE_2_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc30_exit_36 = { @@ -1649,6 +1716,17 @@ Compact sc30_exit_36 = { 288-280, // mouseSize_x 290-231, // mouseSize_y SC30_EXIT_36_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; ExtCompact sc30_henri_ext = { @@ -1677,6 +1755,10 @@ ExtCompact sc30_henri_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc30_henri = { @@ -1708,7 +1790,7 @@ Compact sc30_henri = { C_BASE_MODE, // mode SC30_HENRI_LOGIC, // baseSub 0, // baseSub_off - &sc30_henri_ext, + &sc30_henri_ext }; uint16 sc30_henri_talk[] = { @@ -1906,7 +1988,7 @@ uint16 sc30_henri_talk[] = { 284, 228, 1, - 0, + 0 }; uint16 sc30_henri_tie[] = { @@ -1983,7 +2065,7 @@ uint16 sc30_henri_tie[] = { 284, 228, 7, - 0, + 0 }; uint16 sc30_hen_step_f[] = { @@ -2003,7 +2085,7 @@ uint16 sc30_hen_step_f[] = { 1, 1, 0, - 0, + 0 }; uint16 sc30_hen_blink[] = { @@ -2023,7 +2105,7 @@ uint16 sc30_hen_blink[] = { 1, 1, 3+89*64, - 0, + 0 }; uint16 sc30_push_door[] = { @@ -2064,7 +2146,7 @@ uint16 sc30_push_door[] = { 162, 208, 5, - 0, + 0 }; uint16 reset_36_30[] = { @@ -2080,7 +2162,7 @@ uint16 reset_36_30[] = { 46+12*64, C_DIR, RIGHT, - 65535, + 65535 }; uint16 sc30_joey_list[] = { @@ -2094,7 +2176,7 @@ uint16 sc30_joey_list[] = { 272, 327, 0, - 0, + 0 }; uint16 dani_conv[] = { @@ -2292,7 +2374,7 @@ uint16 dani_conv[] = { 272, 189, 0, - 0, + 0 }; uint16 sc38_dani_sattlk[] = { @@ -2490,7 +2572,7 @@ uint16 sc38_dani_sattlk[] = { 294, 244, 4, - 0, + 0 }; uint16 sc31_guard_talk[] = { @@ -2688,7 +2770,7 @@ uint16 sc31_guard_talk[] = { 328, 176, 4, - 0, + 0 }; uint16 sc38_phone_talk[] = { @@ -2886,7 +2968,7 @@ uint16 sc38_phone_talk[] = { 160, 256, 6, - 0, + 0 }; uint16 sc32_garden_talk[] = { @@ -3084,7 +3166,7 @@ uint16 sc32_garden_talk[] = { 269, 169, 0, - 0, + 0 }; uint16 sc31_guard_talk2[] = { @@ -3282,7 +3364,7 @@ uint16 sc31_guard_talk2[] = { 328, 242, 1, - 0, + 0 }; uint16 barman_talk[] = { @@ -3480,7 +3562,7 @@ uint16 barman_talk[] = { 391, 240, 0, - 0, + 0 }; uint16 sc36_gal_talk[] = { @@ -3633,7 +3715,7 @@ uint16 sc36_gal_talk[] = { 202, 238, 0, - 0, + 0 }; uint16 sc36_juke_talk[] = { @@ -3831,7 +3913,7 @@ uint16 sc36_juke_talk[] = { 233, 222, 3, - 0, + 0 }; uint16 sc36_babs_talk[] = { @@ -4029,7 +4111,7 @@ uint16 sc36_babs_talk[] = { 216, 206, 0, - 0, + 0 }; uint16 reset_42_30[] = { @@ -4041,7 +4123,7 @@ uint16 reset_42_30[] = { 144, C_YCOOD, 256, - 65535, + 65535 }; uint16 reset_court_open[] = { @@ -4049,7 +4131,7 @@ uint16 reset_court_open[] = { ST_LOGIC+ST_MOUSE+ST_RECREATE, C_CURSOR_TEXT, 1+T7, - 65535, + 65535 }; uint16 sc30_court_close[] = { @@ -4066,7 +4148,7 @@ uint16 sc30_court_close[] = { 167, 210, 3, - 0, + 0 }; uint16 sc42_judge_talk[] = { @@ -4456,7 +4538,7 @@ uint16 sc42_judge_talk[] = { 269, 186, 1, - 0, + 0 }; uint16 sc42_jobs_talk[] = { @@ -4654,7 +4736,7 @@ uint16 sc42_jobs_talk[] = { 340, 200, 0, - 0, + 0 }; uint16 sc42_blunt_talk[] = { @@ -4852,7 +4934,7 @@ uint16 sc42_blunt_talk[] = { 232, 224, 0, - 0, + 0 }; uint16 sc42_fos_talk_l[] = { @@ -5050,7 +5132,7 @@ uint16 sc42_fos_talk_l[] = { 324, 279, 2, - 0, + 0 }; uint16 sc42_fos_talk_r[] = { @@ -5248,7 +5330,7 @@ uint16 sc42_fos_talk_r[] = { 324, 279, 2, - 0, + 0 }; uint16 sc42_dani_talk[] = { @@ -5446,7 +5528,7 @@ uint16 sc42_dani_talk[] = { 280, 209, 0, - 0, + 0 }; uint16 sc42_clerk_talk[] = { @@ -5644,7 +5726,7 @@ uint16 sc42_clerk_talk[] = { 310, 234, 0, - 0, + 0 }; uint16 sc42_jobs_point[] = { @@ -5842,7 +5924,7 @@ uint16 sc42_jobs_point[] = { 340, 200, 0, - 0, + 0 }; uint16 sc42_jdg_to_jobs[] = { @@ -6040,7 +6122,7 @@ uint16 sc42_jdg_to_jobs[] = { 269, 186, 0, - 0, + 0 }; void *data_4[] = { @@ -6530,7 +6612,7 @@ void *data_4[] = { reset_jukebox, reset_juke_light, sc31_guard_chat, - &sc31_at_watcher, + &sc31_at_watcher }; }; // namespace SkyCompact diff --git a/sky/compacts/31comp.h b/sky/compacts/31comp.h index d3c8fb8eb2..93adeac607 100644 --- a/sky/compacts/31comp.h +++ b/sky/compacts/31comp.h @@ -40,7 +40,7 @@ uint16 reset_start_31[] = { 40+12*64, C_DIR, DOWN, - 65535, + 65535 }; uint16 sc31_pull_rope[] = { @@ -135,7 +135,7 @@ uint16 sc31_pull_rope[] = { 225, 226, 9, - 0, + 0 }; uint16 sc31_guard_move[] = { @@ -239,7 +239,7 @@ uint16 sc31_guard_move[] = { 333, 238, 13, - 0, + 0 }; Compact sc31_exit_39 = { @@ -261,6 +261,17 @@ Compact sc31_exit_39 = { 375-347, // mouseSize_x 232-170, // mouseSize_y SC31_EXIT_39_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc31_plank_flick[] = { @@ -313,7 +324,7 @@ uint16 sc31_plank_flick[] = { 1, 1, 0, - 0, + 0 }; uint16 sc31_fast_list[] = { @@ -326,7 +337,7 @@ uint16 sc31_fast_list[] = { IT_SC31_GRID_1+DISK_12, IT_SC31_GUARD_TALK+DISK_12, IT_SC31_DROP_ROPE+DISK_12, - 0, + 0 }; uint16 sc31_dog_swim[] = { @@ -400,7 +411,7 @@ uint16 sc31_dog_swim[] = { 341, 288, 22, - 0, + 0 }; uint16 sc31_bisc_drop[] = { @@ -450,7 +461,7 @@ uint16 sc31_bisc_drop[] = { 1, 1, 2, - 0, + 0 }; uint16 reset_39_31[] = { @@ -462,7 +473,7 @@ uint16 reset_39_31[] = { 368, C_YCOOD, 224, - 65535, + 65535 }; uint16 sc31_climb_plank[] = { @@ -503,7 +514,7 @@ uint16 sc31_climb_plank[] = { 233, 278, 11, - 0, + 0 }; uint16 sc31_bricks_up[] = { @@ -565,7 +576,7 @@ uint16 sc31_bricks_up[] = { 205, 243, 2, - 0, + 0 }; Compact sc31_plank = { @@ -597,6 +608,7 @@ Compact sc31_plank = { C_BASE_MODE, // mode SC31_PLANK_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc31_lift_close[] = { @@ -628,7 +640,7 @@ uint16 sc31_lift_close[] = { 266, 179, 0, - 0, + 0 }; uint16 sc31_get_bricks[] = { @@ -666,7 +678,7 @@ uint16 sc31_get_bricks[] = { 229, 245, 1, - 0, + 0 }; uint16 sc31_rope_pulled[] = { @@ -728,7 +740,7 @@ uint16 sc31_rope_pulled[] = { 218, 228, 9, - 0, + 0 }; uint32 *sc31_walk_grid = 0; @@ -762,6 +774,7 @@ Compact sc31_rope = { C_BASE_MODE, // mode SC31_ROPE_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc31_palette[] = { @@ -1148,7 +1161,7 @@ uint16 sc31_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact sc31_exit_30 = { @@ -1170,6 +1183,17 @@ Compact sc31_exit_30 = { 140-128, // mouseSize_x 290-162, // mouseSize_y SC31_EXIT_30_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc31_put_bisc[] = { @@ -1237,7 +1261,7 @@ uint16 sc31_put_bisc[] = { 224, 240, 0, - 0, + 0 }; uint16 sc31_bricks_fall[] = { @@ -1290,7 +1314,7 @@ uint16 sc31_bricks_fall[] = { 205, 271, 1, - 0, + 0 }; uint16 sc31_plank_raise[] = { @@ -1328,7 +1352,7 @@ uint16 sc31_plank_raise[] = { 1, 1, 0, - 0, + 0 }; uint16 sc31_bisc_placed[] = { @@ -1348,7 +1372,7 @@ uint16 sc31_bisc_placed[] = { 1, 1, 105*64, - 0, + 0 }; uint16 sc31_joey_fall[] = { @@ -1383,7 +1407,7 @@ uint16 sc31_joey_fall[] = { 222, 219, 9, - 0, + 0 }; uint16 sc31_plank_drop[] = { @@ -1454,7 +1478,7 @@ uint16 sc31_plank_drop[] = { 1, 1, 5, - 0, + 0 }; uint16 sc31_lift_open[] = { @@ -1486,7 +1510,7 @@ uint16 sc31_lift_open[] = { 266, 179, 8, - 0, + 0 }; uint16 sc31_get_board[] = { @@ -1518,7 +1542,7 @@ uint16 sc31_get_board[] = { 248, 208, 0, - 0, + 0 }; uint16 sc31_rope_lower[] = { @@ -1553,7 +1577,7 @@ uint16 sc31_rope_lower[] = { 218, 228, 7, - 0, + 0 }; uint16 sc31_drop_rope[] = { @@ -1639,7 +1663,7 @@ uint16 sc31_drop_rope[] = { 225, 225, 11, - 0, + 0 }; uint16 sc31_guard_reach[] = { @@ -1674,7 +1698,7 @@ uint16 sc31_guard_reach[] = { 1, 1, 131*64, - 0, + 0 }; uint16 reset_32_31[] = { @@ -1686,7 +1710,7 @@ uint16 reset_32_31[] = { OFF_RIGHT, C_YCOOD, 256, - 65535, + 65535 }; uint16 sc31_guard_blink[] = { @@ -1703,7 +1727,7 @@ uint16 sc31_guard_blink[] = { 1, 1, 101*64, - 0, + 0 }; uint16 sc31_use_card[] = { @@ -1732,7 +1756,7 @@ uint16 sc31_use_card[] = { 272, 184, 0, - 0, + 0 }; uint16 rs_guard_avail[] = { @@ -1750,7 +1774,7 @@ uint16 rs_guard_avail[] = { 353-332, C_MOUSE_SIZE_Y, 275-244, - 65535, + 65535 }; uint16 sc31_bricks_down[] = { @@ -1785,7 +1809,7 @@ uint16 sc31_bricks_down[] = { 205, 271, 0, - 0, + 0 }; uint16 sc31_rope_drop[] = { @@ -1811,7 +1835,7 @@ uint16 sc31_rope_drop[] = { 218, 228, 2, - 0, + 0 }; uint16 sc31_get_plank[] = { @@ -1873,7 +1897,7 @@ uint16 sc31_get_plank[] = { 224, 240, 0, - 0, + 0 }; uint16 sc31_floor_table[] = { @@ -1913,7 +1937,7 @@ uint16 sc31_floor_table[] = { GT_SC31_DANIELLE, ID_SC31_JOEY, GT_SC31_JOEY, - 65535, + 65535 }; Compact sc31_floor = { @@ -1935,6 +1959,17 @@ Compact sc31_floor = { 447-128, // mouseSize_x 303-224, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc31_end_of_rope = { @@ -1956,6 +1991,17 @@ Compact sc31_end_of_rope = { 228-225, // mouseSize_x 270-229, // mouseSize_y SC31_END_OF_ROPE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc31_dog_fly[] = { @@ -2089,7 +2135,7 @@ uint16 sc31_dog_fly[] = { 323, 259, 29, - 0, + 0 }; Compact sc31_lift = { @@ -2121,6 +2167,7 @@ Compact sc31_lift = { C_BASE_MODE, // mode SC31_LIFT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc31_chip_list[] = { @@ -2152,7 +2199,7 @@ uint16 sc31_chip_list[] = { IT_SC31_GUARD_TALK2+DISK_12+0X8000, 48+DISK_12, 66+DISK_12+0X8000, - 0, + 0 }; uint16 sc31_guard_chat[] = { @@ -2349,7 +2396,7 @@ uint16 sc31_guard_chat[] = { 328, 176, 4, - 0, + 0 }; Compact sc31_biscuits = { @@ -2381,6 +2428,7 @@ Compact sc31_biscuits = { C_BASE_MODE, // mode SC31_BISCUITS_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 reset_30_31[] = { @@ -2392,7 +2440,7 @@ uint16 reset_30_31[] = { OFF_LEFT, C_YCOOD, 248, - 65535, + 65535 }; Compact sc31_bricks = { @@ -2424,6 +2472,7 @@ Compact sc31_bricks = { C_BASE_MODE, // mode SC31_BRICKS_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc31_lower_rope[] = { @@ -2476,7 +2525,7 @@ uint16 sc31_lower_rope[] = { 225, 226, 15, - 0, + 0 }; uint16 sc31_bisc_raise[] = { @@ -2514,7 +2563,7 @@ uint16 sc31_bisc_raise[] = { 1, 1, 0, - 0, + 0 }; Compact sc31_at_watcher = { @@ -2546,6 +2595,7 @@ Compact sc31_at_watcher = { C_BASE_MODE, // mode SC31_AT_WATCHER_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc31_dog_rise[] = { @@ -2577,7 +2627,7 @@ uint16 sc31_dog_rise[] = { 341, 286, 7, - 0, + 0 }; uint16 rs_guard_chat[] = { @@ -2591,7 +2641,7 @@ uint16 rs_guard_chat[] = { SC31_GUARD_CHATTING_LOGIC, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint16 sc31_mouse_list[] = { @@ -2609,7 +2659,7 @@ uint16 sc31_mouse_list[] = { ID_SC31_JOEY, ID_SC31_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sc31_joey = { @@ -2641,6 +2691,7 @@ Compact sc31_joey = { C_BASE_MODE, // mode SC31_JOEY_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc31_lift_slot = { @@ -2662,6 +2713,17 @@ Compact sc31_lift_slot = { 302-297, // mouseSize_x 209-196, // mouseSize_y SC31_LIFT_SLOT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc31_logic_list[] = { @@ -2680,7 +2742,7 @@ uint16 sc31_logic_list[] = { ID_SC31_JOEY, 16870, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; ExtCompact sc31_guard_ext = { @@ -2709,6 +2771,10 @@ ExtCompact sc31_guard_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc31_guard = { @@ -2740,7 +2806,7 @@ Compact sc31_guard = { C_BASE_MODE, // mode SC31_GUARD_LOGIC, // baseSub 0, // baseSub_off - &sc31_guard_ext, + &sc31_guard_ext }; Compact sc31_exit_32 = { @@ -2762,6 +2828,17 @@ Compact sc31_exit_32 = { 447-420, // mouseSize_x 275-162, // mouseSize_y SC31_EXIT_32_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc31_joey_list[] = { @@ -2770,7 +2847,7 @@ uint16 sc31_joey_list[] = { 240, 279, 1, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/32comp.h b/sky/compacts/32comp.h index cc519f84a8..3d9cd26cef 100644 --- a/sky/compacts/32comp.h +++ b/sky/compacts/32comp.h @@ -224,7 +224,7 @@ uint16 sc32_gardening1[] = { 1, 1, 5, - 0, + 0 }; uint16 reset_spunky_32[] = { @@ -250,7 +250,7 @@ uint16 reset_spunky_32[] = { 0, C_DIR, DOWN, - 65535, + 65535 }; uint16 sc32_vinc_anim[] = { @@ -351,7 +351,7 @@ uint16 sc32_vinc_anim[] = { 218, 188, 0, - 0, + 0 }; uint16 reset_38_32[] = { @@ -367,7 +367,7 @@ uint16 reset_38_32[] = { 40+12*64, C_DIR, DOWN, - 65535, + 65535 }; Compact sc32_plant_2 = { @@ -389,6 +389,17 @@ Compact sc32_plant_2 = { 349-336, // mouseSize_x 225-196, // mouseSize_y SC32_PLANT_2_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc32_use_card[] = { @@ -420,7 +431,7 @@ uint16 sc32_use_card[] = { 360, 240, 0, - 0, + 0 }; ExtCompact sc32_vincent_ext = { @@ -449,6 +460,10 @@ ExtCompact sc32_vincent_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc32_vincent = { @@ -480,7 +495,7 @@ Compact sc32_vincent = { C_BASE_MODE, // mode SC32_VINCENT_LOGIC, // baseSub 0, // baseSub_off - &sc32_vincent_ext, + &sc32_vincent_ext }; uint32 *sc32_walk_grid = 0; @@ -502,7 +517,7 @@ uint16 sc32_gard_turn_d[] = { 1, 1, 4, - 0, + 0 }; uint16 sc32_lift_open[] = { @@ -553,7 +568,7 @@ uint16 sc32_lift_open[] = { 175, 0, 0, - 0, + 0 }; uint16 sc32_lift_close[] = { @@ -603,7 +618,7 @@ uint16 sc32_lift_close[] = { 378, 175, 14, - 0, + 0 }; uint16 sc32_mouse_list[] = { @@ -621,7 +636,7 @@ uint16 sc32_mouse_list[] = { ID_SC32_LIFT, ID_SC32_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sc32_exit_31 = { @@ -643,6 +658,17 @@ Compact sc32_exit_31 = { 140-128, // mouseSize_x 245-162, // mouseSize_y SC32_EXIT_31_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc32_use_com[] = { @@ -674,7 +700,7 @@ uint16 sc32_use_com[] = { 200, 232, 0, - 0, + 0 }; uint16 sc32_gardener_dn[] = { @@ -697,7 +723,7 @@ uint16 sc32_gardener_dn[] = { 272, 168, 5, - 0, + 0 }; ExtCompact sc32_buzzer_ext = { @@ -726,6 +752,10 @@ ExtCompact sc32_buzzer_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc32_buzzer = { @@ -757,7 +787,7 @@ Compact sc32_buzzer = { C_BASE_MODE, // mode SC32_BUZZER_LOGIC, // baseSub 0, // baseSub_off - &sc32_buzzer_ext, + &sc32_buzzer_ext }; uint16 sc32_floor_table[] = { @@ -795,7 +825,7 @@ uint16 sc32_floor_table[] = { GT_DANI_WAIT, ID_DANIELLE, GT_SC32_DANIELLE_AT_LIFT, - 65535, + 65535 }; Compact sc32_floor = { @@ -817,6 +847,17 @@ Compact sc32_floor = { 447-128, // mouseSize_x 327-216, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc32_chip_list[] = { @@ -837,7 +878,7 @@ uint16 sc32_chip_list[] = { IT_SC32_GARD_TURN+DISK_12+0X8000, IT_SC32_GARDEN_TALK+DISK_12+0X8000, 68+DISK_12, - 0, + 0 }; uint16 sc32_palette[] = { @@ -1224,7 +1265,7 @@ uint16 sc32_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 reset_33_32[] = { @@ -1236,7 +1277,7 @@ uint16 reset_33_32[] = { OFF_LEFT, C_YCOOD, 288, - 65535, + 65535 }; ExtCompact sc32_gardener_ext = { @@ -1265,6 +1306,10 @@ ExtCompact sc32_gardener_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc32_gardener = { @@ -1296,7 +1341,7 @@ Compact sc32_gardener = { C_BASE_MODE, // mode SC32_GARDENER_LOGIC, // baseSub 0, // baseSub_off - &sc32_gardener_ext, + &sc32_gardener_ext }; uint16 sc32_fast_list[] = { @@ -1308,7 +1353,7 @@ uint16 sc32_fast_list[] = { 135+DISK_12, IT_SC32_GRID_1+DISK_12, IT_SC32_GRID_2+DISK_12, - 0, + 0 }; uint16 sc32_logic_list[] = { @@ -1321,7 +1366,7 @@ uint16 sc32_logic_list[] = { ID_SC32_LIFT, ID_SC32_BUZZER, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 reset_dani_32[] = { @@ -1357,7 +1402,7 @@ uint16 reset_dani_32[] = { DOWN, C_MEGA_SET, 0, - 65535, + 65535 }; Compact sc32_plant_3 = { @@ -1379,6 +1424,17 @@ Compact sc32_plant_3 = { 411-398, // mouseSize_x 243-216, // mouseSize_y SC32_PLANT_3_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc32_terminal = { @@ -1400,6 +1456,17 @@ Compact sc32_terminal = { 328-303, // mouseSize_x 226-181, // mouseSize_y SC32_TERMINAL_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc32_gardener_up[] = { @@ -1419,7 +1486,7 @@ uint16 sc32_gardener_up[] = { 272, 168, 0, - 0, + 0 }; Compact sc32_plant_1 = { @@ -1441,6 +1508,17 @@ Compact sc32_plant_1 = { 292-263, // mouseSize_x 217-188, // mouseSize_y SC32_PLANT_1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc32_gard_turn_u[] = { @@ -1460,7 +1538,7 @@ uint16 sc32_gard_turn_u[] = { 1, 1, 0, - 0, + 0 }; uint16 sc32_joey_list[] = { @@ -1479,7 +1557,7 @@ uint16 sc32_joey_list[] = { 248, 279, 0, - 0, + 0 }; uint16 sc32_gardening2[] = { @@ -1679,7 +1757,7 @@ uint16 sc32_gardening2[] = { 1, 1, 5, - 0, + 0 }; uint16 reset_31_32[] = { @@ -1691,7 +1769,7 @@ uint16 reset_31_32[] = { OFF_LEFT, C_YCOOD, 224, - 65535, + 65535 }; Compact sc32_lift = { @@ -1723,6 +1801,7 @@ Compact sc32_lift = { C_BASE_MODE, // mode SC32_LIFT_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc32_exit_33 = { @@ -1744,6 +1823,17 @@ Compact sc32_exit_33 = { 140-128, // mouseSize_x 327-260, // mouseSize_y SC32_EXIT_33_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/33comp.h b/sky/compacts/33comp.h index 45f6437b29..d24672a557 100644 --- a/sky/compacts/33comp.h +++ b/sky/compacts/33comp.h @@ -46,6 +46,17 @@ Compact sc33_lock = { 360-357, // mouseSize_x 251-244, // mouseSize_y SC33_LOCK_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 reset_32_33[] = { @@ -57,7 +68,7 @@ uint16 reset_32_33[] = { 352, C_YCOOD, 240, - 65535, + 65535 }; uint16 sc33_palette[] = { @@ -444,7 +455,7 @@ uint16 sc33_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc33_door_open[] = { @@ -455,7 +466,7 @@ uint16 sc33_door_open[] = { 1, 1, 3, - 0, + 0 }; uint32 *sc33_walk_grid = 0; @@ -469,7 +480,7 @@ uint16 reset_34_33[] = { 384, C_YCOOD, 272, - 65535, + 65535 }; Compact sc33_shed_door = { @@ -501,6 +512,7 @@ Compact sc33_shed_door = { C_BASE_MODE, // mode SC33_SHED_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc33_push_door2[] = { @@ -535,7 +547,7 @@ uint16 sc33_push_door2[] = { 328, 224, 0, - 0, + 0 }; Compact sc33_exit_32 = { @@ -557,6 +569,17 @@ Compact sc33_exit_32 = { 330-310, // mouseSize_x 240-170, // mouseSize_y SC33_EXIT_32_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc33_logic_list[] = { @@ -567,7 +590,7 @@ uint16 sc33_logic_list[] = { ID_SC33_SHED_DOOR, ID_SC32_LIFT, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc33_floor_table[] = { @@ -593,7 +616,7 @@ uint16 sc33_floor_table[] = { GT_SC33_RIGHT_TALK, ID_JOEY_PARK, GT_DANI_WAIT, - 65535, + 65535 }; Compact sc33_floor = { @@ -615,6 +638,17 @@ Compact sc33_floor = { 358-128, // mouseSize_x 319-224, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc33_exit_30 = { @@ -636,6 +670,17 @@ Compact sc33_exit_30 = { 140-128, // mouseSize_x 327-162, // mouseSize_y SC33_EXIT_30_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc33_joey_list[] = { @@ -644,7 +689,7 @@ uint16 sc33_joey_list[] = { 232, 319, 1, - 0, + 0 }; uint16 sc33_push_door1[] = { @@ -685,7 +730,7 @@ uint16 sc33_push_door1[] = { 1, 1, 0, - 0, + 0 }; uint16 sc33_chip_list[] = { @@ -699,7 +744,7 @@ uint16 sc33_chip_list[] = { IT_SC33_USE_CARD+DISK_12, IT_SC33_PUSH_DOOR+DISK_12, IT_SC33_SHED_DOOR+DISK_12, - 0, + 0 }; uint16 sc33_fast_list[] = { @@ -711,7 +756,7 @@ uint16 sc33_fast_list[] = { 135+DISK_12, IT_SC33_GRID_1+DISK_12, IT_SC33_GRID_2+DISK_12, - 0, + 0 }; uint16 sc33_mouse_list[] = { @@ -723,7 +768,7 @@ uint16 sc33_mouse_list[] = { ID_SC33_EXIT_32, ID_SC33_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 sc33_use_card[] = { @@ -764,7 +809,7 @@ uint16 sc33_use_card[] = { 328, 224, 0, - 0, + 0 }; uint16 reset_30_33[] = { @@ -776,7 +821,7 @@ uint16 reset_30_33[] = { OFF_LEFT, C_YCOOD, 248, - 65535, + 65535 }; }; // namespace SkyCompact diff --git a/sky/compacts/34comp.h b/sky/compacts/34comp.h index c8e240f17c..45a46c9142 100644 --- a/sky/compacts/34comp.h +++ b/sky/compacts/34comp.h @@ -34,7 +34,7 @@ uint16 sc34_fast_list[] = { 53+DISK_14, 54+DISK_14, 135+DISK_14, - 0, + 0 }; uint16 sc34_mouse_list[] = { @@ -46,7 +46,7 @@ uint16 sc34_mouse_list[] = { ID_SC34_FLOOR, ID_SC32_LIFT, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sc34_secateurs = { @@ -78,6 +78,7 @@ Compact sc34_secateurs = { C_BASE_MODE, // mode SC34_SECATEURS_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint32 *sc34_walk_grid = 0; @@ -89,7 +90,7 @@ uint16 sc34_logic_list[] = { ID_SC34_SECATEURS, ID_SC32_LIFT, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc34_get_secs[] = { @@ -121,7 +122,7 @@ uint16 sc34_get_secs[] = { 248, 208, 0, - 0, + 0 }; uint16 sc34_chip_list[] = { @@ -132,7 +133,7 @@ uint16 sc34_chip_list[] = { IT_SC34_GET_SECS+DISK_14, IT_SC34_STAIRS1+DISK_14, IT_SC34_STAIRS2+DISK_14, - 0, + 0 }; uint16 reset_33_34[] = { @@ -144,7 +145,7 @@ uint16 reset_33_34[] = { 168, C_YCOOD, 272, - 65535, + 65535 }; uint16 sc34_stairs2[] = { @@ -251,7 +252,7 @@ uint16 sc34_stairs2[] = { 324, 218, 3, - 0, + 0 }; uint16 sc34_floor_table[] = { @@ -269,7 +270,7 @@ uint16 sc34_floor_table[] = { GT_SC34_MAP, ID_SC34_BRICKS, GT_SC34_BRICKS, - 65535, + 65535 }; Compact sc34_floor = { @@ -291,6 +292,17 @@ Compact sc34_floor = { 343-208, // mouseSize_x 311-248, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc34_bricks = { @@ -312,6 +324,17 @@ Compact sc34_bricks = { 410-378, // mouseSize_x 272-190, // mouseSize_y SC34_BRICKS_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc34_stairs1[] = { @@ -445,7 +468,7 @@ uint16 sc34_stairs1[] = { 380, 251, 0, - 0, + 0 }; Compact sc34_tkt_machine = { @@ -467,6 +490,17 @@ Compact sc34_tkt_machine = { 270-217, // mouseSize_x 226-195, // mouseSize_y SC34_TKT_MACHINE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc34_map = { @@ -488,6 +522,17 @@ Compact sc34_map = { 321-276, // mouseSize_x 220-185, // mouseSize_y SC34_MAP_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc34_palette[] = { @@ -874,7 +919,7 @@ uint16 sc34_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact sc34_door = { @@ -896,6 +941,17 @@ Compact sc34_door = { 206-188, // mouseSize_x 275-215, // mouseSize_y SC34_DOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/36comp.h b/sky/compacts/36comp.h index 24331d6d98..ac875598ee 100644 --- a/sky/compacts/36comp.h +++ b/sky/compacts/36comp.h @@ -71,7 +71,7 @@ uint16 sc36_get_glass[] = { 259, 226, 10, - 0, + 0 }; uint16 sc36_mouse_list[] = { @@ -88,14 +88,14 @@ uint16 sc36_mouse_list[] = { ID_SC36_FLOOR, ID_SC36_LOW_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 babs_d_to_u[] = { 47+106*64, 46+106*64, 45+106*64, - 0, + 0 }; uint16 bar_drink[] = { @@ -172,12 +172,12 @@ uint16 bar_drink[] = { 391, 240, 0, - 0, + 0 }; uint16 babs_l_to_u[] = { 43+106*64, - 0, + 0 }; uint16 bar_put_cloth[] = { @@ -215,12 +215,12 @@ uint16 bar_put_cloth[] = { 391, 240, 0, - 0, + 0 }; uint16 babs_u_to_l[] = { 43+106*64, - 0, + 0 }; uint16 sc36_col_down2[] = { @@ -276,7 +276,7 @@ uint16 sc36_col_down2[] = { 272, 213, 16, - 0, + 0 }; uint16 babs_left[] = { @@ -320,14 +320,14 @@ uint16 babs_left[] = { 29+106*64, 65532, 0, - 0, + 0 }; uint16 babs_u_to_t[] = { 43+106*64, 42+106*64, 48+106*64, - 0, + 0 }; uint16 sc36_col_up1[] = { @@ -479,7 +479,7 @@ uint16 sc36_col_up1[] = { 287, 233, 22, - 0, + 0 }; uint16 sc36_fos_down2[] = { @@ -586,7 +586,7 @@ uint16 sc36_fos_down2[] = { 298, 228, 33, - 0, + 0 }; uint16 sc36_col_deal[] = { @@ -618,7 +618,7 @@ uint16 sc36_col_deal[] = { 128, 136, 0, - 0, + 0 }; uint16 sc36_palette[] = { @@ -1005,7 +1005,7 @@ uint16 sc36_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint8 babs_auto[64]; @@ -1051,7 +1051,7 @@ uint16 babs_up[] = { 9+106*64, 0, 65534, - 0, + 0 }; uint16 babs_down[] = { @@ -1095,7 +1095,7 @@ uint16 babs_down[] = { 19+106*64, 0, 2, - 0, + 0 }; uint16 babs_right[] = { @@ -1139,7 +1139,7 @@ uint16 babs_right[] = { 39+106*64, 4, 0, - 0, + 0 }; uint16 babs_st_up[] = { @@ -1147,7 +1147,7 @@ uint16 babs_st_up[] = { 1, 0, 44, - 0, + 0 }; uint16 babs_st_down[] = { @@ -1155,7 +1155,7 @@ uint16 babs_st_down[] = { 1, 0, 40, - 0, + 0 }; uint16 babs_st_left[] = { @@ -1163,7 +1163,7 @@ uint16 babs_st_left[] = { 1, 0, 42, - 0, + 0 }; uint16 babs_st_right[] = { @@ -1171,7 +1171,7 @@ uint16 babs_st_right[] = { 1, 0, 46, - 0, + 0 }; uint16 babs_st_talk[] = { @@ -1179,99 +1179,99 @@ uint16 babs_st_talk[] = { 1, 0, 0, - 0, + 0 }; uint16 babs_u_to_d[] = { 43+106*64, 42+106*64, 41+106*64, - 0, + 0 }; uint16 babs_u_to_r[] = { 45+106*64, - 0, + 0 }; uint16 babs_d_to_l[] = { 41+106*64, - 0, + 0 }; uint16 babs_d_to_r[] = { 47+106*64, - 0, + 0 }; uint16 babs_d_to_t[] = { 48+106*64, - 0, + 0 }; uint16 babs_l_to_d[] = { 41+106*64, - 0, + 0 }; uint16 babs_l_to_r[] = { 41+106*64, 40+106*64, 47+106*64, - 0, + 0 }; uint16 babs_l_to_t[] = { 48+106*64, - 0, + 0 }; uint16 babs_r_to_u[] = { 45+106*64, - 0, + 0 }; uint16 babs_r_to_d[] = { 47+106*64, - 0, + 0 }; uint16 babs_r_to_l[] = { 45+106*64, 44+106*64, 43+106*64, - 0, + 0 }; uint16 babs_r_to_t[] = { 47+106*64, 40+106*64, 48+106*64, - 0, + 0 }; uint16 babs_t_to_u[] = { 48+106*64, 42+106*64, 43+106*64, - 0, + 0 }; uint16 babs_t_to_d[] = { 48+106*64, - 0, + 0 }; uint16 babs_t_to_l[] = { 48+106*64, - 0, + 0 }; uint16 babs_t_to_r[] = { 48+106*64, 40+106*64, 47+106*64, - 0, + 0 }; TurnTable sc36_babs_turnTable0 = { @@ -1309,7 +1309,7 @@ TurnTable sc36_babs_turnTable0 = { babs_t_to_l, babs_t_to_r, 0 - }, + } }; MegaSet sc36_babs_megaSet0 = { @@ -1326,7 +1326,7 @@ MegaSet sc36_babs_megaSet0 = { babs_st_left, // standLeft babs_st_right, // standRight babs_st_talk, // standTalk - &sc36_babs_turnTable0, + &sc36_babs_turnTable0 }; ExtCompact sc36_babs_ext = { @@ -1356,6 +1356,9 @@ ExtCompact sc36_babs_ext = { babs_auto, // animScratch 0, // megaSet &sc36_babs_megaSet0, + 0, + 0, + 0 }; Compact sc36_babs = { @@ -1387,7 +1390,7 @@ Compact sc36_babs = { C_BASE_MODE, // mode SC36_BABS_LOGIC, // baseSub 0, // baseSub_off - &sc36_babs_ext, + &sc36_babs_ext }; uint16 sc36_col_down4[] = { @@ -1536,7 +1539,7 @@ uint16 sc36_col_down4[] = { 249, 211, 20, - 0, + 0 }; uint16 sc36_logic_list[] = { @@ -1557,7 +1560,7 @@ uint16 sc36_logic_list[] = { ID_SC36_JUKE_LIGHT, ID_SC36_DOOR, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 reset_30_36[] = { @@ -1573,7 +1576,7 @@ uint16 reset_30_36[] = { 40+12*64, C_DIR, DOWN, - 65535, + 65535 }; uint16 sc36_doorshut[] = { @@ -1596,7 +1599,7 @@ uint16 sc36_doorshut[] = { 375, 183, 0, - 0, + 0 }; uint16 sc36_fos_up2[] = { @@ -1670,7 +1673,7 @@ uint16 sc36_fos_up2[] = { 296, 208, 22, - 0, + 0 }; uint16 bar_get_cloth[] = { @@ -1705,7 +1708,7 @@ uint16 bar_get_cloth[] = { 391, 240, 15, - 0, + 0 }; Compact sc36_juke_light = { @@ -1737,6 +1740,7 @@ Compact sc36_juke_light = { C_BASE_MODE, // mode SC36_JUKE_LIGHT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc36_low_floor_table[] = { @@ -1770,7 +1774,7 @@ uint16 sc36_low_floor_table[] = { GT_SC36_FLOOR, ID_SC36_BABS, GT_SC36_FLOOR, - 65535, + 65535 }; Compact sc36_low_floor = { @@ -1792,6 +1796,17 @@ Compact sc36_low_floor = { 383-248, // mouseSize_x 255-200, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc36_floor_table[] = { @@ -1827,7 +1842,7 @@ uint16 sc36_floor_table[] = { MOVE_BABS, ID_SC36_BABS, GT_BABS_AMIGA, - 65535, + 65535 }; uint16 sc36_jukebox_on[] = { @@ -1844,7 +1859,7 @@ uint16 sc36_jukebox_on[] = { 233, 212, 3, - 0, + 0 }; Compact sc36_door = { @@ -1876,6 +1891,7 @@ Compact sc36_door = { C_BASE_MODE, // mode SC36_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc36_col_down3[] = { @@ -1970,7 +1986,7 @@ uint16 sc36_col_down3[] = { 283, 234, 29, - 0, + 0 }; ExtCompact sc36_jukebox_ext = { @@ -1999,6 +2015,10 @@ ExtCompact sc36_jukebox_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc36_jukebox = { @@ -2030,7 +2050,7 @@ Compact sc36_jukebox = { C_BASE_MODE, // mode SC36_JUKEBOX_LOGIC, // baseSub 0, // baseSub_off - &sc36_jukebox_ext, + &sc36_jukebox_ext }; uint16 sc36_juke_kicked[] = { @@ -2095,7 +2115,7 @@ uint16 sc36_juke_kicked[] = { 233, 212, 3, - 0, + 0 }; uint16 sc36_fos_up1[] = { @@ -2208,7 +2228,7 @@ uint16 sc36_fos_up1[] = { 298, 229, 35, - 0, + 0 }; uint16 sc36_use_jukebox[] = { @@ -2246,7 +2266,7 @@ uint16 sc36_use_jukebox[] = { 240, 210, 0, - 0, + 0 }; uint16 sc36_col_think[] = { @@ -2401,7 +2421,7 @@ uint16 sc36_col_think[] = { 219, 226, 0, - 0, + 0 }; uint16 bar_wipe2[] = { @@ -2538,7 +2558,7 @@ uint16 bar_wipe2[] = { 391, 240, 16, - 0, + 0 }; Compact sc36_gal_legs = { @@ -2551,6 +2571,26 @@ Compact sc36_gal_legs = { 202, // xcood 262, // ycood 59*64, // frame + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc36_col_up2[] = { @@ -2636,7 +2676,7 @@ uint16 sc36_col_up2[] = { 283, 234, 26, - 0, + 0 }; Compact sc36_cards = { @@ -2668,6 +2708,7 @@ Compact sc36_cards = { C_BASE_MODE, // mode SC36_CARDS_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc36_reach_glass[] = { @@ -2705,7 +2746,7 @@ uint16 sc36_reach_glass[] = { 242, 226, 0, - 0, + 0 }; uint16 sc36_juke_break[] = { @@ -2734,7 +2775,7 @@ uint16 sc36_juke_break[] = { 233, 222, 3, - 0, + 0 }; uint16 sc36_fos_down1[] = { @@ -2808,7 +2849,7 @@ uint16 sc36_fos_down1[] = { 296, 208, 22, - 0, + 0 }; uint16 reset_37_36[] = { @@ -2822,7 +2863,7 @@ uint16 reset_37_36[] = { 208, C_FRAME, 42+13*64, - 65535, + 65535 }; Compact sc36_glass = { @@ -2844,6 +2885,17 @@ Compact sc36_glass = { 246-241, // mouseSize_x 253-246, // mouseSize_y SC36_GLASS_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc36_col_feet = { @@ -2856,6 +2908,26 @@ Compact sc36_col_feet = { 219, // xcood 265, // ycood 48*64, // frame + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc36_col_blink2[] = { @@ -2902,7 +2974,7 @@ uint16 sc36_col_blink2[] = { 219, 226, 16, - 0, + 0 }; uint16 sc36_jukebox_off[] = { @@ -2919,7 +2991,7 @@ uint16 sc36_jukebox_off[] = { 1, 1, 0, - 0, + 0 }; Compact sc36_band = { @@ -2951,6 +3023,7 @@ Compact sc36_band = { C_BASE_MODE, // mode SC36_BAND_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc36_sensor = { @@ -2972,6 +3045,17 @@ Compact sc36_sensor = { 373-371, // mouseSize_x 197-191, // mouseSize_y SC36_SENSOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc36_col_drink[] = { @@ -3039,7 +3123,7 @@ uint16 sc36_col_drink[] = { 219, 226, 8, - 0, + 0 }; uint16 reset_juke_light[] = { @@ -3049,7 +3133,7 @@ uint16 reset_juke_light[] = { 68*64, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint16 sc36_gal_look1[] = { @@ -3096,7 +3180,7 @@ uint16 sc36_gal_look1[] = { 202, 238, 6, - 0, + 0 }; uint16 reset_colston[] = { @@ -3118,7 +3202,7 @@ uint16 reset_colston[] = { 0, C_REQUEST, 0, - 65535, + 65535 }; uint16 sc36_chip_list[] = { @@ -3153,7 +3237,7 @@ uint16 sc36_chip_list[] = { IT_SC36_GAL_TALK+DISK_13, IT_SC36_CARDS+DISK_13, IT_SC36_GLASS+DISK_13, - 0, + 0 }; uint16 sc36_juke_stuck[] = { @@ -3164,7 +3248,7 @@ uint16 sc36_juke_stuck[] = { 233, 222, 3, - 0, + 0 }; uint16 sc36_col_blink1[] = { @@ -3181,7 +3265,7 @@ uint16 sc36_col_blink1[] = { 219, 226, 0, - 0, + 0 }; uint32 *babs = 0; @@ -3209,7 +3293,7 @@ uint16 bar_wipe[] = { 391, 240, 22, - 0, + 0 }; uint16 sc36_gal_look2[] = { @@ -3259,7 +3343,7 @@ uint16 sc36_gal_look2[] = { 202, 238, 0, - 0, + 0 }; uint16 sc36_juke_sing[] = { @@ -3339,7 +3423,7 @@ uint16 sc36_juke_sing[] = { 1, 1, 4, - 0, + 0 }; ExtCompact sc36_colston_ext = { @@ -3368,6 +3452,10 @@ ExtCompact sc36_colston_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc36_colston = { @@ -3399,7 +3487,7 @@ Compact sc36_colston = { C_BASE_MODE, // mode SC36_COLSTON_LOGIC, // baseSub 0, // baseSub_off - &sc36_colston_ext, + &sc36_colston_ext }; uint16 sc36_col_down1[] = { @@ -3497,7 +3585,7 @@ uint16 sc36_col_down1[] = { 277, 210, 28, - 0, + 0 }; ExtCompact sc36_gallagher_ext = { @@ -3526,6 +3614,10 @@ ExtCompact sc36_gallagher_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc36_gallagher = { @@ -3557,7 +3649,7 @@ Compact sc36_gallagher = { C_BASE_MODE, // mode SC36_GALLAGHER_LOGIC, // baseSub 0, // baseSub_off - &sc36_gallagher_ext, + &sc36_gallagher_ext }; uint16 sc36_col_up3[] = { @@ -3610,7 +3702,7 @@ uint16 sc36_col_up3[] = { 272, 213, 15, - 0, + 0 }; uint16 sc36_band_anim[] = { @@ -3675,7 +3767,7 @@ uint16 sc36_band_anim[] = { 276, 164, 19, - 0, + 0 }; uint16 sc36_col_kick[] = { @@ -3719,7 +3811,7 @@ uint16 sc36_col_kick[] = { 249, 211, 0, - 0, + 0 }; Compact sc36_floor = { @@ -3741,6 +3833,17 @@ Compact sc36_floor = { 447-184, // mouseSize_x 327-256, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *sc36_walk_grid = 0; @@ -3765,7 +3868,7 @@ uint16 sc36_dooropen[] = { 375, 183, 5, - 0, + 0 }; uint16 bar_get_drink[] = { @@ -3854,7 +3957,7 @@ uint16 bar_get_drink[] = { 391, 240, 0, - 0, + 0 }; uint16 sc36_gal_deal[] = { @@ -3886,7 +3989,7 @@ uint16 sc36_gal_deal[] = { 202, 238, 6, - 0, + 0 }; uint16 bar_blink[] = { @@ -3900,7 +4003,7 @@ uint16 bar_blink[] = { 391, 240, 0, - 0, + 0 }; uint16 sc36_press_plate[] = { @@ -3935,7 +4038,7 @@ uint16 sc36_press_plate[] = { 360, 186, 5, - 0, + 0 }; uint16 reset_jukebox[] = { @@ -3949,7 +4052,7 @@ uint16 reset_jukebox[] = { SC36_JUKEBOX_LOGIC, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint16 sc36_fast_list[] = { @@ -3960,7 +4063,7 @@ uint16 sc36_fast_list[] = { 54+DISK_13, 135+DISK_13, IT_SC36_GET_GLASS+DISK_13, - 0, + 0 }; uint16 sc36_col_up4[] = { @@ -4067,7 +4170,7 @@ uint16 sc36_col_up4[] = { 220, 226, 30, - 0, + 0 }; ExtCompact sc36_barman_ext = { @@ -4096,6 +4199,10 @@ ExtCompact sc36_barman_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc36_barman = { @@ -4127,7 +4234,7 @@ Compact sc36_barman = { C_BASE_MODE, // mode SC36_BARMAN_LOGIC, // baseSub 0, // baseSub_off - &sc36_barman_ext, + &sc36_barman_ext }; Compact sc36_exit_30 = { @@ -4149,6 +4256,17 @@ Compact sc36_exit_30 = { 182-171, // mouseSize_x 296-230, // mouseSize_y SC36_EXIT_30_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/37comp.h b/sky/compacts/37comp.h index eac2f1765c..09d7b3b8fe 100644 --- a/sky/compacts/37comp.h +++ b/sky/compacts/37comp.h @@ -37,7 +37,7 @@ uint16 sc37_mouse_list[] = { ID_SC37_WINE_RACK, ID_SC37_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 sc37_chip_list[] = { @@ -63,7 +63,7 @@ uint16 sc37_chip_list[] = { IT_SC37_GRILL+DISK_13, IT_SC37_GRILLOPEN+DISK_13, IT_SC37_DOOR+DISK_13, - 0, + 0 }; uint16 sc37_grillopen[] = { @@ -212,7 +212,7 @@ uint16 sc37_grillopen[] = { 307, 192, 4, - 0, + 0 }; uint16 sc37_floor_table[] = { @@ -234,7 +234,7 @@ uint16 sc37_floor_table[] = { GT_SC37_LID, ID_SC37_WINE_RACK, GT_SC37_WINE_RACK, - 65535, + 65535 }; uint16 sc37_stepdown[] = { @@ -275,7 +275,7 @@ uint16 sc37_stepdown[] = { 309, 218, 0, - 0, + 0 }; Compact sc37_big_box = { @@ -297,6 +297,17 @@ Compact sc37_big_box = { 269-219, // mouseSize_x 278-231, // mouseSize_y SC37_BIG_BOX_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc37_footdrop[] = { @@ -316,7 +327,7 @@ uint16 sc37_footdrop[] = { 309, 194, 0, - 0, + 0 }; uint16 sc37_putlid[] = { @@ -345,7 +356,7 @@ uint16 sc37_putlid[] = { 268, 218, 0, - 0, + 0 }; Compact sc37_sensor = { @@ -367,6 +378,17 @@ Compact sc37_sensor = { 190-185, // mouseSize_x 248-238, // mouseSize_y SC37_SENSOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc37_lidused[] = { @@ -449,7 +471,7 @@ uint16 sc37_lidused[] = { 305, 240, 16, - 0, + 0 }; uint16 sc37_getlid[] = { @@ -478,7 +500,7 @@ uint16 sc37_getlid[] = { 260, 218, 7, - 0, + 0 }; uint16 sc37_flimsy_box_table[] = { @@ -496,7 +518,7 @@ uint16 sc37_flimsy_box_table[] = { STEP_OFF_BOX, ID_SC37_WINE_RACK, STEP_OFF_BOX, - 65535, + 65535 }; uint16 sc37_thumbsup[] = { @@ -540,7 +562,7 @@ uint16 sc37_thumbsup[] = { 204, 226, 0, - 0, + 0 }; Compact sc37_wine_rack = { @@ -562,6 +584,17 @@ Compact sc37_wine_rack = { 402-351, // mouseSize_x 280-208, // mouseSize_y SC37_WINE_RACK_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc37_fast_list[] = { @@ -571,7 +604,7 @@ uint16 sc37_fast_list[] = { 53+DISK_13, 54+DISK_13, 135+DISK_13, - 0, + 0 }; uint16 sc37_holding_lid_table[] = { @@ -589,7 +622,7 @@ uint16 sc37_holding_lid_table[] = { PUT_LID_BACK, ID_SC37_WINE_RACK, PUT_LID_BACK, - 65535, + 65535 }; Compact sc37_holding_lid = { @@ -599,6 +632,29 @@ Compact sc37_holding_lid = { 37, // screen 0, // place sc37_holding_lid_table, // getToTable + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc37_lidup[] = { @@ -612,7 +668,7 @@ uint16 sc37_lidup[] = { 256, 218, 2, - 0, + 0 }; uint16 sc37_usesec[] = { @@ -773,7 +829,7 @@ uint16 sc37_usesec[] = { 304, 192, 0, - 0, + 0 }; uint16 sc37_stepup[] = { @@ -820,7 +876,7 @@ uint16 sc37_stepup[] = { 309, 194, 12, - 0, + 0 }; Compact sc37_lid = { @@ -852,6 +908,7 @@ Compact sc37_lid = { C_BASE_MODE, // mode SC37_LID_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc37_palette[] = { @@ -1238,7 +1295,7 @@ uint16 sc37_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact sc37_floor = { @@ -1260,6 +1317,17 @@ Compact sc37_floor = { 399-192, // mouseSize_x 319-256, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc37_climbout[] = { @@ -1318,7 +1386,7 @@ uint16 sc37_climbout[] = { 309, 192, 16, - 0, + 0 }; Compact sc37_grill = { @@ -1350,6 +1418,7 @@ Compact sc37_grill = { C_BASE_MODE, // mode SC37_GRILL_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc37_uselid[] = { @@ -1429,7 +1498,7 @@ uint16 sc37_uselid[] = { 309, 218, 24, - 0, + 0 }; uint16 reset_36_37[] = { @@ -1443,7 +1512,7 @@ uint16 reset_36_37[] = { 272, C_FRAME, 46+12*64, - 65535, + 65535 }; uint16 sc37_doorshut[] = { @@ -1469,7 +1538,7 @@ uint16 sc37_doorshut[] = { 196, 221, 0, - 0, + 0 }; uint32 *sc37_walk_grid = 0; @@ -1503,6 +1572,7 @@ Compact sc37_door = { C_BASE_MODE, // mode SC37_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc37_usebar[] = { @@ -1657,7 +1727,7 @@ uint16 sc37_usebar[] = { 309, 194, 0, - 0, + 0 }; Compact sc37_flimsy_box = { @@ -1679,6 +1749,17 @@ Compact sc37_flimsy_box = { 333-300, // mouseSize_x 264-238, // mouseSize_y SC37_FLIMSY_BOX_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc37_dooropen[] = { @@ -1704,7 +1785,7 @@ uint16 sc37_dooropen[] = { 196, 221, 6, - 0, + 0 }; uint16 sc37_liddown[] = { @@ -1718,7 +1799,7 @@ uint16 sc37_liddown[] = { 231, 234, 0, - 0, + 0 }; uint16 sc37_logic_list[] = { @@ -1728,7 +1809,7 @@ uint16 sc37_logic_list[] = { ID_SC37_GRILL, ID_SC37_DOOR, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc37_crbarbox[] = { @@ -1820,7 +1901,7 @@ uint16 sc37_crbarbox[] = { 264, 216, 26, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/38comp.h b/sky/compacts/38comp.h index 86c74e56ab..2180bf5e98 100644 --- a/sky/compacts/38comp.h +++ b/sky/compacts/38comp.h @@ -60,7 +60,7 @@ uint16 spu_left[] = { 23+71*64, 65534, 0, - 0, + 0 }; uint16 sc38_mouse_list[] = { @@ -76,7 +76,7 @@ uint16 sc38_mouse_list[] = { ID_SC38_LIFT, ID_SC38_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 sniff_left[] = { @@ -183,7 +183,7 @@ uint16 sniff_left[] = { 208, 219, 0, - 0, + 0 }; uint16 sc38_palette[] = { @@ -570,30 +570,30 @@ uint16 sc38_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 spu_u_to_l[] = { 35+71*64, - 0, + 0 }; uint16 dan_d_to_r[] = { 39+55*64, - 0, + 0 }; uint16 sex_t_to_r[] = { 32+106*64, 39+106*64, - 0, + 0 }; uint16 spu_u_to_d[] = { 35+71*64, 34+71*64, 33+71*64, - 0, + 0 }; Compact sc38_dog_tray = { @@ -615,6 +615,17 @@ Compact sc38_dog_tray = { 241-220, // mouseSize_x 267-251, // mouseSize_y SC38_DOG_TRAY_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sex_up[] = { @@ -650,31 +661,31 @@ uint16 sex_up[] = { 7+106*64, 0, 65534, - 0, + 0 }; uint16 dan_u_to_r[] = { 37+55*64, - 0, + 0 }; uint16 sex_l_to_r[] = { 33+106*64, 32+106*64, 39+106*64, - 0, + 0 }; uint16 spu_t_to_l[] = { 32+71*64, 33+71*64, - 0, + 0 }; uint16 dan_u_to_t[] = { 37+55*64, 38+55*64, - 0, + 0 }; uint16 sc38_screen_2[] = { @@ -748,12 +759,12 @@ uint16 sc38_screen_2[] = { 379, 209, 22, - 0, + 0 }; uint16 dan_l_to_u[] = { 35+55*64, - 0, + 0 }; uint16 sc38_screen_3[] = { @@ -845,19 +856,19 @@ uint16 sc38_screen_3[] = { 379, 209, 28, - 0, + 0 }; uint16 dan_r_to_t[] = { 39+55*64, 32+55*64, - 0, + 0 }; uint16 sex_u_to_t[] = { 37+106*64, 38+106*64, - 0, + 0 }; uint16 sc38_dani_get_up[] = { @@ -901,19 +912,19 @@ uint16 sc38_dani_get_up[] = { 317, 243, 12, - 0, + 0 }; uint16 sex_r_to_d[] = { 39+106*64, - 0, + 0 }; uint16 dan_r_to_l[] = { 37+55*64, 36+55*64, 35+55*64, - 0, + 0 }; uint8 dan_auto[64]; @@ -928,7 +939,7 @@ uint16 sc38_logic_list[] = { ID_SC38_HAND_SET, ID_SC38_LIFT, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 piss_left[] = { @@ -1002,24 +1013,24 @@ uint16 piss_left[] = { 208, 219, 0, - 0, + 0 }; uint16 sex_d_to_u[] = { 39+106*64, 38+106*64, 37+106*64, - 0, + 0 }; uint16 dan_l_to_d[] = { 33+55*64, - 0, + 0 }; uint16 sex_u_to_r[] = { 37+106*64, - 0, + 0 }; Compact sc38_hand_set = { @@ -1032,11 +1043,31 @@ Compact sc38_hand_set = { 156, // xcood 267, // ycood 110*64, // frame + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 spu_u_to_r[] = { 37+71*64, - 0, + 0 }; uint16 dan_st_left[] = { @@ -1044,7 +1075,7 @@ uint16 dan_st_left[] = { 1, 0, 34, - 0, + 0 }; uint16 piss_right[] = { @@ -1118,12 +1149,12 @@ uint16 piss_right[] = { 257, 219, 0, - 0, + 0 }; uint16 sex_r_to_u[] = { 37+106*64, - 0, + 0 }; uint16 sex_left[] = { @@ -1159,23 +1190,23 @@ uint16 sex_left[] = { 23+106*64, 65532, 0, - 0, + 0 }; uint16 sex_l_to_u[] = { 35+106*64, - 0, + 0 }; uint16 spu_l_to_t[] = { 33+71*64, 32+71*64, - 0, + 0 }; uint16 sex_d_to_r[] = { 39+106*64, - 0, + 0 }; uint32 *spu = 0; @@ -1205,7 +1236,7 @@ uint16 sc38_floor_table[] = { GT_SC38_LEFT_TALK, ID_STD_RIGHT_TALK, GT_SC38_RIGHT_TALK, - 65535, + 65535 }; uint16 sc38_get_food[] = { @@ -1255,7 +1286,7 @@ uint16 sc38_get_food[] = { 235, 216, 0, - 0, + 0 }; uint16 sex_right[] = { @@ -1291,7 +1322,7 @@ uint16 sex_right[] = { 31+106*64, 4, 0, - 0, + 0 }; uint16 dan_st_talk[] = { @@ -1299,7 +1330,7 @@ uint16 dan_st_talk[] = { 1, 0, 0, - 0, + 0 }; uint16 reset_32_38[] = { @@ -1315,7 +1346,7 @@ uint16 reset_32_38[] = { 46+12*64, C_DIR, RIGHT, - 65535, + 65535 }; Compact sc38_floor = { @@ -1337,16 +1368,27 @@ Compact sc38_floor = { 447-200, // mouseSize_x 327-256, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sex_d_to_l[] = { 33+106*64, - 0, + 0 }; uint16 spu_r_to_u[] = { 37+71*64, - 0, + 0 }; uint16 reset_dani_sit[] = { @@ -1362,32 +1404,32 @@ uint16 reset_dani_sit[] = { 244, C_FRAME, 107*64, - 65535, + 65535 }; uint16 spu_u_to_t[] = { 37+71*64, 38+71*64, - 0, + 0 }; uint16 spu_l_to_u[] = { 35+71*64, - 0, + 0 }; uint16 spu_d_to_u[] = { 39+71*64, 38+71*64, 37+71*64, - 0, + 0 }; uint16 sex_u_to_d[] = { 35+106*64, 34+106*64, 33+106*64, - 0, + 0 }; uint16 sc38_dani_anim_2[] = { @@ -1542,13 +1584,13 @@ uint16 sc38_dani_anim_2[] = { 294, 245, 1, - 0, + 0 }; uint16 dan_t_to_r[] = { 32+55*64, 39+55*64, - 0, + 0 }; uint16 dan_st_up[] = { @@ -1556,7 +1598,7 @@ uint16 dan_st_up[] = { 1, 0, 36, - 0, + 0 }; uint16 bark[] = { @@ -1657,7 +1699,7 @@ uint16 bark[] = { 243, 225, 0, - 0, + 0 }; uint16 dan_left[] = { @@ -1693,25 +1735,25 @@ uint16 dan_left[] = { 23+55*64, 65532, 0, - 0, + 0 }; uint16 spu_r_to_d[] = { 39+71*64, - 0, + 0 }; uint16 spu_l_to_r[] = { 33+71*64, 32+71*64, 39+71*64, - 0, + 0 }; uint16 sex_r_to_t[] = { 39+106*64, 32+106*64, - 0, + 0 }; uint16 sex_st_down[] = { @@ -1719,7 +1761,7 @@ uint16 sex_st_down[] = { 1, 0, 32, - 0, + 0 }; uint16 sc38_scr_bark[] = { @@ -1820,7 +1862,7 @@ uint16 sc38_scr_bark[] = { 202, 253, 0, - 0, + 0 }; uint16 dan_st_right[] = { @@ -1828,7 +1870,7 @@ uint16 dan_st_right[] = { 1, 0, 38, - 0, + 0 }; uint16 spu_st_left[] = { @@ -1836,7 +1878,7 @@ uint16 spu_st_left[] = { 1, 0, 34, - 0, + 0 }; Compact sc38_sofa = { @@ -1858,18 +1900,29 @@ Compact sc38_sofa = { 308-272, // mouseSize_x 301-242, // mouseSize_y SC38_SOFA_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 dan_d_to_l[] = { 33+55*64, - 0, + 0 }; uint16 spu_r_to_l[] = { 37+71*64, 36+71*64, 35+71*64, - 0, + 0 }; uint16 sc38_chip_list[] = { @@ -1893,7 +1946,7 @@ uint16 sc38_chip_list[] = { IT_SC38_SCREEN_3+0X8000+DISK_14, IT_SC38_SCREEN_4+DISK_14, 140+DISK_14, - 0, + 0 }; uint16 sc38_fast_list[] = { @@ -1906,7 +1959,7 @@ uint16 sc38_fast_list[] = { IT_SC38_LAYER_2+DISK_14, IT_SC38_GRID_1+DISK_14, IT_SC38_GRID_2+DISK_14, - 0, + 0 }; Compact sc38_video = { @@ -1938,6 +1991,7 @@ Compact sc38_video = { C_BASE_MODE, // mode SC38_VIDEO_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact dog_bark_thing = { @@ -1969,6 +2023,7 @@ Compact dog_bark_thing = { C_BASE_MODE, // mode DOG_BARK_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc38_screen_4[] = { @@ -2033,14 +2088,14 @@ uint16 sc38_screen_4[] = { 379, 209, 19, - 0, + 0 }; uint16 dan_l_to_r[] = { 33+55*64, 32+55*64, 39+55*64, - 0, + 0 }; uint16 sex_st_talk[] = { @@ -2048,7 +2103,7 @@ uint16 sex_st_talk[] = { 1, 0, 0, - 0, + 0 }; uint16 sex_st_right[] = { @@ -2056,7 +2111,7 @@ uint16 sex_st_right[] = { 1, 0, 38, - 0, + 0 }; uint16 sc38_use_video[] = { @@ -2085,7 +2140,7 @@ uint16 sc38_use_video[] = { 354, 210, 7, - 0, + 0 }; Compact sc38_monitor = { @@ -2117,6 +2172,7 @@ Compact sc38_monitor = { C_BASE_MODE, // mode SC38_MONITOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 spu_st_talk[] = { @@ -2124,20 +2180,20 @@ uint16 spu_st_talk[] = { 1, 0, 0, - 0, + 0 }; uint16 sex_t_to_u[] = { 38+106*64, 37+106*64, - 0, + 0 }; uint16 sex_r_to_l[] = { 37+106*64, 36+106*64, 35+106*64, - 0, + 0 }; uint16 sc38_dani_anim_1[] = { @@ -2277,7 +2333,7 @@ uint16 sc38_dani_anim_1[] = { 294, 245, 1, - 0, + 0 }; uint16 sc38_get_phone[] = { @@ -2309,7 +2365,7 @@ uint16 sc38_get_phone[] = { 165, 259, 7, - 0, + 0 }; Compact sc38_lift = { @@ -2341,6 +2397,7 @@ Compact sc38_lift = { C_BASE_MODE, // mode SC38_LIFT_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc38_biscuits = { @@ -2362,11 +2419,22 @@ Compact sc38_biscuits = { 237-228, // mouseSize_x 261-258, // mouseSize_y SC38_BISCUITS_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 dan_r_to_u[] = { 37+55*64, - 0, + 0 }; uint16 spu_up[] = { @@ -2402,7 +2470,7 @@ uint16 spu_up[] = { 7+71*64, 0, 65535, - 0, + 0 }; uint16 sc38_dani_anim_3[] = { @@ -2557,7 +2625,7 @@ uint16 sc38_dani_anim_3[] = { 294, 244, 0, - 0, + 0 }; uint16 sc38_lift_up[] = { @@ -2592,7 +2660,7 @@ uint16 sc38_lift_up[] = { 1, 1, 0, - 0, + 0 }; uint8 spu_auto[64]; @@ -2701,7 +2769,7 @@ uint16 sniff_right[] = { 257, 219, 0, - 0, + 0 }; uint16 dan_st_down[] = { @@ -2709,7 +2777,7 @@ uint16 dan_st_down[] = { 1, 0, 32, - 0, + 0 }; uint16 sc38_ringer_anim[] = { @@ -2762,7 +2830,7 @@ uint16 sc38_ringer_anim[] = { 161, 261, 0, - 0, + 0 }; uint32 *sc38_walk_grid = 0; @@ -2774,12 +2842,12 @@ uint16 spu_st_right[] = { 1, 0, 38, - 0, + 0 }; uint16 spu_l_to_d[] = { 33+71*64, - 0, + 0 }; uint16 sc38_reach_food[] = { @@ -2814,7 +2882,7 @@ uint16 sc38_reach_food[] = { 235, 216, 0, - 0, + 0 }; Compact sc38_ringer = { @@ -2846,12 +2914,13 @@ Compact sc38_ringer = { C_BASE_MODE, // mode SC38_RINGER_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 spu_t_to_u[] = { 38+71*64, 37+71*64, - 0, + 0 }; Compact sc38_statue = { @@ -2873,23 +2942,34 @@ Compact sc38_statue = { 366-354, // mouseSize_x 254-199, // mouseSize_y SC38_STATUE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 dan_d_to_u[] = { 39+55*64, 38+55*64, 37+55*64, - 0, + 0 }; uint16 spu_d_to_l[] = { 33+71*64, - 0, + 0 }; uint16 dan_u_to_l[] = { 35+55*64, - 0, + 0 }; uint16 reset_spunky_38[] = { @@ -2909,7 +2989,7 @@ uint16 reset_spunky_38[] = { LEFT, C_MOUSE_CLICK, ADVISOR_188, - 65535, + 65535 }; uint16 spu_right[] = { @@ -2945,12 +3025,12 @@ uint16 spu_right[] = { 31+71*64, 2, 0, - 0, + 0 }; uint16 sex_l_to_d[] = { 33+106*64, - 0, + 0 }; uint16 reset_dani_stand[] = { @@ -2978,12 +3058,12 @@ uint16 reset_dani_stand[] = { SC38_DANIELLE_ACTION, C_MEGA_SET, NEXT_MEGA_SET, - 65535, + 65535 }; uint16 dan_r_to_d[] = { 39+55*64, - 0, + 0 }; uint16 spu_st_down[] = { @@ -2991,7 +3071,7 @@ uint16 spu_st_down[] = { 1, 0, 32, - 0, + 0 }; uint16 dan_up[] = { @@ -3027,14 +3107,14 @@ uint16 dan_up[] = { 7+55*64, 0, 65534, - 0, + 0 }; uint16 dan_u_to_d[] = { 35+55*64, 34+55*64, 33+55*64, - 0, + 0 }; uint16 dan_down[] = { @@ -3070,7 +3150,7 @@ uint16 dan_down[] = { 15+55*64, 0, 2, - 0, + 0 }; uint16 dan_right[] = { @@ -3106,13 +3186,13 @@ uint16 dan_right[] = { 31+55*64, 4, 0, - 0, + 0 }; uint16 dan_t_to_u[] = { 38+55*64, 37+55*64, - 0, + 0 }; uint16 sex_down[] = { @@ -3148,7 +3228,7 @@ uint16 sex_down[] = { 15+106*64, 0, 2, - 0, + 0 }; uint16 sex_st_up[] = { @@ -3156,7 +3236,7 @@ uint16 sex_st_up[] = { 1, 0, 36, - 0, + 0 }; uint16 sex_st_left[] = { @@ -3164,12 +3244,12 @@ uint16 sex_st_left[] = { 1, 0, 34, - 0, + 0 }; uint16 sex_u_to_l[] = { 35+106*64, - 0, + 0 }; TurnTable danielle_turnTable0 = { @@ -3245,7 +3325,7 @@ TurnTable danielle_turnTable1 = { 0, sex_t_to_r, 0 - }, + } }; MegaSet danielle_megaSet0 = { @@ -3279,7 +3359,7 @@ MegaSet danielle_megaSet1 = { sex_st_left, // standLeft sex_st_right, // standRight sex_st_talk, // standTalk - &danielle_turnTable1, + &danielle_turnTable1 }; ExtCompact danielle_ext = { @@ -3310,6 +3390,8 @@ ExtCompact danielle_ext = { 0, // megaSet &danielle_megaSet0, &danielle_megaSet1, + 0, + 0 }; Compact danielle = { @@ -3341,12 +3423,12 @@ Compact danielle = { C_BASE_MODE, // mode DANIELLE_LOGIC, // baseSub 0, // baseSub_off - &danielle_ext, + &danielle_ext }; uint16 spu_d_to_r[] = { 39+71*64, - 0, + 0 }; uint16 spu_down[] = { @@ -3382,7 +3464,7 @@ uint16 spu_down[] = { 15+71*64, 0, 1, - 0, + 0 }; uint16 spu_st_up[] = { @@ -3390,7 +3472,7 @@ uint16 spu_st_up[] = { 1, 0, 36, - 0, + 0 }; TurnTable spunky_turnTable0 = { @@ -3428,7 +3510,7 @@ TurnTable spunky_turnTable0 = { spu_t_to_l, 0, 0 - }, + } }; MegaSet spunky_megaSet0 = { @@ -3445,7 +3527,7 @@ MegaSet spunky_megaSet0 = { spu_st_left, // standLeft spu_st_right, // standRight spu_st_talk, // standTalk - &spunky_turnTable0, + &spunky_turnTable0 }; ExtCompact spunky_ext = { @@ -3475,6 +3557,9 @@ ExtCompact spunky_ext = { spu_auto, // animScratch 0, // megaSet &spunky_megaSet0, + 0, + 0, + 0 }; Compact spunky = { @@ -3506,7 +3591,7 @@ Compact spunky = { C_BASE_MODE, // mode SPUNKY_LOGIC, // baseSub 0, // baseSub_off - &spunky_ext, + &spunky_ext }; uint16 sc38_video_anim[] = { @@ -3532,7 +3617,7 @@ uint16 sc38_video_anim[] = { 376, 252, 6, - 0, + 0 }; uint16 sc38_screen_1[] = { @@ -3708,7 +3793,7 @@ uint16 sc38_screen_1[] = { 379, 209, 45, - 0, + 0 }; uint16 sc38_lift_down[] = { @@ -3740,7 +3825,7 @@ uint16 sc38_lift_down[] = { SEND_SYNC, ID_FOSTER, 1, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/39comp.h b/sky/compacts/39comp.h index e507f17910..25cfdf71dc 100644 --- a/sky/compacts/39comp.h +++ b/sky/compacts/39comp.h @@ -46,6 +46,17 @@ Compact sc39_exit_31 = { 190-164, // mouseSize_x 305-225, // mouseSize_y SC39_EXIT_31_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc39_floor_table[] = { @@ -63,7 +74,7 @@ uint16 sc39_floor_table[] = { SC39_EXIT_41_WALK_ON, ID_SC39_WALTERS, GT_SC39_WALTERS, - 65535, + 65535 }; Compact sc39_floor = { @@ -85,6 +96,17 @@ Compact sc39_floor = { 447-176, // mouseSize_x 327-256, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc39_walters = { @@ -106,6 +128,17 @@ Compact sc39_walters = { 445-376, // mouseSize_x 320-228, // mouseSize_y SC39_WALTERS_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 reset_41_39[] = { @@ -123,7 +156,7 @@ uint16 reset_41_39[] = { 42+12*64, C_DIR, LEFT, - 65535, + 65535 }; Compact sc39_exit_40 = { @@ -145,6 +178,17 @@ Compact sc39_exit_40 = { 316-289, // mouseSize_x 252-204, // mouseSize_y SC39_EXIT_40_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc39_ascend[] = { @@ -206,7 +250,7 @@ uint16 sc39_ascend[] = { 293, 202, 9, - 0, + 0 }; uint16 sc39_logic_list[] = { @@ -215,7 +259,7 @@ uint16 sc39_logic_list[] = { ID_SPUNKY, ID_DOG_BARK_THING, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc39_chip_list[] = { @@ -226,7 +270,7 @@ uint16 sc39_chip_list[] = { IT_SC39_GRID_2+DISK_14, 23+DISK_14, 24+DISK_14, - 0, + 0 }; uint16 reset_31_39[] = { @@ -238,7 +282,7 @@ uint16 reset_31_39[] = { 144, C_YCOOD, 296, - 65535, + 65535 }; uint16 sc39_mouse_list[] = { @@ -248,7 +292,7 @@ uint16 sc39_mouse_list[] = { ID_SC39_EXIT_41, ID_SC39_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sc39_exit_41 = { @@ -270,6 +314,17 @@ Compact sc39_exit_41 = { 400-384, // mouseSize_x 227-200, // mouseSize_y SC39_EXIT_41_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *sc39_walk_grid = 0; @@ -306,14 +361,14 @@ uint16 sc39_descend[] = { 289, 210, 9, - 0, + 0 }; uint16 sc39_fast_list[] = { 12+DISK_14, 52+DISK_14, 135+DISK_14, - 0, + 0 }; uint16 reset_40_39[] = { @@ -329,7 +384,7 @@ uint16 reset_40_39[] = { 24*64, C_DIR, DOWN, - 65535, + 65535 }; uint16 sc39_palette[] = { @@ -716,7 +771,7 @@ uint16 sc39_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; }; // namespace SkyCompact diff --git a/sky/compacts/3compact.h b/sky/compacts/3compact.h index 0b7f9a62b5..8fb681fef8 100644 --- a/sky/compacts/3compact.h +++ b/sky/compacts/3compact.h @@ -40,7 +40,7 @@ uint16 rs_low_lift2[] = { L_SCRIPT, C_STATUS, ST_SORT+ST_LOGIC+ST_RECREATE+ST_NO_VMASK, - 65535, + 65535 }; Compact low_lift_2 = { @@ -72,6 +72,7 @@ Compact low_lift_2 = { C_BASE_MODE, // mode LOW_LIFT2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_low_lift3[] = { @@ -87,7 +88,7 @@ uint16 rs_low_lift3[] = { L_SCRIPT, C_STATUS, ST_SORT+ST_LOGIC+ST_RECREATE+ST_NO_VMASK, - 65535, + 65535 }; uint16 liftc3_down[] = { @@ -201,7 +202,7 @@ uint16 liftc3_down[] = { 286, 0, 0, - 0, + 0 }; uint16 joey_list_s3[] = { @@ -210,7 +211,7 @@ uint16 joey_list_s3[] = { 248, 321, 1, - 0, + 0 }; uint16 liftc1_down[] = { @@ -303,14 +304,14 @@ uint16 liftc1_down[] = { 268, 0, 0, - 0, + 0 }; uint16 shades_l_to_r[] = { 41-8+217*64, 40-8+217*64, 47-8+217*64, - 0, + 0 }; uint16 shades_st_talk[] = { @@ -318,7 +319,7 @@ uint16 shades_st_talk[] = { 1, 1, 0, - 0, + 0 }; uint16 shades_st_right[] = { @@ -326,7 +327,7 @@ uint16 shades_st_right[] = { 1, 1, 38, - 0, + 0 }; Compact eye_bolt = { @@ -358,6 +359,7 @@ Compact eye_bolt = { C_BASE_MODE, // mode EYE_BOLT_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact lights1 = { @@ -389,6 +391,7 @@ Compact lights1 = { C_BASE_MODE, // mode LIGHTS1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_low_barrel[] = { @@ -404,7 +407,7 @@ uint16 rs_low_barrel[] = { L_SCRIPT, C_BASE_SUB+2, 0, - 65535, + 65535 }; Compact convey = { @@ -436,6 +439,7 @@ Compact convey = { C_BASE_MODE, // mode CONVEY_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 search_seq[] = { @@ -503,7 +507,7 @@ uint16 search_seq[] = { 289, 231, 0, - 0, + 0 }; ExtCompact eye_ball_ext = { @@ -520,6 +524,22 @@ ExtCompact eye_ball_ext = { 0, // atWatch 0, // atWas 0, // alt + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact eye_ball = { @@ -551,7 +571,7 @@ Compact eye_ball = { C_BASE_MODE, // mode EYE_BALL_LOGIC, // baseSub 0, // baseSub_off - &eye_ball_ext, + &eye_ball_ext }; uint32 *sh = 0; @@ -666,19 +686,19 @@ uint16 liftc3_up[] = { 298, 141, 22, - 0, + 0 }; uint16 shades_l_to_u[] = { 43-8+217*64, - 0, + 0 }; uint16 shades_u_to_d[] = { 43-8+217*64, 42-8+217*64, 41-8+217*64, - 0, + 0 }; uint16 s3_mouse[] = { @@ -691,18 +711,31 @@ uint16 s3_mouse[] = { ID_FURNACE, ID_S3_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 shades_d_to_u[] = { 47-8+217*64, 46-8+217*64, 45-8+217*64, - 0, + 0 }; MegaSet smoulder_megaSet0 = { 7, // gridWidth + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; ExtCompact smoulder_ext = { @@ -732,6 +765,9 @@ ExtCompact smoulder_ext = { 0, // animScratch 0, // megaSet &smoulder_megaSet0, + 0, + 0, + 0 }; Compact smoulder = { @@ -763,7 +799,7 @@ Compact smoulder = { C_BASE_MODE, // mode SMOULDER_LOGIC, // baseSub 0, // baseSub_off - &smoulder_ext, + &smoulder_ext }; Compact low_lift_3 = { @@ -795,11 +831,12 @@ Compact low_lift_3 = { C_BASE_MODE, // mode LOW_LIFT3_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 shades_u_to_r[] = { 45-8+217*64, - 0, + 0 }; Compact furnace = { @@ -831,6 +868,7 @@ Compact furnace = { C_BASE_MODE, // mode FURNACE_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 liftc1_up[] = { @@ -922,12 +960,12 @@ uint16 liftc1_up[] = { 250, 141, 15, - 0, + 0 }; uint16 shades_r_to_d[] = { 47-8+217*64, - 0, + 0 }; uint16 s3_logic[] = { @@ -949,7 +987,7 @@ uint16 s3_logic[] = { ID_SMOULDER, 105, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 shades_st_up[] = { @@ -957,7 +995,7 @@ uint16 shades_st_up[] = { 1, 1, 36, - 0, + 0 }; uint16 smoulder_seq[] = { @@ -992,7 +1030,7 @@ uint16 smoulder_seq[] = { 373, 269, 0, - 0, + 0 }; uint8 shades_auto[64]; @@ -1030,7 +1068,7 @@ uint16 shades_up[] = { 7+217*64, 0, 65534, - 0, + 0 }; uint16 shades_down[] = { @@ -1066,7 +1104,7 @@ uint16 shades_down[] = { 15+217*64, 0, 2, - 0, + 0 }; uint16 shades_left[] = { @@ -1102,7 +1140,7 @@ uint16 shades_left[] = { 23+217*64, 65532, 0, - 0, + 0 }; uint16 shades_right[] = { @@ -1138,7 +1176,7 @@ uint16 shades_right[] = { 31+217*64, 4, 0, - 0, + 0 }; uint16 shades_st_down[] = { @@ -1146,7 +1184,7 @@ uint16 shades_st_down[] = { 1, 1, 32, - 0, + 0 }; uint16 shades_st_left[] = { @@ -1154,39 +1192,39 @@ uint16 shades_st_left[] = { 1, 1, 34, - 0, + 0 }; uint16 shades_u_to_l[] = { 43-8+217*64, - 0, + 0 }; uint16 shades_d_to_l[] = { 41-8+217*64, - 0, + 0 }; uint16 shades_d_to_r[] = { 47-8+217*64, - 0, + 0 }; uint16 shades_l_to_d[] = { 41-8+217*64, - 0, + 0 }; uint16 shades_r_to_u[] = { 45-8+217*64, - 0, + 0 }; uint16 shades_r_to_l[] = { 45-8+217*64, 44-8+217*64, 43-8+217*64, - 0, + 0 }; TurnTable shades_turnTable0 = { @@ -1224,7 +1262,7 @@ TurnTable shades_turnTable0 = { 0, 0, 0 - }, + } }; MegaSet shades_megaSet0 = { @@ -1241,7 +1279,7 @@ MegaSet shades_megaSet0 = { shades_st_left, // standLeft shades_st_right, // standRight shades_st_talk, // standTalk - &shades_turnTable0, + &shades_turnTable0 }; ExtCompact shades_ext = { @@ -1271,6 +1309,9 @@ ExtCompact shades_ext = { shades_auto, // animScratch 0, // megaSet &shades_megaSet0, + 0, + 0, + 0 }; Compact shades = { @@ -1302,7 +1343,7 @@ Compact shades = { 0, // mode SHADES_LOGIC, // baseSub 0, // baseSub_off - &shades_ext, + &shades_ext }; uint16 liftc2_down[] = { @@ -1395,13 +1436,13 @@ uint16 liftc2_down[] = { 210, 0, 0, - 0, + 0 }; uint16 rs_start_joey_fly[] = { C_STATUS, ST_SORT+ST_LOGIC+ST_RECREATE, - 65535, + 65535 }; Compact steve_watch = { @@ -1433,6 +1474,7 @@ Compact steve_watch = { C_BASE_MODE, // mode STEVE_SPY_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 liftc2_up[] = { @@ -1524,7 +1566,7 @@ uint16 liftc2_up[] = { 292, 141, 21, - 0, + 0 }; Compact furnace_door = { @@ -1556,6 +1598,7 @@ Compact furnace_door = { C_BASE_MODE, // mode FURNACE_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact slot = { @@ -1577,6 +1620,17 @@ Compact slot = { 5, // mouseSize_x 15, // mouseSize_y SLOT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 chip_list_sc3[] = { @@ -1600,7 +1654,7 @@ uint16 chip_list_sc3[] = { 225+DISK_1, 218+DISK_1+0X8000, 169+DISK_1+0X8000, - 0, + 0 }; Compact low_lift = { @@ -1632,6 +1686,7 @@ Compact low_lift = { C_BASE_MODE, // mode LOW_LIFT_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact joey_fly = { @@ -1663,6 +1718,7 @@ Compact joey_fly = { C_BASE_MODE, // mode FLY_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_low_lift[] = { @@ -1678,7 +1734,7 @@ uint16 rs_low_lift[] = { L_SCRIPT, C_STATUS, ST_SORT+ST_LOGIC+ST_RECREATE+ST_NO_VMASK, - 65535, + 65535 }; uint16 r3_floor_table[] = { @@ -1696,7 +1752,7 @@ uint16 r3_floor_table[] = { GET_TO_FURNACE, ID_JOEY_PARK, GET_TO_JP2, - 65535, + 65535 }; Compact s3_floor = { @@ -1718,6 +1774,17 @@ Compact s3_floor = { 256, // mouseSize_x 79, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_joey_to_furnace[] = { @@ -1741,7 +1808,7 @@ uint16 rs_joey_to_furnace[] = { RIGHT, C_FRAME, 173*64+12, - 65535, + 65535 }; Compact low_barrel = { @@ -1773,6 +1840,7 @@ Compact low_barrel = { C_BASE_MODE, // mode LOW_BARREL_LOGIC, // baseSub 0, // baseSub_off + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/40comp.h b/sky/compacts/40comp.h index 227a8bd586..98addc7575 100644 --- a/sky/compacts/40comp.h +++ b/sky/compacts/40comp.h @@ -46,6 +46,17 @@ Compact sc40_body_2 = { 280-263, // mouseSize_x 248-222, // mouseSize_y SC40_BODY_2_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc40_locker_shut[] = { @@ -74,7 +85,7 @@ uint16 sc40_locker_shut[] = { 1, 1, 0, - 0, + 0 }; uint16 reset_39_40[] = { @@ -90,7 +101,7 @@ uint16 reset_39_40[] = { 25*64, C_DIR, RIGHT, - 65535, + 65535 }; Compact sc40_body_3 = { @@ -112,6 +123,17 @@ Compact sc40_body_3 = { 305-286, // mouseSize_x 249-220, // mouseSize_y SC40_BODY_3_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc40_cabinet = { @@ -133,6 +155,17 @@ Compact sc40_cabinet = { 357-336, // mouseSize_x 312-280, // mouseSize_y SC40_CABINET_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *sc40_walk_grid = 0; @@ -521,7 +554,7 @@ uint16 sc40_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc40_descend[] = { @@ -583,7 +616,7 @@ uint16 sc40_descend[] = { 226, 218, 14, - 0, + 0 }; Compact sc40_locker_1 = { @@ -615,6 +648,7 @@ Compact sc40_locker_1 = { C_BASE_MODE, // mode SC40_LOCKER_1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc40_floor_table[] = { @@ -646,7 +680,7 @@ uint16 sc40_floor_table[] = { GT_SC40_BODY_4, ID_SC40_BODY_5, GT_SC40_BODY_5, - 65535, + 65535 }; Compact sc40_floor = { @@ -668,6 +702,17 @@ Compact sc40_floor = { 415-168, // mouseSize_x 327-256, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc40_chip_list[] = { @@ -681,7 +726,7 @@ uint16 sc40_chip_list[] = { IT_SC40_CLOSE_DOOR+DISK_14, 25+DISK_14, 26+DISK_14, - 0, + 0 }; Compact sc40_body_5 = { @@ -703,6 +748,17 @@ Compact sc40_body_5 = { 353-342, // mouseSize_x 249-240, // mouseSize_y SC40_BODY_5_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc40_locker_4 = { @@ -734,6 +790,7 @@ Compact sc40_locker_4 = { C_BASE_MODE, // mode SC40_LOCKER_4_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc40_close_door[] = { @@ -768,7 +825,7 @@ uint16 sc40_close_door[] = { 232, 208, 3, - 0, + 0 }; uint16 sc40_locker_open[] = { @@ -800,7 +857,7 @@ uint16 sc40_locker_open[] = { 1, 1, 3, - 0, + 0 }; Compact sc40_locker_2 = { @@ -832,6 +889,7 @@ Compact sc40_locker_2 = { C_BASE_MODE, // mode SC40_LOCKER_2_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc40_locker_3 = { @@ -863,6 +921,7 @@ Compact sc40_locker_3 = { C_BASE_MODE, // mode SC40_LOCKER_3_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc40_fast_list[] = { @@ -872,7 +931,7 @@ uint16 sc40_fast_list[] = { 53+DISK_14, 54+DISK_14, 135+DISK_14, - 0, + 0 }; Compact sc40_exit_39 = { @@ -894,6 +953,17 @@ Compact sc40_exit_39 = { 222-211, // mouseSize_x 268-214, // mouseSize_y SC40_EXIT_39_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc40_body_1 = { @@ -915,6 +985,17 @@ Compact sc40_body_1 = { 250-236, // mouseSize_x 245-208, // mouseSize_y SC40_BODY_1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc40_open_door[] = { @@ -949,7 +1030,7 @@ uint16 sc40_open_door[] = { 240, 208, 3, - 0, + 0 }; Compact sc40_trolley = { @@ -971,6 +1052,17 @@ Compact sc40_trolley = { 336-264, // mouseSize_x 280-264, // mouseSize_y SC40_TROLLEY_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc40_locker_5 = { @@ -1002,6 +1094,7 @@ Compact sc40_locker_5 = { C_BASE_MODE, // mode SC40_LOCKER_5_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc40_mouse_list[] = { @@ -1020,7 +1113,7 @@ uint16 sc40_mouse_list[] = { ID_SC40_EXIT_39, ID_SC40_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 sc40_logic_list[] = { @@ -1033,7 +1126,7 @@ uint16 sc40_logic_list[] = { ID_SC40_LOCKER_4, ID_SC40_LOCKER_5, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; Compact sc40_body_4 = { @@ -1055,6 +1148,17 @@ Compact sc40_body_4 = { 328-311, // mouseSize_x 249-219, // mouseSize_y SC40_BODY_4_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc40_ascend[] = { @@ -1113,7 +1217,7 @@ uint16 sc40_ascend[] = { 193, 199, 17, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/41comp.h b/sky/compacts/41comp.h index c0192ca384..8dd4f9d1ad 100644 --- a/sky/compacts/41comp.h +++ b/sky/compacts/41comp.h @@ -31,7 +31,7 @@ uint16 sc41_mouse_list[] = { ID_SC41_EXIT_39, ID_SC41_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 sc41_heat_2_anim[] = { @@ -66,7 +66,7 @@ uint16 sc41_heat_2_anim[] = { 265, 244, 9, - 0, + 0 }; Compact sc41_heat_1 = { @@ -98,6 +98,7 @@ Compact sc41_heat_1 = { C_BASE_MODE, // mode SC41_HEAT_1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 reset_39_41[] = { @@ -115,7 +116,7 @@ uint16 reset_39_41[] = { 40+13*64, C_DIR, DOWN, - 65535, + 65535 }; uint16 sc41_heat_1_anim[] = { @@ -150,14 +151,14 @@ uint16 sc41_heat_1_anim[] = { 211, 294, 9, - 0, + 0 }; uint32 *sc41_walk_grid = 0; uint16 sc41_fast_list[] = { 13+DISK_14, - 0, + 0 }; Compact sc41_heat_2 = { @@ -189,6 +190,7 @@ Compact sc41_heat_2 = { C_BASE_MODE, // mode SC41_HEAT_2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc41_chip_list[] = { @@ -200,7 +202,7 @@ uint16 sc41_chip_list[] = { 71+DISK_14, 72+DISK_14, 74+DISK_14, - 0, + 0 }; Compact sc41_heat_3 = { @@ -232,6 +234,7 @@ Compact sc41_heat_3 = { C_BASE_MODE, // mode SC41_HEAT_3_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc41_exit_39 = { @@ -253,6 +256,17 @@ Compact sc41_exit_39 = { 342-325, // mouseSize_x 205-190, // mouseSize_y SC41_EXIT_39_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc41_floor_table[] = { @@ -262,7 +276,7 @@ uint16 sc41_floor_table[] = { GT_SC41_EXIT_39, 0, SC41_EXIT_39_WALK_ON, - 65535, + 65535 }; Compact sc41_floor = { @@ -284,6 +298,17 @@ Compact sc41_floor = { 343-328, // mouseSize_x 223-208, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc41_heat_3_anim[] = { @@ -318,7 +343,7 @@ uint16 sc41_heat_3_anim[] = { 390, 294, 9, - 0, + 0 }; uint16 sc41_logic_list[] = { @@ -329,7 +354,7 @@ uint16 sc41_logic_list[] = { ID_SC41_HEAT_2, ID_SC41_HEAT_3, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc41_palette[] = { @@ -716,7 +741,7 @@ uint16 sc41_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; }; // namespace SkyCompact diff --git a/sky/compacts/42comp.h b/sky/compacts/42comp.h index 94e8bf4faa..7957a587fe 100644 --- a/sky/compacts/42comp.h +++ b/sky/compacts/42comp.h @@ -125,7 +125,7 @@ uint16 sc42_jdg_hammer[] = { 269, 186, 0, - 0, + 0 }; uint16 reset_30_42[] = { @@ -135,12 +135,12 @@ uint16 reset_30_42[] = { 424, C_YCOOD, 304, - 65535, + 65535 }; uint16 sc42_mouse_list[] = { 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sc42_sign = { @@ -172,6 +172,7 @@ Compact sc42_sign = { C_BASE_MODE, // mode SC42_SIGN_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc42_fos_enter[] = { @@ -263,7 +264,7 @@ uint16 sc42_fos_enter[] = { 324, 274, 27, - 0, + 0 }; uint16 sc42_clerk_type[] = { @@ -460,7 +461,7 @@ uint16 sc42_clerk_type[] = { 310, 234, 1, - 0, + 0 }; ExtCompact sc42_judge_ext = { @@ -489,6 +490,10 @@ ExtCompact sc42_judge_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc42_judge = { @@ -520,7 +525,7 @@ Compact sc42_judge = { C_BASE_MODE, // mode SC42_JUDGE_LOGIC, // baseSub 0, // baseSub_off - &sc42_judge_ext, + &sc42_judge_ext }; uint16 sc42_logic_list[] = { @@ -533,7 +538,7 @@ uint16 sc42_logic_list[] = { ID_SC31_GUARD, ID_SC42_SIGN, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint32 *sc42_walk_grid = 0; @@ -549,7 +554,7 @@ uint16 sc42_jdg_turn[] = { 1, 1, 2, - 0, + 0 }; uint16 sc42_fast_list[] = { @@ -558,7 +563,7 @@ uint16 sc42_fast_list[] = { 22+DISK_14, 169+DISK_14, 170+DISK_14+0X8000, - 0, + 0 }; ExtCompact sc42_prosecution_ext = { @@ -587,6 +592,10 @@ ExtCompact sc42_prosecution_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc42_prosecution = { @@ -618,7 +627,7 @@ Compact sc42_prosecution = { C_BASE_MODE, // mode SC42_PROSECUTION_LOGIC, // baseSub 0, // baseSub_off - &sc42_prosecution_ext, + &sc42_prosecution_ext }; uint16 sc42_fos_turn_lr[] = { @@ -632,7 +641,7 @@ uint16 sc42_fos_turn_lr[] = { 1, 1, 2, - 0, + 0 }; uint16 sc42_chip_list[] = { @@ -657,7 +666,7 @@ uint16 sc42_chip_list[] = { 166+DISK_14, 167+DISK_14, 168+DISK_14, - 0, + 0 }; ExtCompact sc42_clerk_ext = { @@ -686,6 +695,10 @@ ExtCompact sc42_clerk_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc42_clerk = { @@ -717,7 +730,7 @@ Compact sc42_clerk = { C_BASE_MODE, // mode SC42_CLERK_LOGIC, // baseSub 0, // baseSub_off - &sc42_clerk_ext, + &sc42_clerk_ext }; uint16 reset_guard_42[] = { @@ -731,7 +744,7 @@ uint16 reset_guard_42[] = { SC42_BLUNT_LOGIC, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint16 sc42_jdg_return[] = { @@ -745,7 +758,7 @@ uint16 sc42_jdg_return[] = { 1, 1, 0, - 0, + 0 }; uint16 sc42_fos_turn_rl[] = { @@ -759,7 +772,7 @@ uint16 sc42_fos_turn_rl[] = { 1, 1, 0, - 0, + 0 }; ExtCompact sc42_jobsworth_ext = { @@ -788,6 +801,10 @@ ExtCompact sc42_jobsworth_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc42_jobsworth = { @@ -819,7 +836,7 @@ Compact sc42_jobsworth = { C_BASE_MODE, // mode SC42_JOBSWORTH_LOGIC, // baseSub 0, // baseSub_off - &sc42_jobsworth_ext, + &sc42_jobsworth_ext }; uint16 reset_dani_42[] = { @@ -841,7 +858,7 @@ uint16 reset_dani_42[] = { SC42_DANI_LOGIC, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint16 sc42_sign_anim[] = { @@ -870,7 +887,7 @@ uint16 sc42_sign_anim[] = { 254, 137, 7, - 0, + 0 }; uint16 sc42_blunt_enter[] = { @@ -995,7 +1012,7 @@ uint16 sc42_blunt_enter[] = { 238, 225, 18, - 0, + 0 }; uint16 sc42_blunt_leave[] = { @@ -1123,7 +1140,7 @@ uint16 sc42_blunt_leave[] = { 129, 241, 8, - 0, + 0 }; uint16 sc42_jobs_enter[] = { @@ -1206,7 +1223,7 @@ uint16 sc42_jobs_enter[] = { 340, 200, 13, - 0, + 0 }; uint16 sc42_palette[] = { @@ -1593,7 +1610,7 @@ uint16 sc42_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc42_fos_leave[] = { @@ -1688,7 +1705,7 @@ uint16 sc42_fos_leave[] = { 389, 258, 29, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/44comp.h b/sky/compacts/44comp.h index 41f42c7247..519820d06a 100644 --- a/sky/compacts/44comp.h +++ b/sky/compacts/44comp.h @@ -30,7 +30,7 @@ namespace SkyCompact { uint16 sc44_chip_list[] = { IT_SC44_LAYER_0+DISK_13, 145+DISK_13, - 0, + 0 }; uint32 *sc44_walk_grid = 0; @@ -54,6 +54,17 @@ Compact sc44_rubble = { 250-128, // mouseSize_x 310-223, // mouseSize_y SC44_RUBBLE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 reset_45_44[] = { @@ -65,7 +76,7 @@ uint16 reset_45_44[] = { OFF_RIGHT, C_YCOOD, 280, - 65535, + 65535 }; Compact sc44_grill = { @@ -87,6 +98,17 @@ Compact sc44_grill = { 341-319, // mouseSize_x 198-179, // mouseSize_y SC44_GRILL_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc44_floor_table[] = { @@ -100,7 +122,7 @@ uint16 sc44_floor_table[] = { GT_SC44_EXIT_45, 0, SC44_EXIT_45_WALK_ON, - 65535, + 65535 }; uint16 sc44_drop_down[] = { @@ -135,7 +157,7 @@ uint16 sc44_drop_down[] = { 316, 226, 9, - 0, + 0 }; Compact sc44_exit_45 = { @@ -157,6 +179,17 @@ Compact sc44_exit_45 = { 447-420, // mouseSize_x 327-161, // mouseSize_y SC44_EXIT_45_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc44_fast_list[] = { @@ -165,7 +198,7 @@ uint16 sc44_fast_list[] = { 52+DISK_13, 53+DISK_13, 54+DISK_13, - 0, + 0 }; uint16 sc44_palette[] = { @@ -552,13 +585,13 @@ uint16 sc44_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc44_logic_list[] = { ID_FOSTER, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; Compact sc44_floor = { @@ -580,6 +613,17 @@ Compact sc44_floor = { 447-208, // mouseSize_x 327-272, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc44_mouse_list[] = { @@ -588,7 +632,7 @@ uint16 sc44_mouse_list[] = { ID_SC44_EXIT_45, ID_SC44_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 reset_37_44[] = { @@ -602,7 +646,7 @@ uint16 reset_37_44[] = { 186, C_FRAME, 145*64, - 65535, + 65535 }; }; // namespace SkyCompact diff --git a/sky/compacts/45comp.h b/sky/compacts/45comp.h index 68580dabce..880b7878c4 100644 --- a/sky/compacts/45comp.h +++ b/sky/compacts/45comp.h @@ -36,13 +36,13 @@ uint16 reset_44_45[] = { OFF_LEFT, C_YCOOD, 280, - 65535, + 65535 }; uint16 sc45_logic_list[] = { ID_FOSTER, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc45_floor_table[] = { @@ -60,7 +60,7 @@ uint16 sc45_floor_table[] = { GT_SC45_EXIT_47, 3, SC45_EXIT_47_WALK_ON, - 65535, + 65535 }; Compact sc45_floor = { @@ -82,6 +82,17 @@ Compact sc45_floor = { 457-128, // mouseSize_x 327-264, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc45_exit_47 = { @@ -103,6 +114,17 @@ Compact sc45_exit_47 = { 378-328, // mouseSize_x 261-181, // mouseSize_y SC45_EXIT_47_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 reset_46_45[] = { @@ -114,7 +136,7 @@ uint16 reset_46_45[] = { OFF_RIGHT, C_YCOOD, 280, - 65535, + 65535 }; Compact sc45_exit_46 = { @@ -136,6 +158,17 @@ Compact sc45_exit_46 = { 447-420, // mouseSize_x 327-161, // mouseSize_y SC45_EXIT_46_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc45_palette[] = { @@ -522,7 +555,7 @@ uint16 sc45_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc45_fast_list[] = { @@ -531,7 +564,7 @@ uint16 sc45_fast_list[] = { 52+DISK_13, 53+DISK_13, 54+DISK_13, - 0, + 0 }; uint32 *sc45_walk_grid = 0; @@ -545,7 +578,7 @@ uint16 reset_47_45[] = { 392, C_YCOOD, 248, - 65535, + 65535 }; Compact sc45_exit_44 = { @@ -567,13 +600,24 @@ Compact sc45_exit_44 = { 140-128, // mouseSize_x 327-161, // mouseSize_y SC45_EXIT_44_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc45_chip_list[] = { IT_SC45_LAYER_0+DISK_13, IT_SC45_LAYER_1+DISK_13, IT_SC45_GRID_1+DISK_13, - 0, + 0 }; uint16 sc45_mouse_list[] = { @@ -582,7 +626,7 @@ uint16 sc45_mouse_list[] = { ID_SC45_EXIT_47, ID_SC45_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; }; // namespace SkyCompact diff --git a/sky/compacts/46comp.h b/sky/compacts/46comp.h index 123ea9f4a1..6deddc9a38 100644 --- a/sky/compacts/46comp.h +++ b/sky/compacts/46comp.h @@ -36,7 +36,7 @@ uint16 sc46_floor_table[] = { GT_SC46_EXIT_45, 0, SC46_EXIT_45_WALK_ON, - 65535, + 65535 }; uint16 sc46_palette[] = { @@ -423,12 +423,12 @@ uint16 sc46_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc46_chip_list[] = { IT_SC46_LAYER_0+DISK_13, - 0, + 0 }; Compact sc46_exit_45 = { @@ -450,12 +450,23 @@ Compact sc46_exit_45 = { 140-128, // mouseSize_x 327-161, // mouseSize_y SC46_EXIT_45_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc46_logic_list[] = { ID_FOSTER, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc46_mouse_list[] = { @@ -463,7 +474,7 @@ uint16 sc46_mouse_list[] = { ID_SC46_EXIT_45, ID_SC46_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint32 *sc46_walk_grid = 0; @@ -474,7 +485,7 @@ uint16 sc46_fast_list[] = { 52+DISK_13, 53+DISK_13, 54+DISK_13, - 0, + 0 }; Compact sc46_rubble = { @@ -496,6 +507,17 @@ Compact sc46_rubble = { 447-325, // mouseSize_x 310-223, // mouseSize_y SC46_RUBBLE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 reset_45_46[] = { @@ -507,7 +529,7 @@ uint16 reset_45_46[] = { OFF_LEFT, C_YCOOD, 280, - 65535, + 65535 }; Compact sc46_floor = { @@ -529,6 +551,17 @@ Compact sc46_floor = { 375-128, // mouseSize_x 327-272, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/47comp.h b/sky/compacts/47comp.h index 49814ab64f..72e409781c 100644 --- a/sky/compacts/47comp.h +++ b/sky/compacts/47comp.h @@ -36,7 +36,7 @@ uint16 reset_48_47[] = { OFF_RIGHT, C_YCOOD, 280, - 65535, + 65535 }; uint16 sc47_palette[] = { @@ -423,7 +423,7 @@ uint16 sc47_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 reset_45_47[] = { @@ -435,7 +435,7 @@ uint16 reset_45_47[] = { OFF_LEFT, C_YCOOD, 280, - 65535, + 65535 }; uint16 sc47_mouse_list[] = { @@ -443,7 +443,7 @@ uint16 sc47_mouse_list[] = { ID_SC47_EXIT_48, ID_SC47_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sc47_exit_48 = { @@ -465,6 +465,17 @@ Compact sc47_exit_48 = { 447-420, // mouseSize_x 327-161, // mouseSize_y SC47_EXIT_48_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *sc47_walk_grid = 0; @@ -475,13 +486,13 @@ uint16 sc47_fast_list[] = { 52+DISK_13, 53+DISK_13, 54+DISK_13, - 0, + 0 }; uint16 sc47_logic_list[] = { ID_FOSTER, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; Compact sc47_exit_45 = { @@ -503,11 +514,22 @@ Compact sc47_exit_45 = { 140-128, // mouseSize_x 327-161, // mouseSize_y SC47_EXIT_45_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc47_chip_list[] = { IT_SC47_LAYER_0+DISK_13, - 0, + 0 }; uint16 sc47_floor_table[] = { @@ -521,7 +543,7 @@ uint16 sc47_floor_table[] = { GT_SC47_EXIT_48, 1, SC47_EXIT_48_WALK_ON, - 65535, + 65535 }; Compact sc47_floor = { @@ -543,6 +565,17 @@ Compact sc47_floor = { 447-128, // mouseSize_x 327-272, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/48comp.h b/sky/compacts/48comp.h index 7d2a57b31c..130923f204 100644 --- a/sky/compacts/48comp.h +++ b/sky/compacts/48comp.h @@ -56,6 +56,7 @@ Compact sc48_eyes = { C_BASE_MODE, // mode SC48_EYES_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc48_mouse_list[] = { @@ -65,7 +66,7 @@ uint16 sc48_mouse_list[] = { ID_SC48_EXIT_65, ID_SC48_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 sc48_chip_list[] = { @@ -74,7 +75,7 @@ uint16 sc48_chip_list[] = { 72+DISK_13, 74+DISK_13, 75+DISK_13, - 0, + 0 }; uint16 sc48_floor_table[] = { @@ -92,7 +93,7 @@ uint16 sc48_floor_table[] = { GT_SC48_SOCKET, ID_SC48_HOLE, GT_SC48_HOLE, - 65535, + 65535 }; Compact sc48_socket = { @@ -124,6 +125,7 @@ Compact sc48_socket = { C_BASE_MODE, // mode SC48_SOCKET_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc48_put_bulb[] = { @@ -161,7 +163,7 @@ uint16 sc48_put_bulb[] = { 304, 224, 0, - 0, + 0 }; uint16 sc48_palette[] = { @@ -548,7 +550,7 @@ uint16 sc48_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc48_fast_list[] = { @@ -557,7 +559,7 @@ uint16 sc48_fast_list[] = { 52+DISK_13, 53+DISK_13, 54+DISK_13, - 0, + 0 }; Compact sc48_hole = { @@ -589,6 +591,7 @@ Compact sc48_hole = { C_BASE_MODE, // mode SC48_HOLE_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 reset_47_48[] = { @@ -600,7 +603,7 @@ uint16 reset_47_48[] = { OFF_LEFT, C_YCOOD, 280, - 65535, + 65535 }; uint16 sc48_logic_list[] = { @@ -609,7 +612,7 @@ uint16 sc48_logic_list[] = { ID_SC48_HOLE, ID_SC48_EYES, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 reset_65_48[] = { @@ -621,7 +624,7 @@ uint16 reset_65_48[] = { OFF_RIGHT, C_YCOOD, 280, - 65535, + 65535 }; uint16 sc48_eyes_anim[] = { @@ -671,7 +674,7 @@ uint16 sc48_eyes_anim[] = { 358, 201, 11, - 0, + 0 }; Compact sc48_exit_47 = { @@ -693,6 +696,17 @@ Compact sc48_exit_47 = { 140-128, // mouseSize_x 327-161, // mouseSize_y SC48_EXIT_47_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc48_exit_65 = { @@ -714,6 +728,17 @@ Compact sc48_exit_65 = { 448-420, // mouseSize_x 327-161, // mouseSize_y SC48_EXIT_65_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *sc48_walk_grid = 0; @@ -737,6 +762,17 @@ Compact sc48_floor = { 447-128, // mouseSize_x 327-272, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc48_light_pal[] = { @@ -1123,7 +1159,7 @@ uint16 sc48_light_pal[] = { 831, 0, 16128, - 16191, + 16191 }; }; // namespace SkyCompact diff --git a/sky/compacts/4compact.h b/sky/compacts/4compact.h index 58710ff441..aded1482f7 100644 --- a/sky/compacts/4compact.h +++ b/sky/compacts/4compact.h @@ -29,7 +29,7 @@ namespace SkyCompact { uint16 jobs_u_to_l[] = { 43-8+117*64, - 0, + 0 }; uint16 m_jobs_left[] = { @@ -65,19 +65,19 @@ uint16 m_jobs_left[] = { 23+270*64, 65534, 0, - 0, + 0 }; uint16 jobs_l_to_u[] = { 43-8+117*64, - 0, + 0 }; uint16 m_jobs_u_to_d[] = { 43-8+270*64, 42-8+270*64, 41-8+270*64, - 0, + 0 }; Compact sarnie_s4 = { @@ -103,11 +103,18 @@ Compact sarnie_s4 = { 0, // downFlag 0, // getToFlag 0, // flag + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 m_jobs_l_to_d[] = { 41-8+270*64, - 0, + 0 }; uint16 s4_talk_table[] = { @@ -141,7 +148,7 @@ uint16 s4_talk_table[] = { GET_TO_MONITOR, ID_LAZER, GT_LAZER, - 65535, + 65535 }; uint32 *l_talk_s4 = 0; @@ -168,7 +175,7 @@ uint16 chip_list_sc4[] = { 142, 117, 134, - 0, + 0 }; Compact r_talk_s4 = { @@ -178,6 +185,29 @@ Compact r_talk_s4 = { 0, // screen 0, // place s4_talk_table, // getToTable + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact monitors_s4 = { @@ -209,6 +239,7 @@ Compact monitors_s4 = { C_BASE_MODE, // mode MONITOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 m_jobs_down[] = { @@ -244,7 +275,7 @@ uint16 m_jobs_down[] = { 15+270*64, 0, 1, - 0, + 0 }; Compact jobsworth = { @@ -274,6 +305,9 @@ Compact jobsworth = { 0, // grafixProg 0, // offset 0, // mode + 0, + 0, + 0 }; uint16 jobs_st_down[] = { @@ -281,7 +315,7 @@ uint16 jobs_st_down[] = { 1, 1, 32, - 0, + 0 }; Compact notice4 = { @@ -303,6 +337,17 @@ Compact notice4 = { 8, // mouseSize_x 8, // mouseSize_y NOTICE4_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 m_jobs_st_down[] = { @@ -310,7 +355,7 @@ uint16 m_jobs_st_down[] = { 1, 1, 32, - 0, + 0 }; uint16 m_jobs_st_talk[] = { @@ -318,7 +363,7 @@ uint16 m_jobs_st_talk[] = { 1, 1, 0, - 0, + 0 }; uint8 jobs_auto[64]; @@ -356,7 +401,7 @@ uint16 m_jobs_up[] = { 7+270*64, 0, 65535, - 0, + 0 }; uint16 m_jobs_right[] = { @@ -392,7 +437,7 @@ uint16 m_jobs_right[] = { 31+270*64, 2, 0, - 0, + 0 }; uint16 m_jobs_st_up[] = { @@ -400,7 +445,7 @@ uint16 m_jobs_st_up[] = { 1, 1, 36, - 0, + 0 }; uint16 m_jobs_st_left[] = { @@ -408,7 +453,7 @@ uint16 m_jobs_st_left[] = { 1, 1, 34, - 0, + 0 }; uint16 m_jobs_st_right[] = { @@ -416,63 +461,63 @@ uint16 m_jobs_st_right[] = { 1, 1, 38, - 0, + 0 }; uint16 m_jobs_u_to_l[] = { 43-8+270*64, - 0, + 0 }; uint16 m_jobs_u_to_r[] = { 45-8+270*64, - 0, + 0 }; uint16 m_jobs_d_to_u[] = { 47-8+270*64, 46-8+270*64, 45-8+270*64, - 0, + 0 }; uint16 m_jobs_d_to_l[] = { 41-8+270*64, - 0, + 0 }; uint16 m_jobs_d_to_r[] = { 47-8+270*64, - 0, + 0 }; uint16 m_jobs_l_to_u[] = { 43-8+270*64, - 0, + 0 }; uint16 m_jobs_l_to_r[] = { 41-8+270*64, 40-8+270*64, 47-8+270*64, - 0, + 0 }; uint16 m_jobs_r_to_u[] = { 45-8+270*64, - 0, + 0 }; uint16 m_jobs_r_to_d[] = { 47-8+270*64, - 0, + 0 }; uint16 m_jobs_r_to_l[] = { 45-8+270*64, 44-8+270*64, 43-8+270*64, - 0, + 0 }; uint16 jobs_up[] = { @@ -508,7 +553,7 @@ uint16 jobs_up[] = { 7+117*64, 0, 65534, - 0, + 0 }; uint16 jobs_down[] = { @@ -544,7 +589,7 @@ uint16 jobs_down[] = { 15+117*64, 0, 2, - 0, + 0 }; uint16 jobs_left[] = { @@ -580,7 +625,7 @@ uint16 jobs_left[] = { 23+117*64, 65532, 0, - 0, + 0 }; uint16 jobs_right[] = { @@ -616,7 +661,7 @@ uint16 jobs_right[] = { 31+117*64, 4, 0, - 0, + 0 }; uint16 jobs_st_up[] = { @@ -624,7 +669,7 @@ uint16 jobs_st_up[] = { 1, 1, 36, - 0, + 0 }; uint16 jobs_st_left[] = { @@ -632,7 +677,7 @@ uint16 jobs_st_left[] = { 1, 1, 34, - 0, + 0 }; uint16 jobs_st_right[] = { @@ -640,7 +685,7 @@ uint16 jobs_st_right[] = { 1, 1, 38, - 0, + 0 }; uint16 jobs_st_talk[] = { @@ -648,65 +693,65 @@ uint16 jobs_st_talk[] = { 1, 1, 0, - 0, + 0 }; uint16 jobs_u_to_d[] = { 43-8+117*64, 42-8+117*64, 41-8+117*64, - 0, + 0 }; uint16 jobs_u_to_r[] = { 45-8+117*64, - 0, + 0 }; uint16 jobs_d_to_u[] = { 47-8+117*64, 46-8+117*64, 45-8+117*64, - 0, + 0 }; uint16 jobs_d_to_l[] = { 41-8+117*64, - 0, + 0 }; uint16 jobs_d_to_r[] = { 47-8+117*64, - 0, + 0 }; uint16 jobs_l_to_d[] = { 41-8+117*64, - 0, + 0 }; uint16 jobs_l_to_r[] = { 41-8+117*64, 40-8+117*64, 47-8+117*64, - 0, + 0 }; uint16 jobs_r_to_u[] = { 45-8+117*64, - 0, + 0 }; uint16 jobs_r_to_d[] = { 47-8+117*64, - 0, + 0 }; uint16 jobs_r_to_l[] = { 45-8+117*64, 44-8+117*64, 43-8+117*64, - 0, + 0 }; Compact buttons_s4 = { @@ -728,6 +773,17 @@ Compact buttons_s4 = { 8, // mouseSize_x 15, // mouseSize_y BUTTON_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc4_mouse_open[] = { @@ -747,7 +803,7 @@ uint16 sc4_mouse_open[] = { ID_KNOB, ID_BUTTONS, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact tv_screens_s4 = { @@ -779,6 +835,7 @@ Compact tv_screens_s4 = { C_BASE_MODE, // mode TV_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc4_logic[] = { @@ -800,7 +857,7 @@ uint16 sc4_logic[] = { ID_LIGHT1, ID_PANEL, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; Compact postcard = { @@ -822,6 +879,17 @@ Compact postcard = { 5, // mouseSize_x 5, // mouseSize_y POSTCARD_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact knob_s4 = { @@ -853,6 +921,7 @@ Compact knob_s4 = { C_BASE_MODE, // mode KNOB_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact lazer_s4 = { @@ -884,6 +953,7 @@ Compact lazer_s4 = { C_BASE_MODE, // mode LAZER_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 fast_list_sc4[] = { @@ -899,7 +969,7 @@ uint16 fast_list_sc4[] = { 136, 137, 138, - 0, + 0 }; Compact sc4_left_exit = { @@ -921,6 +991,17 @@ Compact sc4_left_exit = { 13, // mouseSize_x 61, // mouseSize_y EL4_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact spanner_s4 = { @@ -946,6 +1027,13 @@ Compact spanner_s4 = { 0, // downFlag 0, // getToFlag 0, // flag + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 joey_list_s4[] = { @@ -959,7 +1047,7 @@ uint16 joey_list_s4[] = { 256, 272, 0, - 0, + 0 }; uint32 *c43 = 0; @@ -993,6 +1081,7 @@ Compact chuck_s4 = { C_BASE_MODE, // mode CHUCK_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 r4_floor_table[] = { @@ -1030,7 +1119,7 @@ uint16 r4_floor_table[] = { GET_TO_JP2, ID_LAZER, GT_LAZER, - 65535, + 65535 }; uint16 sc4_mouse[] = { @@ -1048,7 +1137,7 @@ uint16 sc4_mouse[] = { ID_KNOB, ID_BUTTONS, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sc4_floor = { @@ -1070,6 +1159,17 @@ Compact sc4_floor = { 183, // mouseSize_x 64, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact cupboard_s4 = { @@ -1101,6 +1201,7 @@ Compact cupboard_s4 = { C_BASE_MODE, // mode CUPBOARD_LOGIC, // baseSub 0, // baseSub_off + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/5compact.h b/sky/compacts/5compact.h index 9a936bc2e7..9547317fc3 100644 --- a/sky/compacts/5compact.h +++ b/sky/compacts/5compact.h @@ -54,6 +54,17 @@ Compact copter = { 389-228, // mouseSize_x 287-208, // mouseSize_y COPTER_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_joey_29_7[] = { @@ -71,7 +82,7 @@ uint16 rs_joey_29_7[] = { JOEY_OUT_OF_LIFT7, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint16 rs_joey_to_6[] = { @@ -93,7 +104,7 @@ uint16 rs_joey_to_6[] = { ST_SORT+ST_RECREATE+ST_LOGIC+ST_GRID_PLOT+ST_COLLISION+ST_MOUSE, C_DIR, RIGHT, - 65535, + 65535 }; Compact lift_notice = { @@ -115,6 +126,17 @@ Compact lift_notice = { 6, // mouseSize_x 8, // mouseSize_y LIFT_NOTICE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 mid_up_get[] = { @@ -149,7 +171,7 @@ uint16 mid_up_get[] = { 1, 1, 0, - 0, + 0 }; uint16 jostair1_seq[] = { @@ -280,7 +302,7 @@ uint16 jostair1_seq[] = { 224, 316, 33, - 0, + 0 }; uint16 grd_watch_seq[] = { @@ -381,7 +403,7 @@ uint16 grd_watch_seq[] = { 306, 228, 0, - 0, + 0 }; uint32 *grid18 = 0; @@ -417,7 +439,7 @@ uint16 s7_floor_table[] = { GT_R_TALK_7, ID_CABLE_7, GT_CABLE_7, - 65535, + 65535 }; uint16 lamb_card_seq[] = { @@ -449,7 +471,7 @@ uint16 lamb_card_seq[] = { 338, 183, 0, - 0, + 0 }; uint16 joey_list_s6[] = { @@ -458,7 +480,7 @@ uint16 joey_list_s6[] = { 272, 287, 1, - 0, + 0 }; uint16 s6_chip_list[] = { @@ -476,7 +498,7 @@ uint16 s6_chip_list[] = { 20+DISK_2, 21+DISK_2, 22+DISK_2, - 0, + 0 }; uint16 s6_pal[] = { @@ -863,7 +885,7 @@ uint16 s6_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 rs_foster_8_7[] = { @@ -879,7 +901,7 @@ uint16 rs_foster_8_7[] = { LEFT, C_FRAME, 12*64, - 65535, + 65535 }; Compact joey_fly_6 = { @@ -911,6 +933,7 @@ Compact joey_fly_6 = { C_BASE_MODE, // mode JOEY_FLY_TO_6, // baseSub 0, // baseSub_off + 0 }; uint16 s7_chip_list[] = { @@ -927,7 +950,7 @@ uint16 s7_chip_list[] = { 43+DISK_2, 147+DISK_2, 148+DISK_2, - 0, + 0 }; uint16 s8_logic[] = { @@ -936,7 +959,7 @@ uint16 s8_logic[] = { ID_WRECK_GUARD, ID_CABLE_7, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 s7_lift_open[] = { @@ -977,7 +1000,7 @@ uint16 s7_lift_open[] = { 1, 1, 12, - 0, + 0 }; uint16 skorl_anim[] = { @@ -1051,7 +1074,7 @@ uint16 skorl_anim[] = { 1, 1, 4, - 0, + 0 }; uint16 card_slot_anim[] = { @@ -1077,7 +1100,7 @@ uint16 card_slot_anim[] = { 1, 1, 0, - 0, + 0 }; uint16 dwn_stair1_seq[] = { @@ -1163,7 +1186,7 @@ uint16 dwn_stair1_seq[] = { 227, 238, 26, - 0, + 0 }; Compact s7_floor = { @@ -1185,6 +1208,17 @@ Compact s7_floor = { 320, // mouseSize_x 63, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_foster_9_6[] = { @@ -1196,7 +1230,7 @@ uint16 rs_foster_9_6[] = { 6, C_PLACE, ID_S6_FLOOR, - 65535, + 65535 }; uint16 s6_mouse[] = { @@ -1208,7 +1242,7 @@ uint16 s6_mouse[] = { ID_MONITOR, ID_S6_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 rs_foster_to_5[] = { @@ -1218,14 +1252,14 @@ uint16 rs_foster_to_5[] = { 5, C_PLACE, ID_S5_FLOOR, - 65535, + 65535 }; uint16 s8_chip_list[] = { 130+DISK_2, 13, 114+DISK_2, - 0, + 0 }; uint16 weld_7_seq[] = { @@ -1254,7 +1288,7 @@ uint16 weld_7_seq[] = { 369, 148, 7, - 0, + 0 }; uint16 grd_blink_seq[] = { @@ -1355,7 +1389,7 @@ uint16 grd_blink_seq[] = { 379, 228, 0, - 0, + 0 }; Compact down_exit_s8 = { @@ -1377,6 +1411,17 @@ Compact down_exit_s8 = { 338-232, // mouseSize_x 42, // mouseSize_y ED8_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 jostair3_seq[] = { @@ -1531,7 +1576,7 @@ uint16 jostair3_seq[] = { 192, 238, 14, - 0, + 0 }; uint16 s5_chip_list[] = { @@ -1547,7 +1592,7 @@ uint16 s5_chip_list[] = { 14+DISK_2, 15+DISK_2, 16+DISK_2, - 0, + 0 }; Compact left_exit_s7 = { @@ -1569,6 +1614,17 @@ Compact left_exit_s7 = { 11, // mouseSize_x 300, // mouseSize_y EL7_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *grid7 = 0; @@ -1582,7 +1638,7 @@ uint16 rs_foster_18_5[] = { 5, C_PLACE, ID_S5_FLOOR, - 65535, + 65535 }; uint16 upstairs1_seq[] = { @@ -1644,7 +1700,7 @@ uint16 upstairs1_seq[] = { 223, 302, 18, - 0, + 0 }; uint16 rs_foster_6_7[] = { @@ -1656,7 +1712,7 @@ uint16 rs_foster_6_7[] = { 7, C_PLACE, ID_S7_FLOOR, - 65535, + 65535 }; Compact s7_card_slot = { @@ -1678,12 +1734,23 @@ Compact s7_card_slot = { 6, // mouseSize_x 10, // mouseSize_y S7_SLOT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_joey_fly[] = { C_STATUS, ST_BACKGROUND+ST_LOGIC+ST_RECREATE, - 65535, + 65535 }; uint16 s7_mouse[] = { @@ -1699,7 +1766,7 @@ uint16 s7_mouse[] = { ID_CABLE_7, ID_S7_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 s7_logic[] = { @@ -1711,7 +1778,7 @@ uint16 s7_logic[] = { ID_CABLE_7, ID_S6_JOEY_FLY, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; ExtCompact wreck_guard_ext = { @@ -1740,6 +1807,10 @@ ExtCompact wreck_guard_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact wreck_guard = { @@ -1771,7 +1842,7 @@ Compact wreck_guard = { 0, // mode WRECK_LOGIC, // baseSub 0, // baseSub_off - &wreck_guard_ext, + &wreck_guard_ext }; uint16 rs_foster_5_6[] = { @@ -1781,7 +1852,7 @@ uint16 rs_foster_5_6[] = { 6, C_PLACE, ID_S6_FLOOR, - 65535, + 65535 }; uint16 rs_foster_7_8[] = { @@ -1797,7 +1868,7 @@ uint16 rs_foster_7_8[] = { UP, C_FRAME, 44+13*64, - 65535, + 65535 }; uint16 upstairs2_seq[] = { @@ -1889,7 +1960,7 @@ uint16 upstairs2_seq[] = { 206, 198, 28, - 0, + 0 }; Compact security_exit = { @@ -1911,6 +1982,17 @@ Compact security_exit = { 6, // mouseSize_x 235-171, // mouseSize_y SECURITY_EXIT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s6_logic[] = { @@ -1924,7 +2006,7 @@ uint16 s6_logic[] = { ID_LIFT7_LIGHT, ID_CABLE_7, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; Compact right_exit_s5 = { @@ -1946,6 +2028,17 @@ Compact right_exit_s5 = { 11, // mouseSize_x 300, // mouseSize_y ER5_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact cable_7 = { @@ -1977,6 +2070,7 @@ Compact cable_7 = { C_BASE_MODE, // mode CABLE_7_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_29_7[] = { @@ -1988,7 +2082,7 @@ uint16 rs_foster_29_7[] = { 7, C_PLACE, ID_S7_FLOOR, - 65535, + 65535 }; uint16 s8_mouse[] = { @@ -1997,7 +2091,7 @@ uint16 s8_mouse[] = { ID_COPTER, ID_S8_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 s8_pal[] = { @@ -2384,7 +2478,7 @@ uint16 s8_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact security_exit_s6 = { @@ -2406,6 +2500,17 @@ Compact security_exit_s6 = { 10, // mouseSize_x 230-167, // mouseSize_y S6_DOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *grid5 = 0; @@ -2604,7 +2709,7 @@ uint16 jostair2_seq[] = { 192, 229, 28, - 0, + 0 }; uint16 s6_floor_table[] = { @@ -2626,7 +2731,7 @@ uint16 s6_floor_table[] = { S6_RWALK_ON, 42, S6_SEC_WALK_ON, - 65535, + 65535 }; Compact lift_s7 = { @@ -2658,6 +2763,7 @@ Compact lift_s7 = { C_BASE_MODE, // mode S7_LIFT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 s5_mouse[] = { @@ -2669,7 +2775,7 @@ uint16 s5_mouse[] = { S5_SECURITY_EXIT, ID_S5_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 s5_logic[] = { @@ -2682,7 +2788,7 @@ uint16 s5_logic[] = { ID_LIFT7_LIGHT, ID_S6_JOEY_FLY, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 dwn_stair2_seq[] = { @@ -2744,7 +2850,7 @@ uint16 dwn_stair2_seq[] = { 195, 302, 18, - 0, + 0 }; uint32 *grid9 = 0; @@ -2756,7 +2862,7 @@ uint16 s8_fast_list[] = { 53, 54, 135, - 0, + 0 }; Compact right_exit_s7 = { @@ -2778,6 +2884,17 @@ Compact right_exit_s7 = { 30, // mouseSize_x 296-175, // mouseSize_y ER7_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s5_floor_table[] = { @@ -2797,7 +2914,7 @@ uint16 s5_floor_table[] = { GET_TO_SKORL, S5_SECURITY_EXIT, GET_TO_SECURITY_EXIT, - 65535, + 65535 }; Compact s5_floor = { @@ -2819,6 +2936,17 @@ Compact s5_floor = { 320, // mouseSize_x 63, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s8_floor_table[] = { @@ -2830,7 +2958,7 @@ uint16 s8_floor_table[] = { GET_TO_WRECK, ID_DOWN_EXIT_S8, GET_TO_EXIT_S8, - 65535, + 65535 }; uint16 lamblook_seq[] = { @@ -2979,7 +3107,7 @@ uint16 lamblook_seq[] = { 266, 224, 3, - 0, + 0 }; uint16 s5_pal[] = { @@ -3366,7 +3494,7 @@ uint16 s5_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint32 *z2 = 0; @@ -3394,6 +3522,17 @@ Compact left_exit_s5 = { 189-177, // mouseSize_x 232-172, // mouseSize_y LDOOR_5_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact right_exit_s6 = { @@ -3415,6 +3554,17 @@ Compact right_exit_s6 = { 11, // mouseSize_x 300, // mouseSize_y ER6_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact s6_floor = { @@ -3436,6 +3586,17 @@ Compact s6_floor = { 320, // mouseSize_x 71, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_foster_to_6[] = { @@ -3451,7 +3612,7 @@ uint16 rs_foster_to_6[] = { 12*64, C_DIR, 1, - 65535, + 65535 }; uint16 use_linc_anim[] = { @@ -3483,7 +3644,7 @@ uint16 use_linc_anim[] = { 269, 223, 0, - 0, + 0 }; Compact stairs6 = { @@ -3505,6 +3666,17 @@ Compact stairs6 = { 238-201, // mouseSize_x 246-238, // mouseSize_y STAIR6_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_foster_6_3[] = { @@ -3520,7 +3692,7 @@ uint16 rs_foster_6_3[] = { LEFT, C_FRAME, 12*64, - 65535, + 65535 }; Compact left_exit_s6 = { @@ -3542,6 +3714,17 @@ Compact left_exit_s6 = { 11, // mouseSize_x 300, // mouseSize_y EL6_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s7_pal[] = { @@ -3928,7 +4111,7 @@ uint16 s7_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 rs_foster_7_6[] = { @@ -3940,7 +4123,7 @@ uint16 rs_foster_7_6[] = { 6, C_PLACE, ID_S6_FLOOR, - 65535, + 65535 }; ExtCompact skorl_guard_ext = { @@ -3969,6 +4152,10 @@ ExtCompact skorl_guard_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact skorl_guard = { @@ -4000,7 +4187,7 @@ Compact skorl_guard = { 0, // mode SKORL_LOGIC, // baseSub 0, // baseSub_off - &skorl_guard_ext, + &skorl_guard_ext }; Compact s8_floor = { @@ -4022,6 +4209,17 @@ Compact s8_floor = { 336-224, // mouseSize_x 32, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact factory_entry = { @@ -4043,6 +4241,17 @@ Compact factory_entry = { 6, // mouseSize_x 240-177, // mouseSize_y FACTORY_ENTRY_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 s7_lift_close[] = { @@ -4083,7 +4292,7 @@ uint16 s7_lift_close[] = { 1, 1, 0, - 0, + 0 }; uint16 linc_table[] = { @@ -4091,7 +4300,7 @@ uint16 linc_table[] = { GT_R_TALK_7, ID_S7_CARD_SLOT, GT_S7_SLOT, - 65535, + 65535 }; Compact linc_s7 = { @@ -4113,6 +4322,17 @@ Compact linc_s7 = { 316-295, // mouseSize_x 267-228, // mouseSize_y LINC_S7_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact lift7_light = { @@ -4125,6 +4345,26 @@ Compact lift7_light = { 0XFF, // xcood 0XAC, // ycood 146*64, // frame + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 cable_cut_seq[] = { @@ -4156,7 +4396,7 @@ uint16 cable_cut_seq[] = { 410, 225, 7, - 0, + 0 }; uint16 rs_foster_0_5[] = { @@ -4172,7 +4412,7 @@ uint16 rs_foster_0_5[] = { 42+12*64, C_MEGA_SET, 1*NEXT_MEGA_SET, - 65535, + 65535 }; uint16 lamb_talk_right[] = { @@ -4322,7 +4562,7 @@ uint16 lamb_talk_right[] = { 1, 1, 9, - 0, + 0 }; void *data_2[] = { @@ -4678,7 +4918,7 @@ void *data_2[] = { 0, lamb_talk_right, &linc_s9, - &foreman, + &foreman }; uint32 *table2 = 0; diff --git a/sky/compacts/65comp.h b/sky/compacts/65comp.h index 2cd36fc1e6..555477339c 100644 --- a/sky/compacts/65comp.h +++ b/sky/compacts/65comp.h @@ -48,6 +48,17 @@ Compact sc65_exit_48 = { 140-128, // mouseSize_x 327-161, // mouseSize_y SC65_EXIT_48_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc65_floor_table[] = { @@ -65,7 +76,7 @@ uint16 sc65_floor_table[] = { SC65_EXIT_48_WALK_ON, ID_SC65_EXIT_66, GT_SC65_EXIT_66, - 65535, + 65535 }; Compact sc65_floor = { @@ -87,6 +98,17 @@ Compact sc65_floor = { 375-128, // mouseSize_x 327-272, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 reset_48_65[] = { @@ -98,14 +120,14 @@ uint16 reset_48_65[] = { OFF_LEFT, C_YCOOD, 288, - 65535, + 65535 }; uint16 sc65_chip_list[] = { IT_SC65_LAYER_0+DISK_13, IT_SC65_LAYER_1+DISK_13, IT_SC65_GRID_1+DISK_13, - 0, + 0 }; Compact sc65_exit_66 = { @@ -127,6 +149,17 @@ Compact sc65_exit_66 = { 386-376, // mouseSize_x 306-240, // mouseSize_y LINK_65_66, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc65_mouse_list[] = { @@ -137,7 +170,7 @@ uint16 sc65_mouse_list[] = { ID_SC65_EXIT_66, ID_SC65_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 sc65_fast_list[] = { @@ -146,7 +179,7 @@ uint16 sc65_fast_list[] = { 52+DISK_13, 53+DISK_13, 54+DISK_13, - 0, + 0 }; Compact sc65_poster2 = { @@ -168,6 +201,17 @@ Compact sc65_poster2 = { 246-227, // mouseSize_x 201-175, // mouseSize_y SC65_POSTER2_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc65_poster1 = { @@ -189,6 +233,17 @@ Compact sc65_poster1 = { 224-204, // mouseSize_x 201-175, // mouseSize_y SC65_POSTER1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc65_sign = { @@ -210,12 +265,23 @@ Compact sc65_sign = { 347-310, // mouseSize_x 201-177, // mouseSize_y SC65_SIGN_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc65_logic_list[] = { ID_FOSTER, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc65_palette[] = { @@ -602,7 +668,7 @@ uint16 sc65_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; }; // namespace SkyCompact diff --git a/sky/compacts/66comp.h b/sky/compacts/66comp.h index 75d6cf142a..b6d12a347a 100644 --- a/sky/compacts/66comp.h +++ b/sky/compacts/66comp.h @@ -54,7 +54,7 @@ uint16 sc66_hi_beam_an1[] = { 205, 144, 2, - 0, + 0 }; uint16 sc66_door_close[] = { @@ -74,7 +74,7 @@ uint16 sc66_door_close[] = { 161, 148, 4, - 0, + 0 }; uint16 sc75_dead_tlk[] = { @@ -152,7 +152,7 @@ uint16 sc75_dead_tlk[] = { 167, 238, 1, - 0, + 0 }; Compact sc66_rock3 = { @@ -184,6 +184,7 @@ Compact sc66_rock3 = { C_BASE_MODE, // mode SC66_ROCK3_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc66_lo_beam = { @@ -215,6 +216,7 @@ Compact sc66_lo_beam = { C_BASE_MODE, // mode SC66_LO_BEAM_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc66_stones_anim[] = { @@ -249,7 +251,7 @@ uint16 sc66_stones_anim[] = { 188, 224, 6, - 0, + 0 }; uint16 walter_conv[] = { @@ -447,7 +449,7 @@ uint16 walter_conv[] = { 249, 214, 0, - 0, + 0 }; uint16 sc66_logic_list[] = { @@ -461,7 +463,7 @@ uint16 sc66_logic_list[] = { ID_SC66_DOOR, ID_SC66_HOLE, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; Compact sc66_stones = { @@ -493,6 +495,7 @@ Compact sc66_stones = { C_BASE_MODE, // mode SC66_STONES_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc66_rock1 = { @@ -524,6 +527,7 @@ Compact sc66_rock1 = { C_BASE_MODE, // mode SC66_ROCK1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc81_ken_talk1[] = { @@ -721,7 +725,7 @@ uint16 sc81_ken_talk1[] = { 259, 197, 16, - 0, + 0 }; Compact sc66_rock2 = { @@ -753,6 +757,7 @@ Compact sc66_rock2 = { C_BASE_MODE, // mode SC66_ROCK2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc66_hi_beam_an2[] = { @@ -769,7 +774,7 @@ uint16 sc66_hi_beam_an2[] = { 183, 208, 3, - 0, + 0 }; uint16 stuck_talk[] = { @@ -973,7 +978,7 @@ uint16 stuck_talk[] = { 361, 224, 3, - 0, + 0 }; uint16 sc66_chip_list[] = { @@ -989,7 +994,7 @@ uint16 sc66_chip_list[] = { IT_SC66_STONES+DISK_5, 106+DISK_5, 107+DISK_5, - 0, + 0 }; uint16 medi_talk_up[] = { @@ -1193,7 +1198,7 @@ uint16 medi_talk_up[] = { 1, 1, 2, - 0, + 0 }; uint16 sc82_ken_sat_tlk[] = { @@ -1397,7 +1402,7 @@ uint16 sc82_ken_sat_tlk[] = { 262, 209, 0, - 0, + 0 }; uint16 sc81_ken_talk2[] = { @@ -1535,7 +1540,7 @@ uint16 sc81_ken_talk2[] = { 221, 240, 0, - 0, + 0 }; uint16 android_babble[] = { @@ -1613,7 +1618,7 @@ uint16 android_babble[] = { 271, 204, 1, - 0, + 0 }; uint16 sc66_rock2_anim[] = { @@ -1645,7 +1650,7 @@ uint16 sc66_rock2_anim[] = { 154, 187, 5, - 0, + 0 }; uint16 sc82_jobs_talk[] = { @@ -1843,7 +1848,7 @@ uint16 sc82_jobs_talk[] = { 312, 200, 0, - 0, + 0 }; uint16 ken_talk_left[] = { @@ -2047,7 +2052,7 @@ uint16 ken_talk_left[] = { 1, 1, 8, - 0, + 0 }; uint16 sc75_freeze_tlk[] = { @@ -2125,7 +2130,7 @@ uint16 sc75_freeze_tlk[] = { 181, 240, 1, - 0, + 0 }; uint16 fost_pipe_talk[] = { @@ -2275,7 +2280,7 @@ uint16 fost_pipe_talk[] = { 311, 164, 4, - 0, + 0 }; uint16 ken_talk_up[] = { @@ -2479,13 +2484,13 @@ uint16 ken_talk_up[] = { 1, 1, 1, - 0, + 0 }; uint16 sc66_mouse_list[] = { ID_SC66_HOLE, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sc66_hi_beam = { @@ -2517,6 +2522,7 @@ Compact sc66_hi_beam = { C_BASE_MODE, // mode SC66_HI_BEAM_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 gall_talk_up[] = { @@ -2738,7 +2744,7 @@ uint16 gall_talk_up[] = { 1, 1, 5, - 0, + 0 }; uint16 walter_talk_up[] = { @@ -2876,7 +2882,7 @@ uint16 walter_talk_up[] = { 341, 214, 1, - 0, + 0 }; uint16 medi_talk_right[] = { @@ -3080,7 +3086,7 @@ uint16 medi_talk_right[] = { 1, 1, 15, - 0, + 0 }; uint16 sc66_rock3_anim[] = { @@ -3139,7 +3145,7 @@ uint16 sc66_rock3_anim[] = { 250, 251, 12, - 0, + 0 }; uint16 gall_talk_left[] = { @@ -3361,7 +3367,7 @@ uint16 gall_talk_left[] = { 1, 1, 3, - 0, + 0 }; uint16 medi_talk_down[] = { @@ -3565,7 +3571,7 @@ uint16 medi_talk_down[] = { 1, 1, 7, - 0, + 0 }; uint16 sc66_lo_beam_anm[] = { @@ -3576,7 +3582,7 @@ uint16 sc66_lo_beam_anm[] = { 203, 196, 1, - 0, + 0 }; uint16 sc81_dad_tlk[] = { @@ -3774,13 +3780,13 @@ uint16 sc81_dad_tlk[] = { 264, 212, 4, - 0, + 0 }; uint16 reset_66[] = { C_SCREEN, 66, - 65535, + 65535 }; uint16 sc66_fos_crushed[] = { @@ -3794,7 +3800,7 @@ uint16 sc66_fos_crushed[] = { 168, 189, 2, - 0, + 0 }; uint16 fost_conv_left[] = { @@ -3992,7 +3998,7 @@ uint16 fost_conv_left[] = { 290, 194, 3, - 0, + 0 }; uint32 *sec5_compacts = 0; @@ -4072,7 +4078,7 @@ uint16 sc81_fos_sat_tlk[] = { 264, 212, 1, - 0, + 0 }; uint16 walter_talk_dwn[] = { @@ -4210,7 +4216,7 @@ uint16 walter_talk_dwn[] = { 297, 214, 1, - 0, + 0 }; uint16 sc66_fos_walk_in[] = { @@ -4302,7 +4308,7 @@ uint16 sc66_fos_walk_in[] = { 177, 170, 26, - 0, + 0 }; uint16 medi_talk_left[] = { @@ -4506,7 +4512,7 @@ uint16 medi_talk_left[] = { 1, 1, 11, - 0, + 0 }; uint16 ken_talk_down[] = { @@ -4710,7 +4716,7 @@ uint16 ken_talk_down[] = { 1, 1, 5, - 0, + 0 }; uint16 sc81_dad_tlk2[] = { @@ -4908,7 +4914,7 @@ uint16 sc81_dad_tlk2[] = { 278, 256, 1, - 0, + 0 }; uint16 ken_talk_right[] = { @@ -5112,7 +5118,7 @@ uint16 ken_talk_right[] = { 1, 1, 12, - 0, + 0 }; uint16 walter_talk_lft[] = { @@ -5250,7 +5256,7 @@ uint16 walter_talk_lft[] = { 380, 214, 1, - 0, + 0 }; uint16 sc81_ken_sat_tlk[] = { @@ -5388,7 +5394,7 @@ uint16 sc81_ken_sat_tlk[] = { 264, 212, 0, - 0, + 0 }; uint16 sc82_jobs_talk2[] = { @@ -5586,7 +5592,7 @@ uint16 sc82_jobs_talk2[] = { 312, 200, 0, - 0, + 0 }; Compact sc66_hole = { @@ -5618,6 +5624,7 @@ Compact sc66_hole = { C_BASE_MODE, // mode SC66_TIMER_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc66_rock1_anim[] = { @@ -5643,13 +5650,13 @@ uint16 sc66_rock1_anim[] = { 177, 206, 6, - 0, + 0 }; uint16 sc66_fast_list[] = { 135+DISK_5, IT_SC66_LAYER_0+DISK_5, - 0, + 0 }; uint16 sc66_palette[] = { @@ -6036,7 +6043,7 @@ uint16 sc66_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact sc66_door = { @@ -6068,6 +6075,7 @@ Compact sc66_door = { C_BASE_MODE, // mode SC66_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; void *data_5[] = { @@ -6678,7 +6686,7 @@ void *data_5[] = { sc83_palette, sc83_draw_list, reset_foster_spec, - reset_dad_spec, + reset_dad_spec }; }; // namespace SkyCompact diff --git a/sky/compacts/67comp.h b/sky/compacts/67comp.h index 82bab0ba3e..c9fcb11bf5 100644 --- a/sky/compacts/67comp.h +++ b/sky/compacts/67comp.h @@ -43,7 +43,7 @@ uint16 sc67_logic_list[] = { ID_SC67_CROWBAR, ID_SC67_MEND, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; Compact sc67_vein = { @@ -65,6 +65,17 @@ Compact sc67_vein = { 361-351, // mouseSize_x 234-204, // mouseSize_y SC67_VEIN_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc67_mouse_list[] = { @@ -78,7 +89,7 @@ uint16 sc67_mouse_list[] = { ID_SC67_DOOR, ID_SC67_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 sc67_rub_head[] = { @@ -134,7 +145,7 @@ uint16 sc67_rub_head[] = { 253, 173, 6, - 0, + 0 }; uint16 sc67_try_stick[] = { @@ -178,7 +189,7 @@ uint16 sc67_try_stick[] = { 1, 1, 0, - 0, + 0 }; uint16 sc67_plast_hit[] = { @@ -231,7 +242,7 @@ uint16 sc67_plast_hit[] = { 322, 220, 14, - 0, + 0 }; Compact sc67_door = { @@ -263,6 +274,7 @@ Compact sc67_door = { C_BASE_MODE, // mode SC67_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc67_mend = { @@ -294,6 +306,7 @@ Compact sc67_mend = { C_BASE_MODE, // mode SC67_MEND_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc67_mending[] = { @@ -337,7 +350,7 @@ uint16 sc67_mending[] = { 328, 243, 12, - 0, + 0 }; Compact sc67_plaster = { @@ -369,6 +382,7 @@ Compact sc67_plaster = { C_BASE_MODE, // mode SC67_PLASTER_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc67_door_open[] = { @@ -382,7 +396,7 @@ uint16 sc67_door_open[] = { 1, 1, 3, - 0, + 0 }; uint16 sc67_dustoff[] = { @@ -429,7 +443,7 @@ uint16 sc67_dustoff[] = { 241, 177, 12, - 0, + 0 }; Compact sc67_rock = { @@ -461,6 +475,7 @@ Compact sc67_rock = { C_BASE_MODE, // mode SC67_ROCK_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc67_crowbar = { @@ -492,6 +507,7 @@ Compact sc67_crowbar = { C_BASE_MODE, // mode SC67_CROWBAR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc67_puss_leak[] = { @@ -532,7 +548,7 @@ uint16 sc67_puss_leak[] = { 325, 247, 11, - 0, + 0 }; uint16 sc67_pulse3_anim[] = { @@ -588,7 +604,7 @@ uint16 sc67_pulse3_anim[] = { 346, 228, 2, - 0, + 0 }; uint16 sc67_plast_fall[] = { @@ -629,7 +645,7 @@ uint16 sc67_plast_fall[] = { 312, 275, 10, - 0, + 0 }; Compact sc67_pulse4 = { @@ -661,6 +677,7 @@ Compact sc67_pulse4 = { C_BASE_MODE, // mode SC67_PULSE4_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc67_brick_fall[] = { @@ -728,7 +745,7 @@ uint16 sc67_brick_fall[] = { 289, 272, 14, - 0, + 0 }; uint16 sc67_bar_fall[] = { @@ -757,7 +774,7 @@ uint16 sc67_bar_fall[] = { 331, 272, 7, - 0, + 0 }; uint16 sc67_brick_hit[] = { @@ -810,7 +827,7 @@ uint16 sc67_brick_hit[] = { 322, 220, 0, - 0, + 0 }; uint16 sc67_pick_plast[] = { @@ -845,7 +862,7 @@ uint16 sc67_pick_plast[] = { 316, 224, 5, - 0, + 0 }; uint16 sc67_crawl[] = { @@ -901,7 +918,7 @@ uint16 sc67_crawl[] = { 202, 243, 15, - 0, + 0 }; uint16 sc67_medifix[] = { @@ -915,7 +932,7 @@ uint16 sc67_medifix[] = { 1, 1, 2, - 0, + 0 }; uint16 sc67_pulse1_anim[] = { @@ -971,7 +988,7 @@ uint16 sc67_pulse1_anim[] = { 352, 205, 0, - 0, + 0 }; uint16 sc67_pulse2_anim[] = { @@ -1027,7 +1044,7 @@ uint16 sc67_pulse2_anim[] = { 354, 218, 1, - 0, + 0 }; uint16 sc67_stick_in[] = { @@ -1080,7 +1097,7 @@ uint16 sc67_stick_in[] = { 322, 220, 14, - 0, + 0 }; Compact sc67_pulse1 = { @@ -1112,6 +1129,7 @@ Compact sc67_pulse1 = { C_BASE_MODE, // mode SC67_PULSE1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc67_rpocket[] = { @@ -1134,7 +1152,7 @@ uint16 sc67_rpocket[] = { 1, 1, 0, - 0, + 0 }; Compact sc67_brickwork = { @@ -1156,6 +1174,17 @@ Compact sc67_brickwork = { 18, // mouseSize_x 10, // mouseSize_y SC67_BRICKWORK_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc67_getbrick[] = { @@ -1214,7 +1243,7 @@ uint16 sc67_getbrick[] = { 312, 208, 8, - 0, + 0 }; uint16 sc67_lpocket[] = { @@ -1237,7 +1266,7 @@ uint16 sc67_lpocket[] = { 1, 1, 0, - 0, + 0 }; uint16 sc67_pull_out[] = { @@ -1290,7 +1319,7 @@ uint16 sc67_pull_out[] = { 322, 220, 14, - 0, + 0 }; uint16 sc67_palette[] = { @@ -1677,7 +1706,7 @@ uint16 sc67_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint32 *grid67 = 0; @@ -1689,7 +1718,7 @@ uint16 sc67_fast_list[] = { 53+DISK_5, 54+DISK_5, 268+DISK_5, - 0, + 0 }; uint16 sc67_door_close[] = { @@ -1706,7 +1735,7 @@ uint16 sc67_door_close[] = { 1, 1, 0, - 0, + 0 }; uint16 sc67_rock_anim[] = { @@ -1729,7 +1758,7 @@ uint16 sc67_rock_anim[] = { 151, 259, 5, - 0, + 0 }; Compact sc67_pulse2 = { @@ -1761,6 +1790,7 @@ Compact sc67_pulse2 = { C_BASE_MODE, // mode SC67_PULSE2_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc67_brick = { @@ -1792,6 +1822,7 @@ Compact sc67_brick = { C_BASE_MODE, // mode SC67_BRICK_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc67_floor_table[] = { @@ -1815,7 +1846,7 @@ uint16 sc67_floor_table[] = { SC67_DOOR_WALK_ON, ID_JOEY_PARK, GT_JOEY_PARK, - 65535, + 65535 }; uint16 sc67_pick_brick[] = { @@ -1850,7 +1881,7 @@ uint16 sc67_pick_brick[] = { 269, 224, 5, - 0, + 0 }; uint16 reset_66_67[] = { @@ -1858,7 +1889,7 @@ uint16 reset_66_67[] = { 67, C_PLACE, ID_SC67_FLOOR, - 65535, + 65535 }; Compact sc67_pulse3 = { @@ -1890,6 +1921,7 @@ Compact sc67_pulse3 = { C_BASE_MODE, // mode SC67_PULSE3_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc67_floor = { @@ -1911,6 +1943,17 @@ Compact sc67_floor = { 390-190, // mouseSize_x 305-270, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc67_pulse4_anim[] = { @@ -1966,7 +2009,7 @@ uint16 sc67_pulse4_anim[] = { 334, 242, 0, - 0, + 0 }; uint16 sc67_chip_list[] = { @@ -1999,7 +2042,7 @@ uint16 sc67_chip_list[] = { IT_SC67_BRICK_HIT+0X8000+DISK_5, IT_SC67_PLAST_HIT+0X8000+DISK_5, 106+DISK_5, - 0, + 0 }; uint16 reset_68_67[] = { @@ -2011,7 +2054,7 @@ uint16 reset_68_67[] = { 408, C_YCOOD, 288, - 65535, + 65535 }; Compact sc67_clot = { @@ -2043,6 +2086,7 @@ Compact sc67_clot = { C_BASE_MODE, // mode SC67_CLOT_LOGIC, // baseSub 0, // baseSub_off + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/68comp.h b/sky/compacts/68comp.h index 549e7dded3..3355c7dec3 100644 --- a/sky/compacts/68comp.h +++ b/sky/compacts/68comp.h @@ -56,6 +56,7 @@ Compact sc68_pulse5 = { C_BASE_MODE, // mode SC68_PULSE5_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc68_chip_list[] = { @@ -74,7 +75,7 @@ uint16 sc68_chip_list[] = { IT_SC68_DESCEND+DISK_5, IT_SC68_ASCEND+DISK_5, IT_SC68_DOOR+DISK_5, - 0, + 0 }; uint16 reset_69_68[] = { @@ -86,7 +87,7 @@ uint16 reset_69_68[] = { OFF_RIGHT, C_YCOOD, 288, - 65535, + 65535 }; Compact sc68_pulse1 = { @@ -118,6 +119,7 @@ Compact sc68_pulse1 = { C_BASE_MODE, // mode SC68_PULSE1_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc68_door = { @@ -149,6 +151,7 @@ Compact sc68_door = { C_BASE_MODE, // mode SC68_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc68_exit = { @@ -170,6 +173,17 @@ Compact sc68_exit = { 27, // mouseSize_x 107, // mouseSize_y SC68_EXIT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc68_logic_list[] = { @@ -191,7 +205,7 @@ uint16 sc68_logic_list[] = { ID_SC70_IRIS, ID_SC72_SPILL, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc68_palette[] = { @@ -578,7 +592,7 @@ uint16 sc68_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact sc68_pulse3 = { @@ -610,6 +624,7 @@ Compact sc68_pulse3 = { C_BASE_MODE, // mode SC68_PULSE3_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc68_pulse5_anim[] = { @@ -665,7 +680,7 @@ uint16 sc68_pulse5_anim[] = { 280, 190, 0, - 0, + 0 }; uint16 sc68_ascend[] = { @@ -700,7 +715,7 @@ uint16 sc68_ascend[] = { 261, 218, 9, - 0, + 0 }; uint16 sc68_pulse3_anim[] = { @@ -756,7 +771,7 @@ uint16 sc68_pulse3_anim[] = { 387, 186, 1, - 0, + 0 }; uint16 sc68_pulse2_anim[] = { @@ -812,7 +827,7 @@ uint16 sc68_pulse2_anim[] = { 396, 228, 1, - 0, + 0 }; Compact sc68_pulse4 = { @@ -844,6 +859,7 @@ Compact sc68_pulse4 = { C_BASE_MODE, // mode SC68_PULSE4_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc68_pulse6_anim[] = { @@ -899,7 +915,7 @@ uint16 sc68_pulse6_anim[] = { 245, 197, 0, - 0, + 0 }; Compact sc68_sensor = { @@ -931,6 +947,7 @@ Compact sc68_sensor = { C_BASE_MODE, // mode SC68_SENSOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint32 *grid68 = 0; @@ -988,7 +1005,7 @@ uint16 sc68_pulse1_anim[] = { 425, 191, 0, - 0, + 0 }; uint16 sc68_pulse4_anim[] = { @@ -1044,7 +1061,7 @@ uint16 sc68_pulse4_anim[] = { 339, 191, 2, - 0, + 0 }; Compact sc68_pulse2 = { @@ -1076,6 +1093,7 @@ Compact sc68_pulse2 = { C_BASE_MODE, // mode SC68_PULSE2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc68_descend[] = { @@ -1110,7 +1128,7 @@ uint16 sc68_descend[] = { 256, 220, 9, - 0, + 0 }; uint16 reset_70_68[] = { @@ -1126,7 +1144,7 @@ uint16 reset_70_68[] = { 154*64, C_DIR, DOWN, - 65535, + 65535 }; uint16 sc68_sensor_anim[] = { @@ -1161,7 +1179,7 @@ uint16 sc68_sensor_anim[] = { 171, 253, 2, - 0, + 0 }; uint16 sc68_door_close[] = { @@ -1178,7 +1196,7 @@ uint16 sc68_door_close[] = { 1, 1, 0, - 0, + 0 }; uint16 sc68_floor_table[] = { @@ -1202,7 +1220,7 @@ uint16 sc68_floor_table[] = { GT_JOEY_PARK, 3, GT_SC68_JOEY_WAIT, - 65535, + 65535 }; Compact sc68_pulse6 = { @@ -1234,6 +1252,7 @@ Compact sc68_pulse6 = { C_BASE_MODE, // mode SC68_PULSE6_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc68_grill = { @@ -1255,6 +1274,17 @@ Compact sc68_grill = { 24, // mouseSize_x 15, // mouseSize_y SC68_GRILL_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc68_stairs = { @@ -1276,6 +1306,17 @@ Compact sc68_stairs = { 30, // mouseSize_x 60, // mouseSize_y SC68_STAIRS_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc68_fast_list[] = { @@ -1285,7 +1326,7 @@ uint16 sc68_fast_list[] = { 53+DISK_5, 54+DISK_5, 268+DISK_5, - 0, + 0 }; uint16 reset_67_68[] = { @@ -1297,7 +1338,7 @@ uint16 reset_67_68[] = { 160, C_YCOOD, 280, - 65535, + 65535 }; uint16 sc68_mouse_list[] = { @@ -1309,7 +1350,7 @@ uint16 sc68_mouse_list[] = { ID_SC68_EXIT, ID_SC68_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sc68_floor = { @@ -1331,6 +1372,17 @@ Compact sc68_floor = { 447-202, // mouseSize_x 327-265, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc68_joey_list[] = { @@ -1354,7 +1406,7 @@ uint16 sc68_joey_list[] = { 272, 279, 0, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/69comp.h b/sky/compacts/69comp.h index d562954fd2..3f515b37b1 100644 --- a/sky/compacts/69comp.h +++ b/sky/compacts/69comp.h @@ -47,7 +47,7 @@ uint16 sc69_logic_list[] = { ID_SC71_RECHARGER, ID_SC71_PANEL2, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc69_pulse5_anim[] = { @@ -103,7 +103,7 @@ uint16 sc69_pulse5_anim[] = { 212, 181, 0, - 0, + 0 }; uint16 sc69_chip_list[] = { @@ -120,7 +120,7 @@ uint16 sc69_chip_list[] = { IT_SC69_PULSE4+DISK_5, IT_SC69_PULSE5+DISK_5, IT_SC69_PULSE6+DISK_5, - 0, + 0 }; uint16 sc69_palette[] = { @@ -507,7 +507,7 @@ uint16 sc69_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 reset_71_69[] = { @@ -519,7 +519,7 @@ uint16 reset_71_69[] = { 264, C_YCOOD, 272, - 65535, + 65535 }; uint16 sc69_mouse_list[] = { @@ -529,7 +529,7 @@ uint16 sc69_mouse_list[] = { ID_SC69_DOOR, ID_SC69_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sc69_pulse2 = { @@ -561,6 +561,7 @@ Compact sc69_pulse2 = { C_BASE_MODE, // mode SC69_PULSE2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc69_floor_table[] = { @@ -578,7 +579,7 @@ uint16 sc69_floor_table[] = { GT_SC69_GRILL, ID_JOEY_PARK, GT_JOEY_PARK, - 65535, + 65535 }; Compact sc69_pulse6 = { @@ -610,6 +611,7 @@ Compact sc69_pulse6 = { C_BASE_MODE, // mode SC69_PULSE6_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc69_joey_list[] = { @@ -628,7 +630,7 @@ uint16 sc69_joey_list[] = { 288, 295, 0, - 0, + 0 }; Compact sc69_exit = { @@ -650,6 +652,17 @@ Compact sc69_exit = { 27, // mouseSize_x 107, // mouseSize_y SC69_EXIT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc69_fast_list[] = { @@ -659,7 +672,7 @@ uint16 sc69_fast_list[] = { 53+DISK_5, 54+DISK_5, 268+DISK_5, - 0, + 0 }; Compact sc69_door = { @@ -681,6 +694,17 @@ Compact sc69_door = { 32, // mouseSize_x 61, // mouseSize_y SC69_DOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc69_pulse3 = { @@ -712,6 +736,7 @@ Compact sc69_pulse3 = { C_BASE_MODE, // mode SC69_PULSE3_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc69_pulse5 = { @@ -743,6 +768,7 @@ Compact sc69_pulse5 = { C_BASE_MODE, // mode SC69_PULSE5_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc69_pulse6_anim[] = { @@ -798,7 +824,7 @@ uint16 sc69_pulse6_anim[] = { 135, 190, 0, - 0, + 0 }; Compact sc69_pulse4 = { @@ -830,6 +856,7 @@ Compact sc69_pulse4 = { C_BASE_MODE, // mode SC69_PULSE4_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc69_pulse1 = { @@ -861,6 +888,7 @@ Compact sc69_pulse1 = { C_BASE_MODE, // mode SC69_PULSE1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc69_pulse4_anim[] = { @@ -916,7 +944,7 @@ uint16 sc69_pulse4_anim[] = { 255, 189, 2, - 0, + 0 }; Compact sc69_grill = { @@ -938,6 +966,17 @@ Compact sc69_grill = { 331-306, // mouseSize_x 251-232, // mouseSize_y SC69_GRILL_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc69_pulse1_anim[] = { @@ -993,7 +1032,7 @@ uint16 sc69_pulse1_anim[] = { 370, 210, 0, - 0, + 0 }; uint16 sc69_pulse3_anim[] = { @@ -1049,7 +1088,7 @@ uint16 sc69_pulse3_anim[] = { 298, 199, 1, - 0, + 0 }; uint16 reset_68_69[] = { @@ -1061,7 +1100,7 @@ uint16 reset_68_69[] = { OFF_LEFT, C_YCOOD, 280, - 65535, + 65535 }; uint16 sc69_pulse2_anim[] = { @@ -1117,7 +1156,7 @@ uint16 sc69_pulse2_anim[] = { 315, 185, 1, - 0, + 0 }; Compact sc69_floor = { @@ -1139,6 +1178,17 @@ Compact sc69_floor = { 431-128, // mouseSize_x 327-268, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/70comp.h b/sky/compacts/70comp.h index 809bdcce78..2aab037926 100644 --- a/sky/compacts/70comp.h +++ b/sky/compacts/70comp.h @@ -56,6 +56,7 @@ Compact sc70_bar = { C_BASE_MODE, // mode SC70_BAR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc70_pull_bar[] = { @@ -102,7 +103,7 @@ uint16 sc70_pull_bar[] = { 288, 180, 12, - 0, + 0 }; uint16 sc70_step_down[] = { @@ -197,7 +198,7 @@ uint16 sc70_step_down[] = { 378, 226, 0, - 0, + 0 }; uint16 sc70_palette[] = { @@ -584,7 +585,7 @@ uint16 sc70_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc70_floor_table[] = { @@ -602,7 +603,7 @@ uint16 sc70_floor_table[] = { GT_SC70_PIT, ID_SC70_GRILL, GT_SC70_PIT, - 65535, + 65535 }; uint16 sc70_enter_anim[] = { @@ -664,7 +665,7 @@ uint16 sc70_enter_anim[] = { 194, 194, 14, - 0, + 0 }; uint16 sc70_step_up[] = { @@ -762,7 +763,7 @@ uint16 sc70_step_up[] = { 324, 194, 0, - 0, + 0 }; Compact sc70_floor = { @@ -784,6 +785,17 @@ Compact sc70_floor = { 447-140, // mouseSize_x 327-230, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 reset_68_70[] = { @@ -797,7 +809,7 @@ uint16 reset_68_70[] = { 240, C_DIR, RIGHT, - 65535, + 65535 }; uint16 sc70_exit_anim[] = { @@ -859,7 +871,7 @@ uint16 sc70_exit_anim[] = { 161, 175, 18, - 0, + 0 }; uint32 *grid70 = 0; @@ -871,7 +883,7 @@ uint16 sc70_fast_list[] = { 53+DISK_5, 54+DISK_5, 268+DISK_5, - 0, + 0 }; uint16 sc70_logic_list[] = { @@ -885,7 +897,7 @@ uint16 sc70_logic_list[] = { ID_SC70_GRILL, ID_FOSTER, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; ExtCompact sc70_iris_ext = { @@ -902,6 +914,22 @@ ExtCompact sc70_iris_ext = { 0, // atWatch 0, // atWas 0, // alt + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc70_iris = { @@ -933,7 +961,7 @@ Compact sc70_iris = { C_BASE_MODE, // mode SC70_IRIS_LOGIC, // baseSub 0, // baseSub_off - &sc70_iris_ext, + &sc70_iris_ext }; uint16 sc70_pit_table[] = { @@ -951,7 +979,7 @@ uint16 sc70_pit_table[] = { GT_SC70_BAR, ID_SC70_GRILL, GT_SC70_GRILL, - 65535, + 65535 }; Compact sc70_door = { @@ -973,6 +1001,17 @@ Compact sc70_door = { 191-178, // mouseSize_x 242-184, // mouseSize_y SC70_DOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc70_pit = { @@ -1004,6 +1043,7 @@ Compact sc70_pit = { C_BASE_MODE, // mode SC70_PIT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc70_chip_list[] = { @@ -1021,7 +1061,7 @@ uint16 sc70_chip_list[] = { IT_SC70_STEP_DOWN+DISK_5, IT_SC70_PULL_BAR+DISK_5, IT_SC70_ENTER_ANIM+DISK_5, - 0, + 0 }; uint16 sc70_bar_anim[] = { @@ -1038,7 +1078,7 @@ uint16 sc70_bar_anim[] = { 290, 170, 3, - 0, + 0 }; Compact sc70_control = { @@ -1070,6 +1110,7 @@ Compact sc70_control = { C_BASE_MODE, // mode SC70_CONTROL_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc70_pit_anim[] = { @@ -1119,7 +1160,7 @@ uint16 sc70_pit_anim[] = { 239, 233, 6, - 0, + 0 }; Compact sc70_grill = { @@ -1141,6 +1182,17 @@ Compact sc70_grill = { 294-266, // mouseSize_x 173-168, // mouseSize_y SC70_GRILL_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc70_consol_anim[] = { @@ -1193,7 +1245,7 @@ uint16 sc70_consol_anim[] = { 365, 215, 15, - 0, + 0 }; uint16 sc70_mouse_list[] = { @@ -1205,7 +1257,7 @@ uint16 sc70_mouse_list[] = { ID_SC70_DOOR, ID_SC70_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; }; // namespace SkyCompact diff --git a/sky/compacts/71comp.h b/sky/compacts/71comp.h index 3fb4ebf04a..667bfe9128 100644 --- a/sky/compacts/71comp.h +++ b/sky/compacts/71comp.h @@ -31,7 +31,7 @@ uint16 medi_d_to_u[] = { 35+32*64, 24+32*64, 34+32*64, - 0, + 0 }; uint16 sc71_use_board[] = { @@ -96,7 +96,7 @@ uint16 sc71_use_board[] = { 243, 191, 0, - 0, + 0 }; Compact sc71_door72 = { @@ -118,6 +118,17 @@ Compact sc71_door72 = { 208-194, // mouseSize_x 280-219, // mouseSize_y SC71_DOOR72_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc71_medi_charge[] = { @@ -152,7 +163,7 @@ uint16 sc71_medi_charge[] = { 279, 196, 9, - 0, + 0 }; uint8 medi_auto[64]; @@ -190,7 +201,7 @@ uint16 medi_up[] = { 7+32*64, 0, 65535, - 0, + 0 }; uint16 medi_down[] = { @@ -226,7 +237,7 @@ uint16 medi_down[] = { 15+32*64, 0, 1, - 0, + 0 }; uint16 medi_left[] = { @@ -262,7 +273,7 @@ uint16 medi_left[] = { 23+32*64, 65534, 0, - 0, + 0 }; uint16 medi_right[] = { @@ -298,7 +309,7 @@ uint16 medi_right[] = { 31+32*64, 2, 0, - 0, + 0 }; uint16 medi_st_up[] = { @@ -306,7 +317,7 @@ uint16 medi_st_up[] = { 1, 1, 0, - 0, + 0 }; uint16 medi_st_down[] = { @@ -314,7 +325,7 @@ uint16 medi_st_down[] = { 1, 1, 8, - 0, + 0 }; uint16 medi_st_left[] = { @@ -322,7 +333,7 @@ uint16 medi_st_left[] = { 1, 1, 16, - 0, + 0 }; uint16 medi_st_right[] = { @@ -330,68 +341,68 @@ uint16 medi_st_right[] = { 1, 1, 24, - 0, + 0 }; uint16 medi_u_to_d[] = { 33+32*64, 16+32*64, 32+32*64, - 0, + 0 }; uint16 medi_u_to_l[] = { 33+32*64, - 0, + 0 }; uint16 medi_u_to_r[] = { 34+32*64, - 0, + 0 }; uint16 medi_d_to_l[] = { 32+32*64, - 0, + 0 }; uint16 medi_d_to_r[] = { 35+32*64, - 0, + 0 }; uint16 medi_l_to_u[] = { 33+32*64, - 0, + 0 }; uint16 medi_l_to_d[] = { 32+32*64, - 0, + 0 }; uint16 medi_l_to_r[] = { 32+32*64, 8+32*64, 35+32*64, - 0, + 0 }; uint16 medi_r_to_u[] = { 34+32*64, - 0, + 0 }; uint16 medi_r_to_d[] = { 35+32*64, - 0, + 0 }; uint16 medi_r_to_l[] = { 34+32*64, 0+32*64, 33+32*64, - 0, + 0 }; TurnTable medi_turnTable0 = { @@ -429,7 +440,7 @@ TurnTable medi_turnTable0 = { 0, 0, 0 - }, + } }; MegaSet medi_megaSet0 = { @@ -446,7 +457,7 @@ MegaSet medi_megaSet0 = { medi_st_left, // standLeft medi_st_right, // standRight 0, // standTalk - &medi_turnTable0, + &medi_turnTable0 }; ExtCompact medi_ext = { @@ -476,6 +487,9 @@ ExtCompact medi_ext = { medi_auto, // animScratch 0, // megaSet &medi_megaSet0, + 0, + 0, + 0 }; Compact medi = { @@ -507,7 +521,7 @@ Compact medi = { C_BASE_MODE, // mode MEDI_LOGIC, // baseSub 0, // baseSub_off - &medi_ext, + &medi_ext }; uint16 sc71_mouse_list[] = { @@ -522,7 +536,7 @@ uint16 sc71_mouse_list[] = { ID_SC71_FLOOR, ID_SC71_FAKE_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 sc71_light1_anim[] = { @@ -557,7 +571,7 @@ uint16 sc71_light1_anim[] = { 249, 197, 5, - 0, + 0 }; uint16 sc71_logic_list[] = { @@ -574,7 +588,7 @@ uint16 sc71_logic_list[] = { ID_SC71_PANEL2, ID_SC72_SPILL, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 reset_69_71[] = { @@ -586,7 +600,7 @@ uint16 reset_69_71[] = { 152, C_YCOOD, 288, - 65535, + 65535 }; uint16 sc71_chip_list[] = { @@ -605,7 +619,7 @@ uint16 sc71_chip_list[] = { IT_SC71_SCREEN+DISK_5, IT_SC71_MEDI_CHARGE+DISK_5, IT_SC71_USE_BOARD+DISK_5, - 0, + 0 }; uint16 sc710_chip_list[] = { @@ -623,7 +637,7 @@ uint16 sc710_chip_list[] = { IT_SC71_CHARGE_LIGHT+DISK_5, IT_SC71_SCREEN+DISK_5, IT_SC71_MEDI_CHARGE+DISK_5, - 0, + 0 }; uint16 reset_72_71[] = { @@ -635,7 +649,7 @@ uint16 reset_72_71[] = { 176, C_YCOOD, 264, - 65535, + 65535 }; uint16 sc71_medi_get_up[] = { @@ -667,7 +681,7 @@ uint16 sc71_medi_get_up[] = { 1, 1, 0, - 0, + 0 }; Compact sc71_chlite = { @@ -699,6 +713,7 @@ Compact sc71_chlite = { C_BASE_MODE, // mode SC71_CHLITE_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc71_controls = { @@ -730,6 +745,7 @@ Compact sc71_controls = { C_BASE_MODE, // mode SC71_CONTROLS_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc71_panel_anim[] = { @@ -770,7 +786,7 @@ uint16 sc71_panel_anim[] = { 272, 226, 11, - 0, + 0 }; Compact sc71_panel2 = { @@ -802,6 +818,7 @@ Compact sc71_panel2 = { C_BASE_MODE, // mode SC71_PANEL2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc71_panel2_anim[] = { @@ -842,7 +859,7 @@ uint16 sc71_panel2_anim[] = { 287, 226, 11, - 0, + 0 }; uint16 sc71_joey_list[] = { @@ -866,7 +883,7 @@ uint16 sc71_joey_list[] = { 304, 311, 0, - 0, + 0 }; Compact sc71_light1 = { @@ -898,6 +915,7 @@ Compact sc71_light1 = { C_BASE_MODE, // mode SC71_LIGHT1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc71_palette[] = { @@ -1284,7 +1302,7 @@ uint16 sc71_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc71_fast_list[] = { @@ -1294,7 +1312,7 @@ uint16 sc71_fast_list[] = { 53+DISK_5, 54+DISK_5, 268+DISK_5, - 0, + 0 }; uint16 sc71_mon_anim[] = { @@ -1317,7 +1335,7 @@ uint16 sc71_mon_anim[] = { 372, 248, 5, - 0, + 0 }; uint16 sc71_floor_table[] = { @@ -1347,7 +1365,7 @@ uint16 sc71_floor_table[] = { GT_SC71_MEDI_SLOT, ID_JOEY_PARK, GT_JOEY_PARK, - 65535, + 65535 }; Compact sc71_floor = { @@ -1369,6 +1387,17 @@ Compact sc71_floor = { 395-194, // mouseSize_x 327-256, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc71_door69 = { @@ -1390,6 +1419,17 @@ Compact sc71_door69 = { 178-163, // mouseSize_x 296-230, // mouseSize_y SC71_DOOR69_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *grid71 = 0; @@ -1413,6 +1453,17 @@ Compact sc71_fake_floor = { 447-128, // mouseSize_x 327-136, // mouseSize_y 0, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc71_medi_slot = { @@ -1434,6 +1485,17 @@ Compact sc71_medi_slot = { 280-275, // mouseSize_x 247-242, // mouseSize_y SC71_MEDI_SLOT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc71_monitor = { @@ -1465,6 +1527,7 @@ Compact sc71_monitor = { C_BASE_MODE, // mode SC71_MONITOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc71_chlite_anim[] = { @@ -1505,7 +1568,7 @@ uint16 sc71_chlite_anim[] = { 268, 197, 5, - 0, + 0 }; Compact sc71_locked_door = { @@ -1527,6 +1590,17 @@ Compact sc71_locked_door = { 362-353, // mouseSize_x 280-222, // mouseSize_y SC71_LOCKED_DOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc71_recharger = { @@ -1558,6 +1632,7 @@ Compact sc71_recharger = { C_BASE_MODE, // mode SC71_RECHARGER_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc71_light2_anim[] = { @@ -1622,7 +1697,7 @@ uint16 sc71_light2_anim[] = { 372, 270, 19, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/72comp.h b/sky/compacts/72comp.h index f2ff31ef2f..6b4a056555 100644 --- a/sky/compacts/72comp.h +++ b/sky/compacts/72comp.h @@ -32,7 +32,7 @@ uint16 wit_st_right[] = { 1, 0, 38, - 0, + 0 }; uint16 sc72_comp_flash[] = { @@ -79,7 +79,7 @@ uint16 sc72_comp_flash[] = { 169, 225, 0, - 0, + 0 }; Compact sc72_rot_light = { @@ -111,6 +111,7 @@ Compact sc72_rot_light = { C_BASE_MODE, // mode SC72_ROT_LIGHT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc72_fast_list[] = { @@ -122,7 +123,7 @@ uint16 sc72_fast_list[] = { IT_SC72_TANK+DISK_7, IT_SC72_ROT_LIGHT+DISK_7, 268+DISK_7, - 0, + 0 }; uint16 sc72_spill_anim[] = { @@ -160,14 +161,14 @@ uint16 sc72_spill_anim[] = { 1, 1, 10, - 0, + 0 }; uint16 wit_d_to_u[] = { 39+159*64, 38+159*64, 37+159*64, - 0, + 0 }; Compact sc72_chamber2 = { @@ -199,13 +200,14 @@ Compact sc72_chamber2 = { C_BASE_MODE, // mode SC72_CHAMBER2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 wit_l_to_r[] = { 33+159*64, 32+159*64, 39+159*64, - 0, + 0 }; uint16 sc72_joey_tap[] = { @@ -237,7 +239,7 @@ uint16 sc72_joey_tap[] = { 248, 240, 2, - 0, + 0 }; uint16 sc72_comp2_flash[] = { @@ -284,7 +286,7 @@ uint16 sc72_comp2_flash[] = { 178, 222, 0, - 0, + 0 }; uint8 wit_auto[64]; @@ -318,11 +320,12 @@ Compact sc72_tank = { C_BASE_MODE, // mode SC72_TANK_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 wit_r_to_d[] = { 39+159*64, - 0, + 0 }; uint16 sc72_floor_table[] = { @@ -366,7 +369,7 @@ uint16 sc72_floor_table[] = { GT_SC72_COMPUTER, ID_JOEY_PARK, GT_JOEY_PARK, - 65535, + 65535 }; Compact sc72_floor = { @@ -388,6 +391,17 @@ Compact sc72_floor = { 374-140, // mouseSize_x 327-260, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc72_drip_anim[] = { @@ -419,14 +433,14 @@ uint16 sc72_drip_anim[] = { 1, 1, 19, - 0, + 0 }; uint16 wit_u_to_d[] = { 35+159*64, 34+159*64, 33+159*64, - 0, + 0 }; uint32 *wit = 0; @@ -460,6 +474,7 @@ Compact sc72_cham2_light = { C_BASE_MODE, // mode SC72_CHAM2_LIGHT_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc72_computer2 = { @@ -491,6 +506,7 @@ Compact sc72_computer2 = { C_BASE_MODE, // mode SC72_COMPUTER2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc72_walter_die[] = { @@ -525,14 +541,14 @@ uint16 sc72_walter_die[] = { 222, 278, 9, - 0, + 0 }; uint16 wit_r_to_l[] = { 37+159*64, 36+159*64, 35+159*64, - 0, + 0 }; uint16 wit_up[] = { @@ -568,7 +584,7 @@ uint16 wit_up[] = { 7+159*64, 0, 65534, - 0, + 0 }; uint16 sc72_rotating[] = { @@ -615,7 +631,7 @@ uint16 sc72_rotating[] = { 145, 283, 11, - 0, + 0 }; uint16 sc72_walter_kill[] = { @@ -752,7 +768,7 @@ uint16 sc72_walter_kill[] = { 337, 253, 33, - 0, + 0 }; Compact sc72_exit = { @@ -774,11 +790,22 @@ Compact sc72_exit = { 355-342, // mouseSize_x 282-180, // mouseSize_y SC72_EXIT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 wit_l_to_d[] = { 33+159*64, - 0, + 0 }; uint16 sc72_cham3_anim[] = { @@ -843,7 +870,7 @@ uint16 sc72_cham3_anim[] = { 344, 191, 19, - 0, + 0 }; uint16 sc72_chip_list[] = { @@ -871,7 +898,7 @@ uint16 sc72_chip_list[] = { IT_SC72_GRILL+DISK_7, IT_SC72_JOEY_TAP+DISK_7, IT_SC72_SPILL+DISK_7, - 0, + 0 }; uint16 sc72_foster_die[] = { @@ -1008,7 +1035,7 @@ uint16 sc72_foster_die[] = { 353, 249, 38, - 0, + 0 }; uint16 sc72_cham1_anim[] = { @@ -1073,7 +1100,7 @@ uint16 sc72_cham1_anim[] = { 221, 190, 19, - 0, + 0 }; uint16 sc72_cham2_anim[] = { @@ -1138,7 +1165,7 @@ uint16 sc72_cham2_anim[] = { 280, 190, 19, - 0, + 0 }; uint16 reset_71_72[] = { @@ -1150,7 +1177,7 @@ uint16 reset_71_72[] = { 400, C_YCOOD, 296, - 65535, + 65535 }; uint16 wit_st_left[] = { @@ -1158,7 +1185,7 @@ uint16 wit_st_left[] = { 1, 0, 34, - 0, + 0 }; Compact sc72_cham1_light = { @@ -1190,6 +1217,7 @@ Compact sc72_cham1_light = { C_BASE_MODE, // mode SC72_CHAM1_LIGHT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc72_palette[] = { @@ -1576,7 +1604,7 @@ uint16 sc72_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc72_joey_list[] = { @@ -1595,7 +1623,7 @@ uint16 sc72_joey_list[] = { 272, 295, 0, - 0, + 0 }; uint16 sc72_cham2_flash[] = { @@ -1636,7 +1664,7 @@ uint16 sc72_cham2_flash[] = { 293, 244, 0, - 0, + 0 }; uint16 wit_st_down[] = { @@ -1644,7 +1672,7 @@ uint16 wit_st_down[] = { 1, 0, 32, - 0, + 0 }; uint32 *grid72 = 0; @@ -1664,7 +1692,7 @@ uint16 sc72_mouse_list[] = { ID_SC72_FLOOR, ID_SC72_FAKE_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sc72_fake_floor = { @@ -1686,6 +1714,17 @@ Compact sc72_fake_floor = { 447-128, // mouseSize_x 327-136, // mouseSize_y 0, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 wit_st_up[] = { @@ -1693,7 +1732,7 @@ uint16 wit_st_up[] = { 1, 0, 36, - 0, + 0 }; Compact sc72_tap = { @@ -1715,12 +1754,23 @@ Compact sc72_tap = { 278-269, // mouseSize_x 278-269, // mouseSize_y SC72_TAP_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 wit_l_to_t[] = { 33+159*64, 32+159*64, - 0, + 0 }; uint16 wit_st_talk[] = { @@ -1728,12 +1778,12 @@ uint16 wit_st_talk[] = { 1, 0, 0, - 0, + 0 }; uint16 wit_d_to_l[] = { 33+159*64, - 0, + 0 }; Compact sc72_spill = { @@ -1765,6 +1815,7 @@ Compact sc72_spill = { C_BASE_MODE, // mode SC72_SPILL_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc72_computer = { @@ -1796,11 +1847,12 @@ Compact sc72_computer = { C_BASE_MODE, // mode SC72_COMPUTER_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 wit_l_to_u[] = { 35+159*64, - 0, + 0 }; Compact sc72_door = { @@ -1822,11 +1874,22 @@ Compact sc72_door = { 387-368, // mouseSize_x 306-227, // mouseSize_y SC72_DOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 wit_u_to_l[] = { 35+159*64, - 0, + 0 }; uint16 sc72_cham1_flash[] = { @@ -1867,12 +1930,12 @@ uint16 sc72_cham1_flash[] = { 232, 244, 1, - 0, + 0 }; uint16 wit_d_to_r[] = { 39+159*64, - 0, + 0 }; uint16 wit_left[] = { @@ -1908,7 +1971,7 @@ uint16 wit_left[] = { 23+159*64, 65532, 0, - 0, + 0 }; uint16 sc72_tank_anim[] = { @@ -1973,7 +2036,7 @@ uint16 sc72_tank_anim[] = { 278, 255, 19, - 0, + 0 }; uint16 wit_right[] = { @@ -2009,19 +2072,19 @@ uint16 wit_right[] = { 31+159*64, 4, 0, - 0, + 0 }; uint16 wit_t_to_u[] = { 38+159*64, 37+159*64, - 0, + 0 }; uint16 wit_u_to_t[] = { 37+159*64, 38+159*64, - 0, + 0 }; Compact sc72_chamber3 = { @@ -2053,6 +2116,7 @@ Compact sc72_chamber3 = { C_BASE_MODE, // mode SC72_CHAMBER3_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 wit_down[] = { @@ -2088,23 +2152,23 @@ uint16 wit_down[] = { 15+159*64, 0, 2, - 0, + 0 }; uint16 wit_u_to_r[] = { 37+159*64, - 0, + 0 }; uint16 wit_r_to_u[] = { 37+159*64, - 0, + 0 }; uint16 wit_t_to_l[] = { 32+159*64, 33+159*64, - 0, + 0 }; TurnTable witness_turnTable0 = { @@ -2142,7 +2206,7 @@ TurnTable witness_turnTable0 = { wit_t_to_l, 0, 0 - }, + } }; MegaSet witness_megaSet0 = { @@ -2159,7 +2223,7 @@ MegaSet witness_megaSet0 = { wit_st_left, // standLeft wit_st_right, // standRight wit_st_talk, // standTalk - &witness_turnTable0, + &witness_turnTable0 }; ExtCompact witness_ext = { @@ -2189,6 +2253,9 @@ ExtCompact witness_ext = { wit_auto, // animScratch 0, // megaSet &witness_megaSet0, + 0, + 0, + 0 }; Compact witness = { @@ -2220,7 +2287,7 @@ Compact witness = { C_BASE_MODE, // mode WITNESS_LOGIC, // baseSub 0, // baseSub_off - &witness_ext, + &witness_ext }; uint16 sc72_logic_list[] = { @@ -2243,7 +2310,7 @@ uint16 sc72_logic_list[] = { ID_SC72_GRILL, ID_SC75_TONGS, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 reset_73_72[] = { @@ -2255,7 +2322,7 @@ uint16 reset_73_72[] = { 368, C_YCOOD, 272, - 65535, + 65535 }; uint16 sc720_chip_list[] = { @@ -2280,7 +2347,7 @@ uint16 sc720_chip_list[] = { IT_SC72_GRILL+DISK_7, IT_SC72_JOEY_TAP+DISK_7, IT_SC72_SPILL+DISK_7, - 0, + 0 }; Compact sc72_grill = { @@ -2312,6 +2379,7 @@ Compact sc72_grill = { C_BASE_MODE, // mode SC72_GRILL_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc72_chamber1 = { @@ -2343,6 +2411,7 @@ Compact sc72_chamber1 = { C_BASE_MODE, // mode SC72_CHAMBER1_LOGIC, // baseSub 0, // baseSub_off + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/73comp.h b/sky/compacts/73comp.h index 08fd4a3d11..e9b615b8e7 100644 --- a/sky/compacts/73comp.h +++ b/sky/compacts/73comp.h @@ -29,7 +29,7 @@ namespace SkyCompact { uint16 gal_u_to_l[] = { 35+90*64, - 0, + 0 }; Compact sc73_exit = { @@ -51,6 +51,17 @@ Compact sc73_exit = { 205-185, // mouseSize_x 283-162, // mouseSize_y SC73_EXIT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc73_cham5_flash[] = { @@ -97,7 +108,7 @@ uint16 sc73_cham5_flash[] = { 291, 242, 1, - 0, + 0 }; uint16 sc73_cham5_anim[] = { @@ -162,7 +173,7 @@ uint16 sc73_cham5_anim[] = { 279, 190, 19, - 0, + 0 }; uint8 gal_auto[64]; @@ -200,7 +211,7 @@ uint16 gal_up[] = { 7+90*64, 0, 65534, - 0, + 0 }; uint16 gal_down[] = { @@ -236,7 +247,7 @@ uint16 gal_down[] = { 15+90*64, 0, 2, - 0, + 0 }; uint16 gal_left[] = { @@ -272,7 +283,7 @@ uint16 gal_left[] = { 23+90*64, 65532, 0, - 0, + 0 }; uint16 gal_right[] = { @@ -308,7 +319,7 @@ uint16 gal_right[] = { 31+90*64, 4, 0, - 0, + 0 }; uint16 gal_st_up[] = { @@ -316,7 +327,7 @@ uint16 gal_st_up[] = { 1, 0, 36, - 0, + 0 }; uint16 gal_st_down[] = { @@ -324,7 +335,7 @@ uint16 gal_st_down[] = { 1, 0, 32, - 0, + 0 }; uint16 gal_st_left[] = { @@ -332,7 +343,7 @@ uint16 gal_st_left[] = { 1, 0, 34, - 0, + 0 }; uint16 gal_st_right[] = { @@ -340,70 +351,70 @@ uint16 gal_st_right[] = { 1, 0, 38, - 0, + 0 }; uint16 gal_u_to_d[] = { 35+90*64, 34+90*64, 33+90*64, - 0, + 0 }; uint16 gal_u_to_r[] = { 37+90*64, - 0, + 0 }; uint16 gal_d_to_u[] = { 39+90*64, 38+90*64, 37+90*64, - 0, + 0 }; uint16 gal_d_to_l[] = { 33+90*64, - 0, + 0 }; uint16 gal_d_to_r[] = { 39+90*64, - 0, + 0 }; uint16 gal_l_to_u[] = { 35+90*64, - 0, + 0 }; uint16 gal_l_to_d[] = { 33+90*64, - 0, + 0 }; uint16 gal_l_to_r[] = { 33+90*64, 32+90*64, 39+90*64, - 0, + 0 }; uint16 gal_r_to_u[] = { 37+90*64, - 0, + 0 }; uint16 gal_r_to_d[] = { 39+90*64, - 0, + 0 }; uint16 gal_r_to_l[] = { 37+90*64, 36+90*64, 35+90*64, - 0, + 0 }; TurnTable gallagher_turnTable0 = { @@ -441,7 +452,7 @@ TurnTable gallagher_turnTable0 = { 0, 0, 0 - }, + } }; MegaSet gallagher_megaSet0 = { @@ -458,7 +469,7 @@ MegaSet gallagher_megaSet0 = { gal_st_left, // standLeft gal_st_right, // standRight 0, // standTalk - &gallagher_turnTable0, + &gallagher_turnTable0 }; ExtCompact gallagher_ext = { @@ -488,6 +499,9 @@ ExtCompact gallagher_ext = { gal_auto, // animScratch 0, // megaSet &gallagher_megaSet0, + 0, + 0, + 0 }; Compact gallagher = { @@ -519,7 +533,7 @@ Compact gallagher = { C_BASE_MODE, // mode GALLAGHER_LOGIC73, // baseSub 0, // baseSub_off - &gallagher_ext, + &gallagher_ext }; uint16 sc73_joey_fight1[] = { @@ -614,7 +628,7 @@ uint16 sc73_joey_fight1[] = { 271, 255, 22, - 0, + 0 }; uint16 sc73_gall_fight2[] = { @@ -736,7 +750,7 @@ uint16 sc73_gall_fight2[] = { 294, 266, 33, - 0, + 0 }; uint16 reset_72_73[] = { @@ -748,7 +762,7 @@ uint16 reset_72_73[] = { 168, C_YCOOD, 264, - 65535, + 65535 }; uint16 sc73_joey_fight2[] = { @@ -870,7 +884,7 @@ uint16 sc73_joey_fight2[] = { 268, 255, 8, - 0, + 0 }; uint16 sc73_floor_table[] = { @@ -908,7 +922,7 @@ uint16 sc73_floor_table[] = { GT_SC73_WRECKED_DROID, ID_GALLAGHER, GT_SC73_CORPSE, - 65535, + 65535 }; Compact sc73_floor = { @@ -930,6 +944,17 @@ Compact sc73_floor = { 375-188, // mouseSize_x 327-260, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc73_bits_anim[] = { @@ -988,7 +1013,7 @@ uint16 sc73_bits_anim[] = { 234, 259, 8, - 0, + 0 }; uint16 sc73_gall_fight1[] = { @@ -1083,7 +1108,7 @@ uint16 sc73_gall_fight1[] = { 319, 227, 17, - 0, + 0 }; Compact sc73_door = { @@ -1105,6 +1130,17 @@ Compact sc73_door = { 369-362, // mouseSize_x 270-212, // mouseSize_y SC73_DOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc73_cham4_anim[] = { @@ -1169,7 +1205,7 @@ uint16 sc73_cham4_anim[] = { 225, 190, 19, - 0, + 0 }; Compact sc73_bits = { @@ -1201,6 +1237,7 @@ Compact sc73_bits = { C_BASE_MODE, // mode SC73_BITS_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc73_locked_door = { @@ -1222,6 +1259,17 @@ Compact sc73_locked_door = { 178-162, // mouseSize_x 298-236, // mouseSize_y SC73_LOCKED_DOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc73_mouse_list[] = { @@ -1236,7 +1284,7 @@ uint16 sc73_mouse_list[] = { ID_SC73_LOCKED_DOOR, ID_SC73_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sc73_sensor = { @@ -1268,6 +1316,7 @@ Compact sc73_sensor = { C_BASE_MODE, // mode SC73_SENSOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc73_cham5_light = { @@ -1299,6 +1348,7 @@ Compact sc73_cham5_light = { C_BASE_MODE, // mode SC73_CHAM5_LIGHT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc73_joey_lunge[] = { @@ -1336,7 +1386,7 @@ uint16 sc73_joey_lunge[] = { 310, 240, 0, - 0, + 0 }; uint16 sc73_get_board[] = { @@ -1383,7 +1433,7 @@ uint16 sc73_get_board[] = { 272, 216, 0, - 0, + 0 }; uint16 sc73_chip_list[] = { @@ -1410,7 +1460,7 @@ uint16 sc73_chip_list[] = { IT_SC73_BITS+DISK_7, IT_SC73_BITS2+DISK_7, IT_SC73_SPRAY+DISK_7, - 0, + 0 }; Compact sc73_spray = { @@ -1442,6 +1492,7 @@ Compact sc73_spray = { C_BASE_MODE, // mode SC73_SPRAY_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 reset_74_73[] = { @@ -1453,7 +1504,7 @@ uint16 reset_74_73[] = { 384, C_YCOOD, 264, - 65535, + 65535 }; uint32 *grid73 = 0; @@ -1487,6 +1538,7 @@ Compact sc73_bits2 = { C_BASE_MODE, // mode SC73_BITS2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc73_sensor_anim[] = { @@ -1578,7 +1630,7 @@ uint16 sc73_sensor_anim[] = { 405, 251, 3, - 0, + 0 }; uint16 sc73_fast_list[] = { @@ -1588,7 +1640,7 @@ uint16 sc73_fast_list[] = { 53+DISK_7, 54+DISK_7, 268+DISK_7, - 0, + 0 }; uint16 sc73_joey_list[] = { @@ -1612,7 +1664,7 @@ uint16 sc73_joey_list[] = { 296, 303, 0, - 0, + 0 }; uint16 sc73_spray_anim[] = { @@ -1686,7 +1738,7 @@ uint16 sc73_spray_anim[] = { 348, 234, 6, - 0, + 0 }; Compact sc73_chamber4 = { @@ -1718,6 +1770,7 @@ Compact sc73_chamber4 = { C_BASE_MODE, // mode SC73_CHAMBER4_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc73_chamber3 = { @@ -1749,6 +1802,7 @@ Compact sc73_chamber3 = { C_BASE_MODE, // mode SC73_CHAMBER3_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc73_palette[] = { @@ -2135,7 +2189,7 @@ uint16 sc73_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact sc73_chamber5 = { @@ -2167,6 +2221,7 @@ Compact sc73_chamber5 = { C_BASE_MODE, // mode SC73_CHAMBER5_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc73_cham4_flash[] = { @@ -2213,7 +2268,7 @@ uint16 sc73_cham4_flash[] = { 236, 243, 0, - 0, + 0 }; uint16 sc73_bits2_anim[] = { @@ -2278,7 +2333,7 @@ uint16 sc73_bits2_anim[] = { 297, 269, 7, - 0, + 0 }; uint16 sc73_logic_list[] = { @@ -2298,7 +2353,7 @@ uint16 sc73_logic_list[] = { ID_SC73_SPRAY, ID_SC75_TONGS, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 reset_75_73[] = { @@ -2310,7 +2365,7 @@ uint16 reset_75_73[] = { 408, C_YCOOD, 296, - 65535, + 65535 }; uint16 sc73_cham3_anim[] = { @@ -2375,7 +2430,7 @@ uint16 sc73_cham3_anim[] = { 189, 190, 19, - 0, + 0 }; uint16 sc73_search[] = { @@ -2422,7 +2477,7 @@ uint16 sc73_search[] = { 293, 252, 0, - 0, + 0 }; Compact sc73_big_door = { @@ -2444,6 +2499,17 @@ Compact sc73_big_door = { 398-380, // mouseSize_x 298-205, // mouseSize_y SC73_BIG_DOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *gal = 0; @@ -2477,6 +2543,7 @@ Compact sc73_cham4_light = { C_BASE_MODE, // mode SC73_CHAM4_LIGHT_LOGIC, // baseSub 0, // baseSub_off + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/74comp.h b/sky/compacts/74comp.h index 5386994dbe..3763c09d35 100644 --- a/sky/compacts/74comp.h +++ b/sky/compacts/74comp.h @@ -56,6 +56,7 @@ Compact sc74_monitor3 = { C_BASE_MODE, // mode SC74_MONITOR3_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc74_pod = { @@ -87,6 +88,7 @@ Compact sc74_pod = { C_BASE_MODE, // mode SC74_POD_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc74_terminal = { @@ -108,6 +110,17 @@ Compact sc74_terminal = { 230-204, // mouseSize_x 253-227, // mouseSize_y SC74_TERMINAL_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc74_int_table[] = { @@ -127,7 +140,7 @@ uint16 sc74_int_table[] = { GT_SC74_FLOOR, ID_SC74_TERMINAL, GT_SC74_FLOOR, - 65535, + 65535 }; Compact sc74_interface = { @@ -149,6 +162,17 @@ Compact sc74_interface = { 366-340, // mouseSize_x 290-241, // mouseSize_y SC74_INTERFACE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc74_mon4_anim[] = { @@ -1113,7 +1137,7 @@ uint16 sc74_mon4_anim[] = { 281, 186, 1, - 0, + 0 }; uint16 sc74_rtv_anim[] = { @@ -1523,7 +1547,7 @@ uint16 sc74_rtv_anim[] = { 298, 212, 63, - 0, + 0 }; uint16 sc74_pod_down[] = { @@ -1648,7 +1672,7 @@ uint16 sc74_pod_down[] = { 340, 193, 36, - 0, + 0 }; uint16 sc74_lights_anim[] = { @@ -1671,7 +1695,7 @@ uint16 sc74_lights_anim[] = { 243, 253, 1, - 0, + 0 }; uint16 sc74_pod_up[] = { @@ -1823,7 +1847,7 @@ uint16 sc74_pod_up[] = { 340, 193, 35, - 0, + 0 }; Compact sc74_int_slot = { @@ -1855,6 +1879,7 @@ Compact sc74_int_slot = { C_BASE_MODE, // mode SC74_INT_SLOT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc74_mouse_list[] = { @@ -1867,7 +1892,7 @@ uint16 sc74_mouse_list[] = { ID_SC74_DOOR, ID_SC74_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 sc74_chip_list[] = { @@ -1890,7 +1915,7 @@ uint16 sc74_chip_list[] = { IT_SC74_USECARD2+DISK_7, IT_SC74_RPOCKET+DISK_7, 94+DISK_7, - 0, + 0 }; Compact sc74_monitor2 = { @@ -1922,6 +1947,7 @@ Compact sc74_monitor2 = { C_BASE_MODE, // mode SC74_MONITOR2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc74_floor_table[] = { @@ -1943,7 +1969,7 @@ uint16 sc74_floor_table[] = { GT_SC74_INT_SLOT, ID_SC74_TERMINAL, GT_SC74_TERMINAL, - 65535, + 65535 }; Compact sc74_floor = { @@ -1965,6 +1991,17 @@ Compact sc74_floor = { 447-150, // mouseSize_x 327-260, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 reset_73_74[] = { @@ -1976,7 +2013,7 @@ uint16 reset_73_74[] = { 160, C_YCOOD, 280, - 65535, + 65535 }; uint16 sc74_ltv_anim[] = { @@ -2941,7 +2978,7 @@ uint16 sc74_ltv_anim[] = { 243, 212, 1, - 0, + 0 }; Compact sc74_left_tv = { @@ -2973,6 +3010,7 @@ Compact sc74_left_tv = { C_BASE_MODE, // mode SC74_LEFT_TV_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc74_usecard[] = { @@ -3004,7 +3042,7 @@ uint16 sc74_usecard[] = { 360, 240, 0, - 0, + 0 }; uint32 *grid74 = 0; @@ -3041,7 +3079,7 @@ uint16 sc74_fost_sit[] = { 342, 241, 8, - 0, + 0 }; Compact sc74_door = { @@ -3063,6 +3101,17 @@ Compact sc74_door = { 195-183, // mouseSize_x 288-231, // mouseSize_y SC74_DOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc74_monitor4 = { @@ -3094,6 +3143,7 @@ Compact sc74_monitor4 = { C_BASE_MODE, // mode SC74_MONITOR4_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc74_mon3_anim[] = { @@ -4058,7 +4108,7 @@ uint16 sc74_mon3_anim[] = { 258, 186, 0, - 0, + 0 }; uint16 sc74_get_up[] = { @@ -4093,7 +4143,7 @@ uint16 sc74_get_up[] = { 355, 242, 9, - 0, + 0 }; Compact sc74_monitor1 = { @@ -4125,6 +4175,7 @@ Compact sc74_monitor1 = { C_BASE_MODE, // mode SC74_MONITOR1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc74_mon1_anim[] = { @@ -5089,7 +5140,7 @@ uint16 sc74_mon1_anim[] = { 213, 189, 9, - 0, + 0 }; uint16 sc74_palette[] = { @@ -5476,7 +5527,7 @@ uint16 sc74_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc74_fast_list[] = { @@ -5486,7 +5537,7 @@ uint16 sc74_fast_list[] = { 53+DISK_7, 54+DISK_7, 268+DISK_7, - 0, + 0 }; uint16 sc74_usecard2[] = { @@ -5518,7 +5569,7 @@ uint16 sc74_usecard2[] = { 200, 232, 0, - 0, + 0 }; uint16 sc74_rpocket[] = { @@ -5541,7 +5592,7 @@ uint16 sc74_rpocket[] = { 1, 1, 0, - 0, + 0 }; uint16 reset_linc_74[] = { @@ -5557,7 +5608,7 @@ uint16 reset_linc_74[] = { 8+92*64, C_STATUS, ST_SORT+ST_RECREATE+ST_LOGIC+ST_AR_PRIORITY+ST_COLLISION, - 65535, + 65535 }; Compact sc74_right_tv = { @@ -5589,6 +5640,7 @@ Compact sc74_right_tv = { C_BASE_MODE, // mode SC74_RIGHT_TV_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc74_logic_list[] = { @@ -5606,7 +5658,7 @@ uint16 sc74_logic_list[] = { ID_SC74_POD, ID_SC75_TONGS, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc74_mon2_anim[] = { @@ -6571,7 +6623,7 @@ uint16 sc74_mon2_anim[] = { 235, 186, 23, - 0, + 0 }; Compact sc74_lights = { @@ -6603,6 +6655,7 @@ Compact sc74_lights = { C_BASE_MODE, // mode SC74_LIGHTS_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc74_slot_flash[] = { @@ -6625,7 +6678,7 @@ uint16 sc74_slot_flash[] = { 377, 266, 1, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/75comp.h b/sky/compacts/75comp.h index 0b7614f90d..7e663a5812 100644 --- a/sky/compacts/75comp.h +++ b/sky/compacts/75comp.h @@ -48,7 +48,7 @@ uint16 sc75_floor_table[] = { GT_SC75_TONGS, ID_JOEY_PARK, GT_JOEY_PARK, - 65535, + 65535 }; uint16 sc75_usecard[] = { @@ -80,7 +80,7 @@ uint16 sc75_usecard[] = { 269, 223, 0, - 0, + 0 }; Compact sc75_console = { @@ -112,6 +112,7 @@ Compact sc75_console = { C_BASE_MODE, // mode SC75_CONSOLE_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc75_get_tongs[] = { @@ -146,7 +147,7 @@ uint16 sc75_get_tongs[] = { 352, 216, 0, - 0, + 0 }; uint16 sc75_joey_list[] = { @@ -155,7 +156,7 @@ uint16 sc75_joey_list[] = { 272, 311, 1, - 0, + 0 }; uint16 sc75_freeze_ded2[] = { @@ -196,7 +197,7 @@ uint16 sc75_freeze_ded2[] = { 261, 240, 7, - 0, + 0 }; uint16 sc75_hand_tank[] = { @@ -240,7 +241,7 @@ uint16 sc75_hand_tank[] = { 336, 216, 0, - 0, + 0 }; Compact sc75_door = { @@ -262,6 +263,17 @@ Compact sc75_door = { 404-389, // mouseSize_x 268-204, // mouseSize_y SC75_DOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc75_light2_anim[] = { @@ -329,7 +341,7 @@ uint16 sc75_light2_anim[] = { 335, 207, 0, - 0, + 0 }; Compact sc75_light1 = { @@ -361,12 +373,13 @@ Compact sc75_light1 = { C_BASE_MODE, // mode SC75_LIGHT1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_tongs_dead[] = { C_FRAME, 10+268*64, - 65535, + 65535 }; uint16 sc75_tank_anim[] = { @@ -461,7 +474,7 @@ uint16 sc75_tank_anim[] = { 331, 230, 29, - 0, + 0 }; uint16 reset_73_75[] = { @@ -473,7 +486,7 @@ uint16 reset_73_75[] = { 160, C_YCOOD, 264, - 65535, + 65535 }; uint32 *grid75 = 0; @@ -528,7 +541,7 @@ uint16 sc75_light1_anim[] = { 287, 207, 1, - 0, + 0 }; uint16 sc75_fast_list[] = { @@ -542,7 +555,7 @@ uint16 sc75_fast_list[] = { IT_SC75_RPOCKET+DISK_10, IT_SC75_USECARD+DISK_10, 268+DISK_10, - 0, + 0 }; Compact sc75_floor = { @@ -564,12 +577,23 @@ Compact sc75_floor = { 399-180, // mouseSize_x 327-260, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_tongs_empty[] = { C_FRAME, 4+268*64, - 65535, + 65535 }; Compact sc75_big_door = { @@ -591,6 +615,17 @@ Compact sc75_big_door = { 190-178, // mouseSize_x 270-182, // mouseSize_y SC75_BIG_DOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc75_mouse_list[] = { @@ -603,7 +638,7 @@ uint16 sc75_mouse_list[] = { ID_SC75_DOOR, ID_SC75_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sc75_live_tank = { @@ -635,6 +670,7 @@ Compact sc75_live_tank = { C_BASE_MODE, // mode SC75_LIVE_TANK_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc75_freeze_it[] = { @@ -741,7 +777,7 @@ uint16 sc75_freeze_it[] = { 261, 240, 17, - 0, + 0 }; Compact sc75_tongs = { @@ -773,6 +809,7 @@ Compact sc75_tongs = { C_BASE_MODE, // mode SC75_TONGS_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc75_chip_list[] = { @@ -797,7 +834,7 @@ uint16 sc75_chip_list[] = { IT_SC75_GET_TONGS+DISK_10+0X8000, IT_SC75_GET_TISS+DISK_10+0X8000, IT_SC75_HAND_TANK+DISK_10+0X8000, - 0, + 0 }; uint16 sc75_nitro_anim[] = { @@ -865,13 +902,13 @@ uint16 sc75_nitro_anim[] = { 210, 255, 8, - 0, + 0 }; uint16 rs_tongs_frozen[] = { C_FRAME, 8+268*64, - 65535, + 65535 }; uint16 sc75_crash_anim[] = { @@ -966,7 +1003,7 @@ uint16 sc75_crash_anim[] = { 289, 215, 29, - 0, + 0 }; Compact sc75_light2 = { @@ -998,6 +1035,7 @@ Compact sc75_light2 = { C_BASE_MODE, // mode SC75_LIGHT2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc75_mon_anim[] = { @@ -1092,7 +1130,7 @@ uint16 sc75_mon_anim[] = { 289, 215, 19, - 0, + 0 }; uint16 sc75_freeze_it2[] = { @@ -1133,7 +1171,7 @@ uint16 sc75_freeze_it2[] = { 261, 240, 7, - 0, + 0 }; Compact sc75_nitro_tank = { @@ -1165,6 +1203,7 @@ Compact sc75_nitro_tank = { C_BASE_MODE, // mode SC75_NITRO_TANK_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc75_palette[] = { @@ -1551,13 +1590,13 @@ uint16 sc75_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 rs_tongs_live[] = { C_FRAME, 6+268*64, - 65535, + 65535 }; uint16 reset_76_75[] = { @@ -1569,7 +1608,7 @@ uint16 reset_76_75[] = { 416, C_YCOOD, 272, - 65535, + 65535 }; uint16 sc75_logic_list[] = { @@ -1582,7 +1621,7 @@ uint16 sc75_logic_list[] = { ID_SC75_TONGS, ID_FOSTER, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 rs_tongs_timer[] = { @@ -1596,7 +1635,7 @@ uint16 rs_tongs_timer[] = { SC75_TISSUE_LOGIC, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint16 sc75_freeze_ded[] = { @@ -1703,7 +1742,7 @@ uint16 sc75_freeze_ded[] = { 261, 240, 19, - 0, + 0 }; uint16 sc75_rpocket[] = { @@ -1726,7 +1765,7 @@ uint16 sc75_rpocket[] = { 1, 1, 0, - 0, + 0 }; uint16 sc75_get_tiss[] = { @@ -1836,7 +1875,7 @@ uint16 sc75_get_tiss[] = { 340, 216, 20, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/76comp.h b/sky/compacts/76comp.h index 686a24ea23..3f8212e26b 100644 --- a/sky/compacts/76comp.h +++ b/sky/compacts/76comp.h @@ -29,7 +29,7 @@ namespace SkyCompact { uint16 ken_u_to_r[] = { 45+61*64, - 0, + 0 }; uint16 sc76_logic_list[] = { @@ -55,7 +55,7 @@ uint16 sc76_logic_list[] = { ID_SC76_CABINET_3, ID_SC75_TONGS, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint32 *grid76 = 0; @@ -134,7 +134,7 @@ uint16 sc76_hatch_2[] = { 247, 228, 11, - 0, + 0 }; uint16 sc76_cab2_close[] = { @@ -148,7 +148,7 @@ uint16 sc76_cab2_close[] = { 1, 1, 0, - 0, + 0 }; uint16 reset_75_76[] = { @@ -160,7 +160,7 @@ uint16 reset_75_76[] = { 160, C_YCOOD, 264, - 65535, + 65535 }; uint16 sc76_chip_list[] = { @@ -195,7 +195,7 @@ uint16 sc76_chip_list[] = { IT_SC76_HATCH_3+DISK_10+0X8000, IT_SC76_PUNCH+DISK_10, IT_SC76_AND2_BABBLE+DISK_10, - 0, + 0 }; uint16 ken_right[] = { @@ -239,7 +239,7 @@ uint16 ken_right[] = { 39+61*64, 4, 0, - 0, + 0 }; uint16 ken_st_up[] = { @@ -247,12 +247,12 @@ uint16 ken_st_up[] = { 1, 0, 44, - 0, + 0 }; uint16 ken_d_to_l[] = { 41+61*64, - 0, + 0 }; uint8 ken_auto[64]; @@ -298,7 +298,7 @@ uint16 ken_up[] = { 9+61*64, 0, 65534, - 0, + 0 }; uint16 ken_down[] = { @@ -342,7 +342,7 @@ uint16 ken_down[] = { 19+61*64, 0, 2, - 0, + 0 }; uint16 ken_left[] = { @@ -386,7 +386,7 @@ uint16 ken_left[] = { 29+61*64, 65532, 0, - 0, + 0 }; uint16 ken_st_down[] = { @@ -394,7 +394,7 @@ uint16 ken_st_down[] = { 1, 0, 40, - 0, + 0 }; uint16 ken_st_left[] = { @@ -402,7 +402,7 @@ uint16 ken_st_left[] = { 1, 0, 42, - 0, + 0 }; uint16 ken_st_right[] = { @@ -410,65 +410,65 @@ uint16 ken_st_right[] = { 1, 0, 46, - 0, + 0 }; uint16 ken_u_to_d[] = { 43+61*64, 42+61*64, 41+61*64, - 0, + 0 }; uint16 ken_u_to_l[] = { 43+61*64, - 0, + 0 }; uint16 ken_d_to_u[] = { 47+61*64, 46+61*64, 45+61*64, - 0, + 0 }; uint16 ken_d_to_r[] = { 47+61*64, - 0, + 0 }; uint16 ken_l_to_u[] = { 43+61*64, - 0, + 0 }; uint16 ken_l_to_d[] = { 41+61*64, - 0, + 0 }; uint16 ken_l_to_r[] = { 41+61*64, 40+61*64, 47+61*64, - 0, + 0 }; uint16 ken_r_to_u[] = { 45+61*64, - 0, + 0 }; uint16 ken_r_to_d[] = { 47+61*64, - 0, + 0 }; uint16 ken_r_to_l[] = { 45+61*64, 44+61*64, 43+61*64, - 0, + 0 }; TurnTable ken_turnTable0 = { @@ -506,7 +506,7 @@ TurnTable ken_turnTable0 = { 0, 0, 0 - }, + } }; MegaSet ken_megaSet0 = { @@ -523,7 +523,7 @@ MegaSet ken_megaSet0 = { ken_st_left, // standLeft ken_st_right, // standRight 0, // standTalk - &ken_turnTable0, + &ken_turnTable0 }; ExtCompact ken_ext = { @@ -553,6 +553,9 @@ ExtCompact ken_ext = { ken_auto, // animScratch 0, // megaSet &ken_megaSet0, + 0, + 0, + 0 }; Compact ken = { @@ -584,7 +587,7 @@ Compact ken = { C_BASE_MODE, // mode KEN_START_LOGIC, // baseSub 0, // baseSub_off - &ken_ext, + &ken_ext }; uint16 sc76_floor_table[] = { @@ -624,7 +627,7 @@ uint16 sc76_floor_table[] = { GT_SC76_ANYTHING, ID_JOEY_PARK, GT_JOEY_PARK, - 65535, + 65535 }; Compact sc76_floor = { @@ -646,6 +649,17 @@ Compact sc76_floor = { 391-175, // mouseSize_x 327-255, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc76_light3 = { @@ -677,6 +691,7 @@ Compact sc76_light3 = { C_BASE_MODE, // mode SC76_LIGHT3_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc76_light9 = { @@ -708,6 +723,7 @@ Compact sc76_light9 = { C_BASE_MODE, // mode SC76_LIGHT9_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc76_light1_anim[] = { @@ -754,7 +770,7 @@ uint16 sc76_light1_anim[] = { 228, 182, 1, - 0, + 0 }; uint16 sc76_light2_anim[] = { @@ -795,7 +811,7 @@ uint16 sc76_light2_anim[] = { 232, 182, 0, - 0, + 0 }; Compact sc76_light6 = { @@ -827,6 +843,7 @@ Compact sc76_light6 = { C_BASE_MODE, // mode SC76_LIGHT6_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc76_board_3 = { @@ -858,6 +875,7 @@ Compact sc76_board_3 = { C_BASE_MODE, // mode SC76_BOARD_3_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc76_shut_cab[] = { @@ -907,7 +925,7 @@ uint16 sc76_shut_cab[] = { 1, 1, 0, - 0, + 0 }; uint16 sc76_light3_anim[] = { @@ -954,7 +972,7 @@ uint16 sc76_light3_anim[] = { 278, 182, 0, - 0, + 0 }; Compact sc76_light1 = { @@ -986,6 +1004,7 @@ Compact sc76_light1 = { C_BASE_MODE, // mode SC76_LIGHT1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc76_low_get[] = { @@ -1035,7 +1054,7 @@ uint16 sc76_low_get[] = { 1, 1, 0, - 0, + 0 }; uint16 sc76_fostfall[] = { @@ -1079,7 +1098,7 @@ uint16 sc76_fostfall[] = { 382, 262, 11, - 0, + 0 }; Compact sc76_door77 = { @@ -1101,6 +1120,17 @@ Compact sc76_door77 = { 392-377, // mouseSize_x 271-208, // mouseSize_y SC76_DOOR77_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc76_board_1 = { @@ -1132,6 +1162,7 @@ Compact sc76_board_1 = { C_BASE_MODE, // mode SC76_BOARD_1_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc76_light8 = { @@ -1163,6 +1194,7 @@ Compact sc76_light8 = { C_BASE_MODE, // mode SC76_LIGHT8_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc76_android_1 = { @@ -1194,6 +1226,7 @@ Compact sc76_android_1 = { C_BASE_MODE, // mode SC76_ANDROID_1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc76_cab1_open[] = { @@ -1207,7 +1240,7 @@ uint16 sc76_cab1_open[] = { 1, 1, 3, - 0, + 0 }; uint16 sc76_hatch_1[] = { @@ -1320,7 +1353,7 @@ uint16 sc76_hatch_1[] = { 224, 204, 0, - 0, + 0 }; Compact sc76_console_2 = { @@ -1342,6 +1375,17 @@ Compact sc76_console_2 = { 316-299, // mouseSize_x 244-210, // mouseSize_y SC76_CONSOLE_2_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; ExtCompact sc76_android_3_ext = { @@ -1370,6 +1414,10 @@ ExtCompact sc76_android_3_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc76_android_3 = { @@ -1401,7 +1449,7 @@ Compact sc76_android_3 = { C_BASE_MODE, // mode SC76_ANDROID_3_LOGIC, // baseSub 0, // baseSub_off - &sc76_android_3_ext, + &sc76_android_3_ext }; Compact sc76_console_1 = { @@ -1423,6 +1471,17 @@ Compact sc76_console_1 = { 260-244, // mouseSize_x 244-210, // mouseSize_y SC76_CONSOLE_1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc76_fast_list[] = { @@ -1432,7 +1491,7 @@ uint16 sc76_fast_list[] = { 53+DISK_10, 54+DISK_10, 268+DISK_10, - 0, + 0 }; ExtCompact sc76_android_2_ext = { @@ -1461,6 +1520,10 @@ ExtCompact sc76_android_2_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc76_android_2 = { @@ -1492,7 +1555,7 @@ Compact sc76_android_2 = { C_BASE_MODE, // mode SC76_ANDROID_2_LOGIC, // baseSub 0, // baseSub_off - &sc76_android_2_ext, + &sc76_android_2_ext }; uint16 sc76_cab1_close[] = { @@ -1506,7 +1569,7 @@ uint16 sc76_cab1_close[] = { 1, 1, 0, - 0, + 0 }; Compact sc76_light5 = { @@ -1538,6 +1601,7 @@ Compact sc76_light5 = { C_BASE_MODE, // mode SC76_LIGHT5_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc76_board_2 = { @@ -1569,6 +1633,7 @@ Compact sc76_board_2 = { C_BASE_MODE, // mode SC76_BOARD_2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc76_light9_anim[] = { @@ -1609,7 +1674,7 @@ uint16 sc76_light9_anim[] = { 357, 239, 10, - 0, + 0 }; uint16 sc76_cab3_open[] = { @@ -1623,7 +1688,7 @@ uint16 sc76_cab3_open[] = { 1, 1, 3, - 0, + 0 }; Compact sc76_light7 = { @@ -1655,6 +1720,7 @@ Compact sc76_light7 = { C_BASE_MODE, // mode SC76_LIGHT7_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc76_light4 = { @@ -1686,6 +1752,7 @@ Compact sc76_light4 = { C_BASE_MODE, // mode SC76_LIGHT4_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc76_mouse_list[] = { @@ -1706,7 +1773,7 @@ uint16 sc76_mouse_list[] = { ID_SC76_DOOR77, ID_SC76_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 sc76_joey_list[] = { @@ -1725,7 +1792,7 @@ uint16 sc76_joey_list[] = { 272, 279, 0, - 0, + 0 }; uint16 reset_77_76[] = { @@ -1737,7 +1804,7 @@ uint16 reset_77_76[] = { 408, C_YCOOD, 272, - 65535, + 65535 }; uint16 sc76_light5_anim[] = { @@ -1784,7 +1851,7 @@ uint16 sc76_light5_anim[] = { 323, 182, 0, - 0, + 0 }; uint16 sc76_light4_anim[] = { @@ -1831,7 +1898,7 @@ uint16 sc76_light4_anim[] = { 282, 182, 0, - 0, + 0 }; uint16 sc76_hatch_3[] = { @@ -1905,7 +1972,7 @@ uint16 sc76_hatch_3[] = { 307, 220, 13, - 0, + 0 }; Compact sc76_cabinet_1 = { @@ -1937,6 +2004,7 @@ Compact sc76_cabinet_1 = { C_BASE_MODE, // mode SC76_CABINET_1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc76_punch[] = { @@ -2001,7 +2069,7 @@ uint16 sc76_punch[] = { 337, 220, 15, - 0, + 0 }; uint16 sc76_cab2_open[] = { @@ -2015,7 +2083,7 @@ uint16 sc76_cab2_open[] = { 1, 1, 3, - 0, + 0 }; uint16 sc76_light7_anim[] = { @@ -2059,7 +2127,7 @@ uint16 sc76_light7_anim[] = { 247, 239, 9, - 0, + 0 }; Compact sc76_cabinet_3 = { @@ -2091,6 +2159,7 @@ Compact sc76_cabinet_3 = { C_BASE_MODE, // mode SC76_CABINET_3_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc76_console_3 = { @@ -2112,6 +2181,17 @@ Compact sc76_console_3 = { 369-350, // mouseSize_x 244-210, // mouseSize_y SC76_CONSOLE_3_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc76_open_cab[] = { @@ -2164,7 +2244,7 @@ uint16 sc76_open_cab[] = { 1, 1, 0, - 0, + 0 }; uint16 sc76_palette[] = { @@ -2551,7 +2631,7 @@ uint16 sc76_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact sc76_light2 = { @@ -2583,6 +2663,7 @@ Compact sc76_light2 = { C_BASE_MODE, // mode SC76_LIGHT2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc76_light8_anim[] = { @@ -2629,7 +2710,7 @@ uint16 sc76_light8_anim[] = { 304, 239, 11, - 0, + 0 }; uint16 sc76_cab3_close[] = { @@ -2643,7 +2724,7 @@ uint16 sc76_cab3_close[] = { 1, 1, 0, - 0, + 0 }; Compact sc76_cabinet_2 = { @@ -2675,6 +2756,7 @@ Compact sc76_cabinet_2 = { C_BASE_MODE, // mode SC76_CABINET_2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc76_light6_anim[] = { @@ -2697,7 +2779,7 @@ uint16 sc76_light6_anim[] = { 327, 182, 2, - 0, + 0 }; Compact sc76_door75 = { @@ -2719,6 +2801,17 @@ Compact sc76_door75 = { 190-174, // mouseSize_x 275-210, // mouseSize_y SC76_DOOR75_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/77comp.h b/sky/compacts/77comp.h index 9bd4289060..1d18009673 100644 --- a/sky/compacts/77comp.h +++ b/sky/compacts/77comp.h @@ -44,7 +44,7 @@ uint16 sc77_fpushl_2[] = { 1, 1, 0, - 0, + 0 }; uint16 sc77_palette[] = { @@ -431,7 +431,7 @@ uint16 sc77_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact sc77_big_door = { @@ -463,6 +463,7 @@ Compact sc77_big_door = { C_BASE_MODE, // mode SC77_BIG_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc77_fpushl_1[] = { @@ -488,7 +489,7 @@ uint16 sc77_fpushl_1[] = { 1, 1, 6, - 0, + 0 }; uint16 sc77_fast_list[] = { @@ -498,7 +499,7 @@ uint16 sc77_fast_list[] = { 53+DISK_10, 54+DISK_10, 268+DISK_10, - 0, + 0 }; uint16 sc77_logic_list[] = { @@ -508,7 +509,7 @@ uint16 sc77_logic_list[] = { ID_SC75_TONGS, ID_SC67_PULSE1, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc77_door_open[] = { @@ -537,7 +538,7 @@ uint16 sc77_door_open[] = { 380, 197, 7, - 0, + 0 }; uint16 sc77_chip_list[] = { @@ -552,7 +553,7 @@ uint16 sc77_chip_list[] = { IT_SC77_KPUSHR+DISK_10, IT_SC77_STRETCH+DISK_10, 102+DISK_10, - 0, + 0 }; uint32 *grid77 = 0; @@ -566,7 +567,7 @@ uint16 reset_78_77[] = { 408, C_YCOOD, 264, - 65535, + 65535 }; uint16 sc77_stretch[] = { @@ -757,7 +758,7 @@ uint16 sc77_stretch[] = { 361, 224, 9, - 0, + 0 }; uint16 sc77_joey_list[] = { @@ -771,7 +772,7 @@ uint16 sc77_joey_list[] = { 264, 271, 0, - 0, + 0 }; uint16 sc77_mouse_list[] = { @@ -784,7 +785,7 @@ uint16 sc77_mouse_list[] = { ID_SC77_BIG_DOOR, ID_SC77_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 reset_76_77[] = { @@ -796,7 +797,7 @@ uint16 reset_76_77[] = { 152, C_YCOOD, 264, - 65535, + 65535 }; uint16 sc77_fpushr_2[] = { @@ -813,7 +814,7 @@ uint16 sc77_fpushr_2[] = { 1, 1, 0, - 0, + 0 }; uint16 sc77_floor_table[] = { @@ -839,7 +840,7 @@ uint16 sc77_floor_table[] = { GT_JOEY_PARK, ID_KEN, GT_SC77_STUCK_KEN, - 65535, + 65535 }; uint16 sc77_kpushr_2[] = { @@ -856,7 +857,7 @@ uint16 sc77_kpushr_2[] = { 1, 1, 0, - 0, + 0 }; Compact sc77_tank_1 = { @@ -878,6 +879,17 @@ Compact sc77_tank_1 = { 281-199, // mouseSize_x 265-157, // mouseSize_y SC77_TANKS_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc77_fpushr_1[] = { @@ -897,7 +909,7 @@ uint16 sc77_fpushr_1[] = { 1, 1, 4, - 0, + 0 }; Compact sc77_tank_2 = { @@ -919,6 +931,17 @@ Compact sc77_tank_2 = { 365-289, // mouseSize_x 265-157, // mouseSize_y SC77_TANKS_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc77_floor = { @@ -940,6 +963,17 @@ Compact sc77_floor = { 382-188, // mouseSize_x 280-262, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc77_hand_2 = { @@ -961,6 +995,17 @@ Compact sc77_hand_2 = { 400-393, // mouseSize_x 251-236, // mouseSize_y SC77_HAND_2_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc77_hand_1 = { @@ -982,6 +1027,17 @@ Compact sc77_hand_1 = { 371-364, // mouseSize_x 233-222, // mouseSize_y SC77_HAND_1_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc77_kpushr_1[] = { @@ -1001,7 +1057,7 @@ uint16 sc77_kpushr_1[] = { 1, 1, 4, - 0, + 0 }; Compact sc77_door76 = { @@ -1023,6 +1079,17 @@ Compact sc77_door76 = { 190-174, // mouseSize_x 270-205, // mouseSize_y SC77_DOOR76_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/78comp.h b/sky/compacts/78comp.h index 9f7e1ea601..ecd94defe6 100644 --- a/sky/compacts/78comp.h +++ b/sky/compacts/78comp.h @@ -40,7 +40,7 @@ uint16 sc78_ledge_table[] = { GT_SC78_PIPE, ID_SC78_SUPPORT, GT_SC78_PIPE, - 65535, + 65535 }; Compact sc78_ledge = { @@ -62,6 +62,17 @@ Compact sc78_ledge = { 282-185, // mouseSize_x 257-245, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc78_big_door = { @@ -83,6 +94,17 @@ Compact sc78_big_door = { 186-166, // mouseSize_x 256-177, // mouseSize_y SC78_BIG_DOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc78_climb_up[] = { @@ -171,7 +193,7 @@ uint16 sc78_climb_up[] = { 260, 202, 1, - 0, + 0 }; uint16 sc78_logic_list[] = { @@ -179,7 +201,7 @@ uint16 sc78_logic_list[] = { ID_KEN, ID_SC67_PULSE1, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 reset_79_78[] = { @@ -191,7 +213,7 @@ uint16 reset_79_78[] = { OFF_RIGHT, C_YCOOD, 272, - 65535, + 65535 }; uint16 sc78_mouse_list[] = { @@ -201,7 +223,7 @@ uint16 sc78_mouse_list[] = { ID_SC78_LEDGE, ID_SC78_PIPE, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; Compact sc78_support = { @@ -223,6 +245,17 @@ Compact sc78_support = { 405-386, // mouseSize_x 308-262, // mouseSize_y SC78_SUPPORT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc781_palette[] = { @@ -609,7 +642,7 @@ uint16 sc781_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 reset_77_78[] = { @@ -621,7 +654,7 @@ uint16 reset_77_78[] = { 152, C_YCOOD, 248, - 65535, + 65535 }; uint16 sc78_pipe_table[] = { @@ -637,7 +670,7 @@ uint16 sc78_pipe_table[] = { SC78_EXIT_WALK_ON, ID_SC78_SUPPORT, GT_SC78_SUPPORT, - 65535, + 65535 }; uint16 sc78_chip_list[] = { @@ -646,7 +679,7 @@ uint16 sc78_chip_list[] = { IT_SC78_GRID_1+DISK_10, IT_SC78_JUMP_DOWN+DISK_10, IT_SC78_CLIMB_UP+DISK_10, - 0, + 0 }; Compact sc78_exit = { @@ -668,6 +701,17 @@ Compact sc78_exit = { 447-420, // mouseSize_x 280-210, // mouseSize_y SC78_EXIT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc78_jump_down[] = { @@ -726,7 +770,7 @@ uint16 sc78_jump_down[] = { 330, 226, 0, - 0, + 0 }; Compact sc78_pipe = { @@ -748,6 +792,17 @@ Compact sc78_pipe = { 422-278, // mouseSize_x 281-270, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint32 *grid78 = 0; @@ -1136,7 +1191,7 @@ uint16 sc78_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc78_fast_list[] = { @@ -1146,7 +1201,7 @@ uint16 sc78_fast_list[] = { 53+DISK_10, 54+DISK_10, 268+DISK_10, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/79comp.h b/sky/compacts/79comp.h index dc00a2d16a..ecc0e49f56 100644 --- a/sky/compacts/79comp.h +++ b/sky/compacts/79comp.h @@ -411,7 +411,7 @@ uint16 sc791_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc79_chip_list[] = { @@ -423,7 +423,7 @@ uint16 sc79_chip_list[] = { IT_SC79_TOSS_ROPE+DISK_10, IT_SC79_ROPE+DISK_10, IT_SC79_KNOT+DISK_10, - 0, + 0 }; uint16 sc79_climb_up[] = { @@ -504,7 +504,7 @@ uint16 sc79_climb_up[] = { 258, 0, 0, - 0, + 0 }; Compact sc79_exit = { @@ -526,6 +526,17 @@ Compact sc79_exit = { 155-128, // mouseSize_x 280-210, // mouseSize_y SC79_EXIT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc79_rope = { @@ -557,6 +568,7 @@ Compact sc79_rope = { C_BASE_MODE, // mode SC79_ROPE_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc79_support = { @@ -578,6 +590,17 @@ Compact sc79_support = { 296-275, // mouseSize_x 315-264, // mouseSize_y SC79_SUPPORT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc79_palette[] = { @@ -964,7 +987,7 @@ uint16 sc79_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc79_climb_down[] = { @@ -1045,7 +1068,7 @@ uint16 sc79_climb_down[] = { 280, 24, 0, - 0, + 0 }; uint16 sc79_crouch_down[] = { @@ -1081,7 +1104,7 @@ uint16 sc79_crouch_down[] = { 259, 9, 0, - 0, + 0 }; uint16 sc79_pipe_table[] = { @@ -1099,7 +1122,7 @@ uint16 sc79_pipe_table[] = { GT_SC79_KNOT, ID_SC79_ROPE, GT_SC79_ROPE, - 65535, + 65535 }; uint16 reset_78_79[] = { @@ -1111,7 +1134,7 @@ uint16 reset_78_79[] = { OFF_LEFT, C_YCOOD, 272, - 65535, + 65535 }; uint16 sc79_crouch_up[] = { @@ -1147,7 +1170,7 @@ uint16 sc79_crouch_up[] = { 226, 0, 0, - 0, + 0 }; uint16 sc79_rope_anim[] = { @@ -1317,7 +1340,7 @@ uint16 sc79_rope_anim[] = { 310, 304, 4, - 0, + 0 }; Compact sc79_knot = { @@ -1349,6 +1372,7 @@ Compact sc79_knot = { C_BASE_MODE, // mode SC79_KNOT_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc79_fast_list[] = { @@ -1358,7 +1382,7 @@ uint16 sc79_fast_list[] = { 53+DISK_10, 54+DISK_10, 268+DISK_10, - 0, + 0 }; uint16 reset_80_79[] = { @@ -1366,7 +1390,7 @@ uint16 reset_80_79[] = { 79, C_PLACE, ID_SC79_PIPE, - 65535, + 65535 }; Compact sc79_ladder = { @@ -1388,6 +1412,17 @@ Compact sc79_ladder = { 368-361, // mouseSize_x 327-284, // mouseSize_y SC79_LADDER_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc79_toss_rope[] = { @@ -1497,7 +1532,7 @@ uint16 sc79_toss_rope[] = { 285, 226, 21, - 0, + 0 }; uint32 *grid79 = 0; @@ -1509,7 +1544,7 @@ uint16 sc79_logic_list[] = { ID_SC79_KNOT, ID_SC67_PULSE1, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc79_mouse_list[] = { @@ -1520,7 +1555,7 @@ uint16 sc79_mouse_list[] = { ID_SC79_SUPPORT, ID_SC79_PIPE, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 sc79_tie_rope[] = { @@ -1585,7 +1620,7 @@ uint16 sc79_tie_rope[] = { 284, 242, 9, - 0, + 0 }; Compact sc79_pipe = { @@ -1607,6 +1642,17 @@ Compact sc79_pipe = { 360-128, // mouseSize_x 280-270, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/80comp.h b/sky/compacts/80comp.h index 34add4f4f7..9f809be689 100644 --- a/sky/compacts/80comp.h +++ b/sky/compacts/80comp.h @@ -56,6 +56,7 @@ Compact sc80_bubble10 = { C_BASE_MODE, // mode SC80_BUBBLE10_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc80_logic_list[] = { @@ -78,7 +79,7 @@ uint16 sc80_logic_list[] = { ID_SC80_BUBBLE12, ID_SC67_PULSE1, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc802_palette[] = { @@ -465,7 +466,7 @@ uint16 sc802_palette[] = { 15163, 15163, 15163, - 15163, + 15163 }; Compact sc80_bubble1 = { @@ -497,6 +498,7 @@ Compact sc80_bubble1 = { C_BASE_MODE, // mode SC80_BUBBLE1_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc801_palette[] = { @@ -883,7 +885,7 @@ uint16 sc801_palette[] = { 15677, 15677, 15677, - 15677, + 15677 }; uint16 sc803_palette[] = { @@ -1270,7 +1272,7 @@ uint16 sc803_palette[] = { 14649, 14649, 14649, - 14649, + 14649 }; uint16 sc80_chip_list[] = { @@ -1287,7 +1289,7 @@ uint16 sc80_chip_list[] = { IT_SC80_SAMPLE+DISK_10, IT_SC80_EXIT+DISK_10, IT_SC80_ROPE+DISK_10, - 0, + 0 }; Compact sc80_bubble2 = { @@ -1319,6 +1321,7 @@ Compact sc80_bubble2 = { C_BASE_MODE, // mode SC80_BUBBLE2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc80_pipe_shrug[] = { @@ -1368,7 +1371,7 @@ uint16 sc80_pipe_shrug[] = { 311, 164, 0, - 0, + 0 }; uint16 sc80_climb_down[] = { @@ -1446,7 +1449,7 @@ uint16 sc80_climb_down[] = { 165, 22, 0, - 0, + 0 }; uint16 sc80_exit_open[] = { @@ -1529,7 +1532,7 @@ uint16 sc80_exit_open[] = { 180, 188, 25, - 0, + 0 }; uint16 sc80_fast_list[] = { @@ -1539,7 +1542,7 @@ uint16 sc80_fast_list[] = { 53+DISK_10, 54+DISK_10, 268+DISK_10, - 0, + 0 }; uint16 sc80_palette[] = { @@ -1926,7 +1929,7 @@ uint16 sc80_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact sc80_bubble11 = { @@ -1958,6 +1961,7 @@ Compact sc80_bubble11 = { C_BASE_MODE, // mode SC80_BUBBLE11_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc80_clamber[] = { @@ -2064,7 +2068,7 @@ uint16 sc80_clamber[] = { 259, 169, 21, - 0, + 0 }; uint16 sc80_mouse_list[] = { @@ -2074,7 +2078,7 @@ uint16 sc80_mouse_list[] = { ID_SC80_ORIFICE, ID_SC80_EXIT, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 sc80_climb_up[] = { @@ -2152,7 +2156,7 @@ uint16 sc80_climb_up[] = { 136, 0, 0, - 0, + 0 }; Compact sc80_exit = { @@ -2184,6 +2188,7 @@ Compact sc80_exit = { C_BASE_MODE, // mode SC80_EXIT_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc80_orifice = { @@ -2205,6 +2210,17 @@ Compact sc80_orifice = { 330-272, // mouseSize_x 291-250, // mouseSize_y SC80_ORIFICE_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc80_sample = { @@ -2236,6 +2252,7 @@ Compact sc80_sample = { C_BASE_MODE, // mode SC80_SAMPLE_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc80_get_rope[] = { @@ -2282,7 +2299,7 @@ uint16 sc80_get_rope[] = { 238, 136, 9, - 0, + 0 }; uint16 sc80_bub1_anim[] = { @@ -2365,7 +2382,7 @@ uint16 sc80_bub1_anim[] = { 244, 309, 6, - 0, + 0 }; uint16 sc80_swing[] = { @@ -2412,7 +2429,7 @@ uint16 sc80_swing[] = { 207, 136, 13, - 0, + 0 }; Compact sc80_spout = { @@ -2434,6 +2451,17 @@ Compact sc80_spout = { 312-290, // mouseSize_x 258-225, // mouseSize_y SC80_SPOUT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact sc80_bubble4 = { @@ -2465,6 +2493,7 @@ Compact sc80_bubble4 = { C_BASE_MODE, // mode SC80_BUBBLE4_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc80_goo_anim[] = { @@ -2538,7 +2567,7 @@ uint16 sc80_goo_anim[] = { 300, 261, 0, - 0, + 0 }; Compact sc80_bubble7 = { @@ -2570,6 +2599,7 @@ Compact sc80_bubble7 = { C_BASE_MODE, // mode SC80_BUBBLE7_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc80_bubble9 = { @@ -2601,6 +2631,7 @@ Compact sc80_bubble9 = { C_BASE_MODE, // mode SC80_BUBBLE9_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc80_sample_fall[] = { @@ -2740,7 +2771,7 @@ uint16 sc80_sample_fall[] = { 288, 248, 0, - 0, + 0 }; Compact sc80_rope = { @@ -2772,6 +2803,7 @@ Compact sc80_rope = { C_BASE_MODE, // mode SC80_ROPE_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc80_bubble3 = { @@ -2803,6 +2835,7 @@ Compact sc80_bubble3 = { C_BASE_MODE, // mode SC80_BUBBLE3_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc80_bubble8 = { @@ -2834,6 +2867,7 @@ Compact sc80_bubble8 = { C_BASE_MODE, // mode SC80_BUBBLE8_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc80_drop[] = { @@ -2973,7 +3007,7 @@ uint16 sc80_drop[] = { 289, 165, 1, - 0, + 0 }; uint16 reset_79_80[] = { @@ -2981,7 +3015,7 @@ uint16 reset_79_80[] = { 80, C_PLACE, ID_SC80_SPOUT, - 65535, + 65535 }; Compact sc80_ladder = { @@ -3003,6 +3037,17 @@ Compact sc80_ladder = { 316-310, // mouseSize_x 190-162, // mouseSize_y SC80_LADDER_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc804_palette[] = { @@ -3389,7 +3434,7 @@ uint16 sc804_palette[] = { 14392, 14392, 14392, - 14392, + 14392 }; Compact sc80_bubble12 = { @@ -3421,6 +3466,7 @@ Compact sc80_bubble12 = { C_BASE_MODE, // mode SC80_BUBBLE12_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc80_bubble6 = { @@ -3452,6 +3498,7 @@ Compact sc80_bubble6 = { C_BASE_MODE, // mode SC80_BUBBLE6_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc80_bubble5 = { @@ -3483,6 +3530,7 @@ Compact sc80_bubble5 = { C_BASE_MODE, // mode SC80_BUBBLE5_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc80_goo = { @@ -3514,6 +3562,7 @@ Compact sc80_goo = { C_BASE_MODE, // mode SC80_GOO_LOGIC, // baseSub 0, // baseSub_off + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/81comp.h b/sky/compacts/81comp.h index 2ef0744878..a78414b94a 100644 --- a/sky/compacts/81comp.h +++ b/sky/compacts/81comp.h @@ -56,6 +56,7 @@ Compact sc81_big_tent3 = { C_BASE_MODE, // mode SC81_BIG_TENT3_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc81_fos_squirm[] = { @@ -198,7 +199,7 @@ uint16 sc81_fos_squirm[] = { 255, 212, 1, - 0, + 0 }; uint16 sc81_tentwig1[] = { @@ -233,7 +234,7 @@ uint16 sc81_tentwig1[] = { 231, 235, 2, - 0, + 0 }; uint16 sc81_ken_helm_dn[] = { @@ -259,7 +260,7 @@ uint16 sc81_ken_helm_dn[] = { 264, 212, 6, - 0, + 0 }; uint16 sc81_tentwig2[] = { @@ -294,7 +295,7 @@ uint16 sc81_tentwig2[] = { 225, 258, 7, - 0, + 0 }; uint16 sc81_fast_list[] = { @@ -306,7 +307,7 @@ uint16 sc81_fast_list[] = { 170+DISK_10, 203+DISK_10, 268+DISK_10, - 0, + 0 }; Compact sc81_tent5 = { @@ -338,6 +339,7 @@ Compact sc81_tent5 = { C_BASE_MODE, // mode SC81_TENT5_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc81_helmet = { @@ -350,6 +352,26 @@ Compact sc81_helmet = { 264, // xcood 212, // ycood 174*64, // frame + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc81_ken_sit[] = { @@ -426,7 +448,7 @@ uint16 sc81_ken_sit[] = { 261, 226, 23, - 0, + 0 }; uint16 sc81_palette[] = { @@ -813,7 +835,7 @@ uint16 sc81_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc81_dad_helm_up[] = { @@ -836,7 +858,7 @@ uint16 sc81_dad_helm_up[] = { 264, 212, 5, - 0, + 0 }; Compact sc81_tent2 = { @@ -868,12 +890,13 @@ Compact sc81_tent2 = { C_BASE_MODE, // mode SC81_TENT2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc83_draw_list[] = { ID_SC81_FATHER, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc81_tentwig5[] = { @@ -908,7 +931,7 @@ uint16 sc81_tentwig5[] = { 295, 248, 9, - 0, + 0 }; Compact sc81_chair = { @@ -930,6 +953,17 @@ Compact sc81_chair = { 282-256, // mouseSize_x 268-221, // mouseSize_y SC81_CHAIR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc81_chip_list[] = { @@ -967,7 +1001,7 @@ uint16 sc81_chip_list[] = { 202+DISK_10+0X8000, 204+DISK_10, 205+DISK_10, - 0, + 0 }; uint32 *grid81 = 0; @@ -1004,7 +1038,7 @@ uint16 sc81_tentwig6[] = { 308, 283, 8, - 0, + 0 }; Compact sc81_ken_sat = { @@ -1017,6 +1051,26 @@ Compact sc81_ken_sat = { 261, // xcood 226, // ycood 196*64, // frame + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc81_tentdrop2[] = { @@ -1069,7 +1123,7 @@ uint16 sc81_tentdrop2[] = { 218, 171, 10, - 0, + 0 }; uint16 sc81_ken_walk2[] = { @@ -1113,7 +1167,7 @@ uint16 sc81_ken_walk2[] = { 263, 244, 12, - 0, + 0 }; Compact sc81_foster_sat = { @@ -1126,6 +1180,26 @@ Compact sc81_foster_sat = { 256, // xcood 225, // ycood 200*64, // frame + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc81_tentdrop1[] = { @@ -1178,7 +1252,7 @@ uint16 sc81_tentdrop1[] = { 218, 137, 14, - 0, + 0 }; Compact sc81_father_sat = { @@ -1191,6 +1265,26 @@ Compact sc81_father_sat = { 256, // xcood 225, // ycood 172*64, // frame + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc81_tentwig4[] = { @@ -1225,7 +1319,7 @@ uint16 sc81_tentwig4[] = { 305, 212, 0, - 0, + 0 }; uint16 sc81_ken_walk1[] = { @@ -1287,7 +1381,7 @@ uint16 sc81_ken_walk1[] = { 232, 244, 11, - 0, + 0 }; uint16 reset_dad_spec[] = { @@ -1297,7 +1391,7 @@ uint16 reset_dad_spec[] = { 182, C_FRAME, 171*64, - 65535, + 65535 }; uint16 sc81_mouse_list[] = { @@ -1305,7 +1399,7 @@ uint16 sc81_mouse_list[] = { ID_SC81_FATHER, ID_SC81_CHAIR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 sc81_dad_breath1[] = { @@ -1370,7 +1464,7 @@ uint16 sc81_dad_breath1[] = { 270, 256, 0, - 0, + 0 }; uint16 sc81_fos_helm_dn[] = { @@ -1393,7 +1487,7 @@ uint16 sc81_fos_helm_dn[] = { 264, 212, 5, - 0, + 0 }; uint16 sc81_dad_fall2[] = { @@ -1437,7 +1531,7 @@ uint16 sc81_dad_fall2[] = { 278, 258, 9, - 0, + 0 }; Compact sc81_door = { @@ -1469,6 +1563,7 @@ Compact sc81_door = { C_BASE_MODE, // mode SC81_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc81_big_tent1 = { @@ -1500,6 +1595,7 @@ Compact sc81_big_tent1 = { C_BASE_MODE, // mode SC81_BIG_TENT1_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc81_tent1 = { @@ -1531,6 +1627,7 @@ Compact sc81_tent1 = { C_BASE_MODE, // mode SC81_TENT1_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc81_tent4 = { @@ -1562,6 +1659,7 @@ Compact sc81_tent4 = { C_BASE_MODE, // mode SC81_TENT4_LOGIC, // baseSub 0, // baseSub_off + 0 }; ExtCompact sc81_father_ext = { @@ -1590,6 +1688,10 @@ ExtCompact sc81_father_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc81_father = { @@ -1621,7 +1723,7 @@ Compact sc81_father = { C_BASE_MODE, // mode SC81_FATHER_CHAIR_LOGIC, // baseSub 0, // baseSub_off - &sc81_father_ext, + &sc81_father_ext }; uint16 sc81_door_close[] = { @@ -1647,7 +1749,7 @@ uint16 sc81_door_close[] = { 166, 200, 6, - 0, + 0 }; uint16 sc81_dad_breath2[] = { @@ -1712,7 +1814,7 @@ uint16 sc81_dad_breath2[] = { 270, 256, 0, - 0, + 0 }; uint16 sc81_tentwig3[] = { @@ -1747,7 +1849,7 @@ uint16 sc81_tentwig3[] = { 223, 277, 9, - 0, + 0 }; uint16 sc81_father_die[] = { @@ -1797,7 +1899,7 @@ uint16 sc81_father_die[] = { 278, 256, 8, - 0, + 0 }; uint16 reset_ken_81[] = { @@ -1825,7 +1927,7 @@ uint16 reset_ken_81[] = { 0, C_SP_COLOUR, SP_COL_KEN81, - 65535, + 65535 }; uint16 reset_80_81[] = { @@ -1839,7 +1941,7 @@ uint16 reset_80_81[] = { 46+12*64, C_DIR, RIGHT, - 65535, + 65535 }; uint16 sc81_dad_fall1[] = { @@ -1976,7 +2078,7 @@ uint16 sc81_dad_fall1[] = { 289, 276, 26, - 0, + 0 }; uint16 sc81_ken_jump_in[] = { @@ -2026,7 +2128,7 @@ uint16 sc81_ken_jump_in[] = { 227, 209, 14, - 0, + 0 }; uint16 sc81_logic_list[] = { @@ -2049,7 +2151,7 @@ uint16 sc81_logic_list[] = { ID_SC81_BIG_TENT3, ID_SC67_PULSE1, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; Compact sc81_big_tent2 = { @@ -2081,6 +2183,7 @@ Compact sc81_big_tent2 = { C_BASE_MODE, // mode SC81_BIG_TENT2_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc81_tent3 = { @@ -2112,6 +2215,7 @@ Compact sc81_tent3 = { C_BASE_MODE, // mode SC81_TENT3_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc81_tentdrop3[] = { @@ -2164,7 +2268,7 @@ uint16 sc81_tentdrop3[] = { 218, 239, 8, - 0, + 0 }; Compact sc81_tent6 = { @@ -2196,6 +2300,7 @@ Compact sc81_tent6 = { C_BASE_MODE, // mode SC81_TENT6_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc83_palette[] = { @@ -2582,7 +2687,7 @@ uint16 sc83_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 reset_foster_spec[] = { @@ -2592,7 +2697,7 @@ uint16 reset_foster_spec[] = { 248, C_FRAME, 42+12*64, - 65535, + 65535 }; uint16 sc81_foster_sit[] = { @@ -2654,7 +2759,7 @@ uint16 sc81_foster_sit[] = { 259, 225, 18, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/82comp.h b/sky/compacts/82comp.h index 287090e6c3..c28ae9ed03 100644 --- a/sky/compacts/82comp.h +++ b/sky/compacts/82comp.h @@ -71,7 +71,7 @@ uint16 sc82_push_button[] = { 312, 200, 0, - 0, + 0 }; ExtCompact sc82_jobsworth_ext = { @@ -100,6 +100,10 @@ ExtCompact sc82_jobsworth_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact sc82_jobsworth = { @@ -131,7 +135,7 @@ Compact sc82_jobsworth = { C_BASE_MODE, // mode SC82_JOBSWORTH_LOGIC, // baseSub 0, // baseSub_off - &sc82_jobsworth_ext, + &sc82_jobsworth_ext }; uint16 reset_foster_82[] = { @@ -145,7 +149,7 @@ uint16 reset_foster_82[] = { 42+12*64, C_DIR, LEFT, - 65535, + 65535 }; uint16 sc82_jobs_turn[] = { @@ -162,7 +166,7 @@ uint16 sc82_jobs_turn[] = { 312, 200, 3, - 0, + 0 }; uint16 sc82_jobs_take[] = { @@ -209,7 +213,7 @@ uint16 sc82_jobs_take[] = { 312, 200, 0, - 0, + 0 }; uint16 sc82_logic_list[] = { @@ -217,19 +221,19 @@ uint16 sc82_logic_list[] = { ID_KEN, ID_SC82_JOBSWORTH, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; uint16 sc82_fast_list[] = { 12+DISK_7, 51+DISK_7, - 0, + 0 }; uint32 *grid82 = 0; uint16 sc82_mouse_list[] = { - 0, + 0 }; uint16 reset_ken_82[] = { @@ -249,7 +253,7 @@ uint16 reset_ken_82[] = { SC82_KEN_LOGIC, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint16 sc82_chip_list[] = { @@ -263,7 +267,7 @@ uint16 sc82_chip_list[] = { 213+DISK_7, 214+DISK_7, 215+DISK_7, - 0, + 0 }; uint16 sc82_palette[] = { @@ -650,7 +654,7 @@ uint16 sc82_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc82_foster_give[] = { @@ -688,7 +692,7 @@ uint16 sc82_foster_give[] = { 342, 200, 0, - 0, + 0 }; uint16 sc82_jobs_return[] = { @@ -705,7 +709,7 @@ uint16 sc82_jobs_return[] = { 1, 1, 0, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/85comp.h b/sky/compacts/85comp.h index 2fc9d29e82..44d9cfcb48 100644 --- a/sky/compacts/85comp.h +++ b/sky/compacts/85comp.h @@ -411,27 +411,27 @@ uint16 sc85_palette[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 sc85_mouse_list[] = { - 0, + 0 }; uint16 sc85_chip_list[] = { - 0, + 0 }; uint16 sc85_fast_list[] = { 14+DISK_7, 15+DISK_7, - 0, + 0 }; uint16 sc85_logic_list[] = { ID_FOSTER, 0XFFFF, - ID_STD_MENU_LOGIC, + ID_STD_MENU_LOGIC }; }; // namespace SkyCompact diff --git a/sky/compacts/90comp.h b/sky/compacts/90comp.h index 3a51a030b3..37de7f82eb 100644 --- a/sky/compacts/90comp.h +++ b/sky/compacts/90comp.h @@ -64,6 +64,7 @@ Compact door_r90f = { C_BASE_MODE, // mode DOOR_R90F_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact door_r90 = { @@ -95,6 +96,7 @@ Compact door_r90 = { C_BASE_MODE, // mode DOOR_R90_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc90_floor_table[] = { @@ -112,7 +114,7 @@ uint16 sc90_floor_table[] = { RET_FAIL, ID_EYEBALL_90, GET_TO_EYEBALL_90, - 65535, + 65535 }; Compact sc90_floor = { @@ -134,6 +136,17 @@ Compact sc90_floor = { 269, // mouseSize_x 53, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc90_smfloor_table[] = { @@ -151,7 +164,7 @@ uint16 sc90_smfloor_table[] = { GET_TO_OSCILLATOR, ID_EYEBALL_90, RET_FAIL, - 65535, + 65535 }; uint16 eye90_zap_anim[] = { @@ -174,7 +187,7 @@ uint16 eye90_zap_anim[] = { 247, 206, 5, - 0, + 0 }; uint16 door_l90_anim[] = { @@ -248,7 +261,7 @@ uint16 door_l90_anim[] = { 212, 136, 22, - 0, + 0 }; Compact door_l90 = { @@ -280,6 +293,7 @@ Compact door_l90 = { C_BASE_MODE, // mode DOOR_L90_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 get_join[] = { @@ -302,7 +316,7 @@ uint16 get_join[] = { 336, 272, 5, - 0, + 0 }; uint16 sc90_mouse[] = { @@ -316,7 +330,7 @@ uint16 sc90_mouse[] = { ID_SC90_SMFLOOR, ID_SC90_FLOOR, 0XFFFF, - ID_LINC_MENU_MOUSE, + ID_LINC_MENU_MOUSE }; uint16 door_l90f_anim[] = { @@ -390,7 +404,7 @@ uint16 door_l90f_anim[] = { 207, 136, 22, - 0, + 0 }; uint16 sc90_logic[] = { @@ -403,7 +417,7 @@ uint16 sc90_logic[] = { ID_DOOR_R90F, ID_EYEBALL_90, 0XFFFF, - ID_LINC_MENU_LOGIC, + ID_LINC_MENU_LOGIC }; uint16 eye_90_table[] = { @@ -598,7 +612,7 @@ uint16 eye_90_table[] = { 8, 9, 9, - 10, + 10 }; Compact eyeball_90 = { @@ -630,6 +644,7 @@ Compact eyeball_90 = { C_BASE_MODE, // mode EYEBALL_90_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact sc90_smfloor = { @@ -651,6 +666,17 @@ Compact sc90_smfloor = { 69, // mouseSize_x 11, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact join_object = { @@ -682,6 +708,7 @@ Compact join_object = { C_BASE_MODE, // mode JOIN_OBJECT_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact door_l90f = { @@ -713,6 +740,7 @@ Compact door_l90f = { C_BASE_MODE, // mode DOOR_L90F_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact oscillator = { @@ -744,6 +772,7 @@ Compact oscillator = { C_BASE_MODE, // mode OSCILLATOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_90_91[] = { @@ -755,7 +784,7 @@ uint16 rs_foster_90_91[] = { 184, C_YCOOD, 264, - 65535, + 65535 }; uint16 rs_foster_90_94[] = { @@ -769,7 +798,7 @@ uint16 rs_foster_90_94[] = { 264, C_DIR, DOWN, - 65535, + 65535 }; uint16 door_r90_anim[] = { @@ -843,7 +872,7 @@ uint16 door_r90_anim[] = { 360, 136, 22, - 0, + 0 }; uint16 door_r90f_anim[] = { @@ -917,7 +946,7 @@ uint16 door_r90f_anim[] = { 364, 136, 22, - 0, + 0 }; uint16 get_oscill[] = { @@ -943,7 +972,7 @@ uint16 get_oscill[] = { 241, 259, 5, - 0, + 0 }; uint16 blind_eye[] = { @@ -972,7 +1001,7 @@ uint16 blind_eye[] = { 268, 221, 7, - 0, + 0 }; uint16 see_eye[] = { @@ -1007,7 +1036,7 @@ uint16 see_eye[] = { 270, 223, 9, - 0, + 0 }; uint16 pal90[] = { @@ -1394,7 +1423,7 @@ uint16 pal90[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 pal90a[] = { @@ -1429,7 +1458,7 @@ uint16 pal90a[] = { 2304, 1536, 3737, - 895, + 895 }; uint16 pal90b[] = { @@ -1464,7 +1493,7 @@ uint16 pal90b[] = { 2048, 1280, 2935, - 15, + 15 }; uint16 chip_list_sc90[] = { @@ -1475,7 +1504,7 @@ uint16 chip_list_sc90[] = { IT_DOOR_R90+DISK_4, IT_DOOR_R90F+DISK_4, IT_FOST_DIE90+DISK_4, - 0, + 0 }; uint16 get_eye[] = { @@ -1501,7 +1530,7 @@ uint16 get_eye[] = { 276, 147, 0, - 0, + 0 }; uint16 fost_die90[] = { @@ -1563,7 +1592,7 @@ uint16 fost_die90[] = { 150, 198, 17, - 0, + 0 }; void *data_6[] = { @@ -1823,7 +1852,7 @@ void *data_6[] = { &report2_menu, &adjust2_menu, linc_menu_logic, - linc_menu_mouse, + linc_menu_mouse }; uint32 *sec6_compacts = 0; diff --git a/sky/compacts/91comp.h b/sky/compacts/91comp.h index c1f840c56a..170b71a671 100644 --- a/sky/compacts/91comp.h +++ b/sky/compacts/91comp.h @@ -56,6 +56,7 @@ Compact decomp_obj = { C_BASE_MODE, // mode DECOMP_OBJ_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact door_r91 = { @@ -87,6 +88,7 @@ Compact door_r91 = { C_BASE_MODE, // mode DOOR_R91_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc91_mouse[] = { @@ -101,7 +103,7 @@ uint16 sc91_mouse[] = { ID_DOOR_T91, ID_SC91_FLOOR, 0XFFFF, - ID_LINC_MENU_MOUSE, + ID_LINC_MENU_MOUSE }; uint16 get_decomp[] = { @@ -130,7 +132,7 @@ uint16 get_decomp[] = { 244, 281, 7, - 0, + 0 }; uint16 eye_91_table[] = { @@ -325,7 +327,7 @@ uint16 eye_91_table[] = { 10, 10, 10, - 10, + 10 }; Compact door_l91f = { @@ -357,6 +359,7 @@ Compact door_l91f = { C_BASE_MODE, // mode DOOR_L91F_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 door_r91f_anim[] = { @@ -391,7 +394,7 @@ uint16 door_r91f_anim[] = { 374, 136, 9, - 0, + 0 }; Compact report_book = { @@ -423,6 +426,7 @@ Compact report_book = { C_BASE_MODE, // mode REPORT_BOOK_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 get_report[] = { @@ -454,7 +458,7 @@ uint16 get_report[] = { 359, 277, 7, - 0, + 0 }; uint16 chip_list_sc91[] = { @@ -469,7 +473,7 @@ uint16 chip_list_sc91[] = { IT_DOOR_T91R+DISK_4, IT_EYE91_ZAP+DISK_4, IT_FOST_DIE91+DISK_4+0X8000, - 0, + 0 }; uint16 sc91_floor_table[] = { @@ -491,7 +495,7 @@ uint16 sc91_floor_table[] = { GET_TO_REPORT_BOOK, ID_EYEBALL_91, GET_TO_EYEBALL_91, - 65535, + 65535 }; Compact sc91_floor = { @@ -513,6 +517,17 @@ Compact sc91_floor = { 269, // mouseSize_x 53, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact bag_91 = { @@ -544,6 +559,7 @@ Compact bag_91 = { C_BASE_MODE, // mode BAG_91_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 door_r91_anim[] = { @@ -578,7 +594,7 @@ uint16 door_r91_anim[] = { 370, 136, 9, - 0, + 0 }; uint16 rs_foster_91_95[] = { @@ -594,7 +610,7 @@ uint16 rs_foster_91_95[] = { 46+182*64, C_DIR, 3, - 65535, + 65535 }; uint16 door_l91_anim[] = { @@ -629,7 +645,7 @@ uint16 door_l91_anim[] = { 204, 136, 9, - 0, + 0 }; uint16 pal91[] = { @@ -1016,7 +1032,7 @@ uint16 pal91[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 get_decrypt[] = { @@ -1045,7 +1061,7 @@ uint16 get_decrypt[] = { 277, 281, 6, - 0, + 0 }; Compact door_t91 = { @@ -1077,6 +1093,7 @@ Compact door_t91 = { C_BASE_MODE, // mode DOOR_T91_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact door_l91 = { @@ -1108,6 +1125,7 @@ Compact door_l91 = { C_BASE_MODE, // mode DOOR_L91_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_91_92[] = { @@ -1119,7 +1137,7 @@ uint16 rs_foster_91_92[] = { 128, C_YCOOD, 304, - 65535, + 65535 }; uint16 fost_die91[] = { @@ -1193,7 +1211,7 @@ uint16 fost_die91[] = { 306, 158, 21, - 0, + 0 }; uint16 rs_foster_91_90[] = { @@ -1205,7 +1223,7 @@ uint16 rs_foster_91_90[] = { 384, C_YCOOD, 256, - 65535, + 65535 }; uint16 sc91_logic[] = { @@ -1222,7 +1240,7 @@ uint16 sc91_logic[] = { ID_EYEBALL_90, ID_EYEBALL_91, 0XFFFF, - ID_LINC_MENU_LOGIC, + ID_LINC_MENU_LOGIC }; Compact eyeball_91 = { @@ -1254,6 +1272,7 @@ Compact eyeball_91 = { C_BASE_MODE, // mode EYEBALL_91_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 fast_list_sc91[] = { @@ -1275,7 +1294,7 @@ uint16 fast_list_sc91[] = { IT_SC91_LAYER_0+DISK_4, IT_SC91_LAYER_1+DISK_4, IT_SC91_GRID_1+DISK_4, - 0, + 0 }; Compact door_t91r = { @@ -1307,6 +1326,7 @@ Compact door_t91r = { C_BASE_MODE, // mode DOOR_T91R_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 door_l91f_anim[] = { @@ -1341,7 +1361,7 @@ uint16 door_l91f_anim[] = { 199, 136, 9, - 0, + 0 }; Compact decrypt_obj = { @@ -1373,6 +1393,7 @@ Compact decrypt_obj = { C_BASE_MODE, // mode DECRYPT_OBJ_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 door_t91_anim[] = { @@ -1407,7 +1428,7 @@ uint16 door_t91_anim[] = { 276, 136, 9, - 0, + 0 }; uint16 door_t91r_anim[] = { @@ -1442,7 +1463,7 @@ uint16 door_t91r_anim[] = { 301, 136, 9, - 0, + 0 }; uint16 eye91_zap_anim[] = { @@ -1462,7 +1483,7 @@ uint16 eye91_zap_anim[] = { 222, 206, 4, - 0, + 0 }; Compact door_r91f = { @@ -1494,6 +1515,7 @@ Compact door_r91f = { C_BASE_MODE, // mode DOOR_R91F_LOGIC, // baseSub 0, // baseSub_off + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/92comp.h b/sky/compacts/92comp.h index 52c015377d..69fc89fd18 100644 --- a/sky/compacts/92comp.h +++ b/sky/compacts/92comp.h @@ -56,6 +56,7 @@ Compact bridge_e = { C_BASE_MODE, // mode BRIDGE_E_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact door_l92 = { @@ -87,6 +88,7 @@ Compact door_l92 = { C_BASE_MODE, // mode DOOR_L92_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 slab8_table[] = { @@ -100,7 +102,7 @@ uint16 slab8_table[] = { GET_TO_SLAB, ID_SLAB8, RET_OK, - 65535, + 65535 }; Compact slab8 = { @@ -132,6 +134,7 @@ Compact slab8 = { C_BASE_MODE, // mode SLAB8_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 slab3_table[] = { @@ -145,7 +148,7 @@ uint16 slab3_table[] = { RET_OK, ID_SLAB6, GET_TO_SLAB, - 65535, + 65535 }; uint16 slab2_table[] = { @@ -161,7 +164,7 @@ uint16 slab2_table[] = { GET_TO_SLAB, ID_SLAB5, GET_TO_SLAB, - 65535, + 65535 }; uint16 slab4_table[] = { @@ -177,7 +180,7 @@ uint16 slab4_table[] = { GET_TO_SLAB, ID_SLAB7, GET_TO_SLAB, - 65535, + 65535 }; Compact slab4 = { @@ -209,6 +212,7 @@ Compact slab4 = { C_BASE_MODE, // mode SLAB4_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 door_l92_anim[] = { @@ -282,7 +286,7 @@ uint16 door_l92_anim[] = { 152, 136, 22, - 0, + 0 }; uint16 door_r92_anim[] = { @@ -356,7 +360,7 @@ uint16 door_r92_anim[] = { 323, 136, 22, - 0, + 0 }; uint16 slab6_table[] = { @@ -372,7 +376,7 @@ uint16 slab6_table[] = { RET_OK, ID_SLAB9, GET_TO_SLAB, - 65535, + 65535 }; Compact slab6 = { @@ -404,6 +408,7 @@ Compact slab6 = { C_BASE_MODE, // mode SLAB6_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact door_r92 = { @@ -435,6 +440,7 @@ Compact door_r92 = { C_BASE_MODE, // mode DOOR_R92_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact bridge_h = { @@ -466,6 +472,7 @@ Compact bridge_h = { C_BASE_MODE, // mode BRIDGE_H_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact bridge_f = { @@ -497,6 +504,7 @@ Compact bridge_f = { C_BASE_MODE, // mode BRIDGE_F_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 slab7_table[] = { @@ -510,7 +518,7 @@ uint16 slab7_table[] = { RET_OK, ID_SLAB8, GET_TO_SLAB, - 65535, + 65535 }; Compact bridge_a = { @@ -542,6 +550,7 @@ Compact bridge_a = { C_BASE_MODE, // mode BRIDGE_A_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 door_r92r_anim[] = { @@ -615,7 +624,7 @@ uint16 door_r92r_anim[] = { 348, 136, 22, - 0, + 0 }; Compact bridge_g = { @@ -647,6 +656,7 @@ Compact bridge_g = { C_BASE_MODE, // mode BRIDGE_G_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact door_l92f = { @@ -678,6 +688,7 @@ Compact door_l92f = { C_BASE_MODE, // mode DOOR_L92F_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact bridge_b = { @@ -709,6 +720,7 @@ Compact bridge_b = { C_BASE_MODE, // mode BRIDGE_B_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 slab9_table[] = { @@ -718,7 +730,7 @@ uint16 slab9_table[] = { RET_OK, ID_DOOR_R92, GET_TO_DOOR_R92, - 65535, + 65535 }; uint16 slab1_table[] = { @@ -734,7 +746,7 @@ uint16 slab1_table[] = { GET_TO_SLAB, ID_DOOR_L92, GET_TO_DOOR_L92, - 65535, + 65535 }; Compact slab1 = { @@ -766,6 +778,7 @@ Compact slab1 = { C_BASE_MODE, // mode SLAB1_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact red_circle = { @@ -797,6 +810,7 @@ Compact red_circle = { C_BASE_MODE, // mode RED_CIRCLE_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact slab2 = { @@ -828,6 +842,7 @@ Compact slab2 = { C_BASE_MODE, // mode SLAB2_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc92_logic[] = { @@ -857,7 +872,7 @@ uint16 sc92_logic[] = { ID_DOOR_R92R, ID_EYEBALL_90, 0XFFFF, - ID_LINC_MENU_LOGIC, + ID_LINC_MENU_LOGIC }; uint16 chip_list_sc92[] = { @@ -867,7 +882,7 @@ uint16 chip_list_sc92[] = { IT_DOOR_L92F+DISK_4, IT_DOOR_R92+DISK_4, IT_DOOR_R92R+DISK_4, - 0, + 0 }; uint16 pal92[] = { @@ -1254,7 +1269,7 @@ uint16 pal92[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 fast_list_sc92[] = { @@ -1270,7 +1285,7 @@ uint16 fast_list_sc92[] = { IT_SC92_LAYER_0+DISK_4, IT_SC92_LAYER_1+DISK_4, IT_SC92_GRID_1+DISK_4, - 0, + 0 }; uint16 door_l92f_anim[] = { @@ -1344,7 +1359,7 @@ uint16 door_l92f_anim[] = { 147, 136, 22, - 0, + 0 }; Compact slab9 = { @@ -1376,6 +1391,7 @@ Compact slab9 = { C_BASE_MODE, // mode SLAB9_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact door_r92r = { @@ -1407,6 +1423,7 @@ Compact door_r92r = { C_BASE_MODE, // mode DOOR_R92R_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 slab5_table[] = { @@ -1424,7 +1441,7 @@ uint16 slab5_table[] = { GET_TO_SLAB, ID_SLAB8, GET_TO_SLAB, - 65535, + 65535 }; Compact slab5 = { @@ -1456,6 +1473,7 @@ Compact slab5 = { C_BASE_MODE, // mode SLAB5_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact slab7 = { @@ -1487,6 +1505,7 @@ Compact slab7 = { C_BASE_MODE, // mode SLAB7_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc92_mouse[] = { @@ -1504,7 +1523,7 @@ uint16 sc92_mouse[] = { ID_SLAB8, ID_SLAB9, 0XFFFF, - ID_LINC_MENU_MOUSE, + ID_LINC_MENU_MOUSE }; uint16 rs_foster_92_93[] = { @@ -1520,7 +1539,7 @@ uint16 rs_foster_92_93[] = { 46+182*64, C_DIR, RIGHT, - 65535, + 65535 }; Compact green_circle = { @@ -1552,6 +1571,7 @@ Compact green_circle = { C_BASE_MODE, // mode GREEN_CIRCLE_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_92_91[] = { @@ -1563,7 +1583,7 @@ uint16 rs_foster_92_91[] = { 392, C_YCOOD, 264, - 65535, + 65535 }; Compact bridge_c = { @@ -1595,6 +1615,7 @@ Compact bridge_c = { C_BASE_MODE, // mode BRIDGE_C_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact bridge_d = { @@ -1626,6 +1647,7 @@ Compact bridge_d = { C_BASE_MODE, // mode BRIDGE_D_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact slab3 = { @@ -1657,6 +1679,7 @@ Compact slab3 = { C_BASE_MODE, // mode SLAB3_LOGIC, // baseSub 0, // baseSub_off + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/93comp.h b/sky/compacts/93comp.h index 4459aa7d60..a352fa51e7 100644 --- a/sky/compacts/93comp.h +++ b/sky/compacts/93comp.h @@ -44,7 +44,7 @@ uint16 get_adjust[] = { 370, 284, 4, - 0, + 0 }; Compact door_l93 = { @@ -76,6 +76,7 @@ Compact door_l93 = { C_BASE_MODE, // mode DOOR_L93_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc93_mouse[] = { @@ -85,7 +86,7 @@ uint16 sc93_mouse[] = { ID_DOOR_L93F, ID_SC93_FLOOR, 0XFFFF, - ID_LINC_MENU_MOUSE, + ID_LINC_MENU_MOUSE }; Compact adjust_book = { @@ -117,6 +118,7 @@ Compact adjust_book = { C_BASE_MODE, // mode ADJUST_BOOK_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc93_floor_table[] = { @@ -128,7 +130,7 @@ uint16 sc93_floor_table[] = { GET_TO_PERSONA, ID_ADJUST_BOOK, GET_TO_ADJUST_BOOK, - 65535, + 65535 }; uint16 sc93_logic[] = { @@ -139,7 +141,7 @@ uint16 sc93_logic[] = { ID_DOOR_L93F, ID_EYEBALL_90, 0XFFFF, - ID_LINC_MENU_LOGIC, + ID_LINC_MENU_LOGIC }; Compact door_l93f = { @@ -171,6 +173,7 @@ Compact door_l93f = { C_BASE_MODE, // mode DOOR_L93F_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_93_92[] = { @@ -184,7 +187,7 @@ uint16 rs_foster_93_92[] = { 248, C_DIR, DOWN, - 65535, + 65535 }; Compact sc93_floor = { @@ -206,6 +209,17 @@ Compact sc93_floor = { 269, // mouseSize_x 52, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 chip_list_sc93[] = { @@ -213,7 +227,7 @@ uint16 chip_list_sc93[] = { IT_ADJUST_BOOK+DISK_4, IT_DOOR_L93+DISK_4, IT_DOOR_L93F+DISK_4, - 0, + 0 }; uint16 door_l93f_anim[] = { @@ -287,7 +301,7 @@ uint16 door_l93f_anim[] = { 200, 136, 22, - 0, + 0 }; uint16 get_persona[] = { @@ -310,7 +324,7 @@ uint16 get_persona[] = { 342, 250, 5, - 0, + 0 }; uint16 fast_list_sc93[] = { @@ -324,7 +338,7 @@ uint16 fast_list_sc93[] = { IT_SC93_LAYER_0+DISK_4, IT_SC93_LAYER_1+DISK_4, IT_SC93_GRID_1+DISK_4, - 0, + 0 }; uint16 door_l93_anim[] = { @@ -398,7 +412,7 @@ uint16 door_l93_anim[] = { 205, 136, 22, - 0, + 0 }; Compact persona = { @@ -430,6 +444,7 @@ Compact persona = { C_BASE_MODE, // mode PERSONA_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 pal93[] = { @@ -816,7 +831,7 @@ uint16 pal93[] = { 1285, 285, 16129, - 16191, + 16191 }; }; // namespace SkyCompact diff --git a/sky/compacts/94comp.h b/sky/compacts/94comp.h index cba07bcd28..5592a4930c 100644 --- a/sky/compacts/94comp.h +++ b/sky/compacts/94comp.h @@ -101,7 +101,7 @@ uint16 door_l94_anim[] = { 202, 136, 23, - 0, + 0 }; uint16 holo1_a_anim[] = { @@ -130,7 +130,7 @@ uint16 holo1_a_anim[] = { 231, 176, 7, - 0, + 0 }; uint16 sc94_floor_table[] = { @@ -142,7 +142,7 @@ uint16 sc94_floor_table[] = { GET_TO_DOOR_R94, ID_HOLOGRAM_PAD, GET_TO_HOLOGRAM_PAD, - 65535, + 65535 }; Compact sc94_floor = { @@ -164,6 +164,17 @@ Compact sc94_floor = { 270, // mouseSize_x 52, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 fast_list_sc94[] = { @@ -179,7 +190,7 @@ uint16 fast_list_sc94[] = { IT_SC94_LAYER_0+DISK_4, IT_HOLO1_A+0X8000+DISK_4, IT_HOLO1_B+DISK_4, - 0, + 0 }; uint16 holo3_anim[] = { @@ -199,7 +210,7 @@ uint16 holo3_anim[] = { 241, 191, 4, - 0, + 0 }; Compact door_r94 = { @@ -231,6 +242,7 @@ Compact door_r94 = { C_BASE_MODE, // mode DOOR_R94_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 sc94_logic[] = { @@ -243,7 +255,7 @@ uint16 sc94_logic[] = { ID_HOLOGRAM_B, ID_EYEBALL_90, 0XFFFF, - ID_LINC_MENU_LOGIC, + ID_LINC_MENU_LOGIC }; uint16 door_r94r_anim[] = { @@ -320,7 +332,7 @@ uint16 door_r94r_anim[] = { 372, 136, 23, - 0, + 0 }; Compact door_r94r = { @@ -352,6 +364,7 @@ Compact door_r94r = { C_BASE_MODE, // mode DOOR_R94R_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_94_90[] = { @@ -367,7 +380,7 @@ uint16 rs_foster_94_90[] = { 46+182*64, C_DIR, RIGHT, - 65535, + 65535 }; Compact door_l94r = { @@ -399,6 +412,7 @@ Compact door_l94r = { C_BASE_MODE, // mode DOOR_L94R_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_94_95[] = { @@ -412,7 +426,7 @@ uint16 rs_foster_94_95[] = { 256, C_DIR, DOWN, - 65535, + 65535 }; uint16 door_r94_anim[] = { @@ -489,7 +503,7 @@ uint16 door_r94_anim[] = { 345, 136, 23, - 0, + 0 }; uint16 chip_list_sc94[] = { @@ -500,7 +514,7 @@ uint16 chip_list_sc94[] = { IT_HOLO2_A+DISK_4, IT_HOLO2_B+DISK_4+0X8000, IT_HOLO3+0X8000+DISK_4, - 0, + 0 }; ExtCompact hologram_b_ext = { @@ -529,6 +543,10 @@ ExtCompact hologram_b_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact hologram_b = { @@ -560,7 +578,7 @@ Compact hologram_b = { C_BASE_MODE, // mode HOLOGRAM_B_LOGIC, // baseSub 0, // baseSub_off - &hologram_b_ext, + &hologram_b_ext }; uint16 holo1_b_anim[] = { @@ -589,7 +607,7 @@ uint16 holo1_b_anim[] = { 231, 234, 7, - 0, + 0 }; Compact door_l94 = { @@ -621,6 +639,7 @@ Compact door_l94 = { C_BASE_MODE, // mode DOOR_L94_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 door_l94r_anim[] = { @@ -697,7 +716,7 @@ uint16 door_l94r_anim[] = { 228, 136, 23, - 0, + 0 }; uint16 sc94_mouse[] = { @@ -706,7 +725,7 @@ uint16 sc94_mouse[] = { ID_DOOR_R94, ID_SC94_FLOOR, 0XFFFF, - ID_LINC_MENU_MOUSE, + ID_LINC_MENU_MOUSE }; uint16 anita_holo_talk[] = { @@ -904,7 +923,7 @@ uint16 anita_holo_talk[] = { 280, 225, 6, - 0, + 0 }; Compact hologram_pad = { @@ -926,6 +945,17 @@ Compact hologram_pad = { 41, // mouseSize_x 7, // mouseSize_y HOLOGRAM_PAD_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 pal94[] = { @@ -1312,7 +1342,7 @@ uint16 pal94[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact hologram_a = { @@ -1344,6 +1374,7 @@ Compact hologram_a = { C_BASE_MODE, // mode HOLOGRAM_A_LOGIC, // baseSub 0, // baseSub_off + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/95comp.h b/sky/compacts/95comp.h index 95c8f803c7..fa520194ad 100644 --- a/sky/compacts/95comp.h +++ b/sky/compacts/95comp.h @@ -42,7 +42,7 @@ uint16 fast_list_sc95[] = { IT_GUARDIAN+DISK_4, IT_WEIGHT+DISK_4+0X8000, IT_DOOR_L95F+DISK_4, - 0, + 0 }; uint16 weight_anim[] = { @@ -110,7 +110,7 @@ uint16 weight_anim[] = { 312, 176, 7, - 0, + 0 }; uint16 sc95_floor_table[] = { @@ -124,7 +124,7 @@ uint16 sc95_floor_table[] = { GET_TO_DOOR_T95, ID_GUARDIAN, GET_TO_GUARDIAN, - 65535, + 65535 }; uint16 door_r95_anim[] = { @@ -198,7 +198,7 @@ uint16 door_r95_anim[] = { 366, 136, 22, - 0, + 0 }; uint16 rs_foster_95_96[] = { @@ -210,7 +210,7 @@ uint16 rs_foster_95_96[] = { 184, C_YCOOD, 256, - 65535, + 65535 }; Compact door_r95f = { @@ -242,6 +242,7 @@ Compact door_r95f = { C_BASE_MODE, // mode DOOR_R95F_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 pal95[] = { @@ -628,7 +629,7 @@ uint16 pal95[] = { 1285, 285, 16129, - 16191, + 16191 }; uint16 chip_list_sc95[] = { @@ -637,7 +638,7 @@ uint16 chip_list_sc95[] = { IT_DOOR_R95F+DISK_4, IT_DOOR_T95+DISK_4, IT_DOOR_T95R+DISK_4, - 0, + 0 }; uint16 door_l95f_anim[] = { @@ -711,7 +712,7 @@ uint16 door_l95f_anim[] = { 199, 136, 22, - 0, + 0 }; uint16 sc95_logic[] = { @@ -727,7 +728,7 @@ uint16 sc95_logic[] = { ID_GUARDIAN, ID_WEIGHT, 0XFFFF, - ID_LINC_MENU_LOGIC, + ID_LINC_MENU_LOGIC }; Compact weight = { @@ -759,6 +760,7 @@ Compact weight = { C_BASE_MODE, // mode WEIGHT_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact guardian = { @@ -790,6 +792,7 @@ Compact guardian = { C_BASE_MODE, // mode GUARDIAN_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_95_91[] = { @@ -803,7 +806,7 @@ uint16 rs_foster_95_91[] = { 256, C_DIR, DOWN, - 65535, + 65535 }; uint16 sc95_mouse[] = { @@ -815,7 +818,7 @@ uint16 sc95_mouse[] = { ID_DOOR_T95, ID_SC95_FLOOR, 0XFFFF, - ID_LINC_MENU_MOUSE, + ID_LINC_MENU_MOUSE }; Compact door_r95 = { @@ -847,6 +850,7 @@ Compact door_r95 = { C_BASE_MODE, // mode DOOR_R95_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_95_94[] = { @@ -860,7 +864,7 @@ uint16 rs_foster_95_94[] = { 264, C_DIR, DOWN, - 65535, + 65535 }; Compact door_t95 = { @@ -892,6 +896,7 @@ Compact door_t95 = { C_BASE_MODE, // mode DOOR_T95_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 door_r95f_anim[] = { @@ -965,7 +970,7 @@ uint16 door_r95f_anim[] = { 370, 136, 22, - 0, + 0 }; Compact door_l95 = { @@ -997,6 +1002,7 @@ Compact door_l95 = { C_BASE_MODE, // mode DOOR_L95_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact door_l95f = { @@ -1028,6 +1034,7 @@ Compact door_l95f = { C_BASE_MODE, // mode DOOR_L95F_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 door_t95_anim[] = { @@ -1101,7 +1108,7 @@ uint16 door_t95_anim[] = { 276, 136, 22, - 0, + 0 }; uint16 door_t95r_anim[] = { @@ -1175,7 +1182,7 @@ uint16 door_t95r_anim[] = { 301, 136, 22, - 0, + 0 }; uint16 guardian_down[] = { @@ -1192,7 +1199,7 @@ uint16 guardian_down[] = { 1, 1, 0, - 0, + 0 }; Compact sc95_floor = { @@ -1214,6 +1221,17 @@ Compact sc95_floor = { 270, // mouseSize_x 52, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 guardian_up[] = { @@ -1230,7 +1248,7 @@ uint16 guardian_up[] = { 1, 1, 4, - 0, + 0 }; Compact door_t95r = { @@ -1262,6 +1280,7 @@ Compact door_t95r = { C_BASE_MODE, // mode DOOR_T95R_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 door_l95_anim[] = { @@ -1335,7 +1354,7 @@ uint16 door_l95_anim[] = { 204, 136, 22, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/96comp.h b/sky/compacts/96comp.h index 9993e938aa..99001fbebe 100644 --- a/sky/compacts/96comp.h +++ b/sky/compacts/96comp.h @@ -33,7 +33,7 @@ uint16 sc96_mouse[] = { ID_DOOR_L96, ID_SC96_FLOOR, 0XFFFF, - ID_LINC_MENU_MOUSE, + ID_LINC_MENU_MOUSE }; uint16 door_l96f_anim[] = { @@ -107,7 +107,7 @@ uint16 door_l96f_anim[] = { 190, 136, 22, - 0, + 0 }; uint16 sc96_floor_table[] = { @@ -119,7 +119,7 @@ uint16 sc96_floor_table[] = { GET_TO_CRYSTAL, ID_VIRUS, GET_TO_VIRUS, - 65535, + 65535 }; Compact sc96_floor = { @@ -141,6 +141,17 @@ Compact sc96_floor = { 181, // mouseSize_x 50, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 sc96_logic[] = { @@ -151,7 +162,7 @@ uint16 sc96_logic[] = { ID_VIRUS, ID_EYEBALL_90, 0XFFFF, - ID_LINC_MENU_LOGIC, + ID_LINC_MENU_LOGIC }; Compact crystal = { @@ -183,6 +194,7 @@ Compact crystal = { C_BASE_MODE, // mode CRYSTAL_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_96_95[] = { @@ -194,7 +206,7 @@ uint16 rs_foster_96_95[] = { 384, C_YCOOD, 264, - 65535, + 65535 }; uint16 crystal_break[] = { @@ -232,7 +244,7 @@ uint16 crystal_break[] = { 261, 227, 10, - 0, + 0 }; uint16 pal96[] = { @@ -619,7 +631,7 @@ uint16 pal96[] = { 1285, 285, 16129, - 16191, + 16191 }; Compact door_l96f = { @@ -651,6 +663,7 @@ Compact door_l96f = { C_BASE_MODE, // mode DOOR_L96F_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact virus = { @@ -682,6 +695,7 @@ Compact virus = { C_BASE_MODE, // mode VIRUS_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 crystal_spin[] = { @@ -716,7 +730,7 @@ uint16 crystal_spin[] = { 261, 227, 9, - 0, + 0 }; uint16 virus_spin[] = { @@ -751,7 +765,7 @@ uint16 virus_spin[] = { 282, 250, 9, - 0, + 0 }; Compact door_l96 = { @@ -783,6 +797,7 @@ Compact door_l96 = { C_BASE_MODE, // mode DOOR_L96_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 chip_list_sc96[] = { @@ -792,7 +807,7 @@ uint16 chip_list_sc96[] = { IT_CRYSTAL_BREAK+DISK_4, IT_VIRUS_SPIN+DISK_4, IT_GET_VIRUS+DISK_4, - 0, + 0 }; uint16 get_virus[] = { @@ -818,7 +833,7 @@ uint16 get_virus[] = { 282, 250, 6, - 0, + 0 }; uint16 door_l96_anim[] = { @@ -892,7 +907,7 @@ uint16 door_l96_anim[] = { 198, 136, 22, - 0, + 0 }; uint16 fast_list_sc96[] = { @@ -906,7 +921,7 @@ uint16 fast_list_sc96[] = { IT_SC96_LAYER_0+DISK_4, IT_SC96_LAYER_1+DISK_4, IT_SC96_GRID_1+DISK_4, - 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/9compact.h b/sky/compacts/9compact.h index e974a1666f..6b6f78bcf1 100644 --- a/sky/compacts/9compact.h +++ b/sky/compacts/9compact.h @@ -48,7 +48,7 @@ uint16 s9_floor_table[] = { GET_TO_SCANNER, ID_LINC_S9, GT_LINC_S9, - 65535, + 65535 }; Compact fake_floor_9 = { @@ -69,6 +69,18 @@ Compact fake_floor_9 = { 0, // mouseRel_y 320, // mouseSize_x 314-291, // mouseSize_y + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 son_work_seq[] = { @@ -265,7 +277,7 @@ uint16 son_work_seq[] = { 223, 240, 4, - 0, + 0 }; ExtCompact son_ext = { @@ -294,6 +306,10 @@ ExtCompact son_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact son = { @@ -325,7 +341,7 @@ Compact son = { 0, // mode SON_LOGIC, // baseSub 0, // baseSub_off - &son_ext, + &son_ext }; uint16 scandie_seq[] = { @@ -456,7 +472,7 @@ uint16 scandie_seq[] = { 349, 250, 39, - 0, + 0 }; uint16 lobby_down_seq[] = { @@ -479,7 +495,7 @@ uint16 lobby_down_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 s9_mouse[] = { @@ -495,7 +511,7 @@ uint16 s9_mouse[] = { ID_LINC_S9, ID_S9_FLOOR, 0XFFFF, - ID_TEXT_MOUSE, + ID_TEXT_MOUSE }; uint16 scan_seq[] = { @@ -593,7 +609,7 @@ uint16 scan_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 dad_work_seq[] = { @@ -682,7 +698,7 @@ uint16 dad_work_seq[] = { 270, 230, 3, - 0, + 0 }; Compact linc_s9 = { @@ -704,6 +720,17 @@ Compact linc_s9 = { 180-162, // mouseSize_x 322-284, // mouseSize_y LINC_S9_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 dad_work3_seq[] = { @@ -756,7 +783,7 @@ uint16 dad_work3_seq[] = { 342, 230, 0, - 0, + 0 }; ExtCompact dad_ext = { @@ -785,6 +812,10 @@ ExtCompact dad_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact dad = { @@ -816,7 +847,7 @@ Compact dad = { 0, // mode DAD_LOGIC, // baseSub 0, // baseSub_off - &dad_ext, + &dad_ext }; uint16 dad_work2_seq[] = { @@ -911,7 +942,7 @@ uint16 dad_work2_seq[] = { 307, 230, 3, - 0, + 0 }; Compact s9_floor = { @@ -933,6 +964,17 @@ Compact s9_floor = { 320, // mouseSize_x 37, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact left_exit_s9 = { @@ -954,6 +996,17 @@ Compact left_exit_s9 = { 16, // mouseSize_x 304-244, // mouseSize_y EL9_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 fans_seq[] = { @@ -1006,7 +1059,7 @@ uint16 fans_seq[] = { 188, 199, 15, - 0, + 0 }; Compact fans = { @@ -1038,6 +1091,7 @@ Compact fans = { C_BASE_MODE, // mode FANS_LOGIC, // baseSub 0, // baseSub_off + 0 }; Compact lobby_slot = { @@ -1059,6 +1113,17 @@ Compact lobby_slot = { 5, // mouseSize_x 12, // mouseSize_y LOBBY_SLOT_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact scanner = { @@ -1090,6 +1155,7 @@ Compact scanner = { C_BASE_MODE, // mode SCANNER_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 card_in_seq[] = { @@ -1118,7 +1184,7 @@ uint16 card_in_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 lobby_up_seq[] = { @@ -1141,7 +1207,7 @@ uint16 lobby_up_seq[] = { 1, 1, 6, - 0, + 0 }; Compact lobby_door = { @@ -1173,6 +1239,7 @@ Compact lobby_door = { C_BASE_MODE, // mode LOBBY_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_to_9[] = { @@ -1184,7 +1251,7 @@ uint16 rs_foster_to_9[] = { 9, C_PLACE, ID_S9_FLOOR, - 65535, + 65535 }; uint16 rs_foster_10_9[] = { @@ -1196,7 +1263,7 @@ uint16 rs_foster_10_9[] = { 9, C_PLACE, ID_S9_FLOOR, - 65535, + 65535 }; uint16 s9_logic[] = { @@ -1212,7 +1279,7 @@ uint16 s9_logic[] = { ID_LIFT_S7, ID_LIFT7_LIGHT, 0XFFFF, - ID_MENU_LOGIC, + ID_MENU_LOGIC }; uint16 s9_chip_list[] = { @@ -1232,7 +1299,7 @@ uint16 s9_chip_list[] = { 92+DISK_2, 47+DISK_2, 48+DISK_2, - 0, + 0 }; uint16 s9_pal[] = { @@ -1619,7 +1686,7 @@ uint16 s9_pal[] = { 1285, 285, 16129, - 16191, + 16191 }; }; // namespace SkyCompact diff --git a/sky/compacts/linc_gen.h b/sky/compacts/linc_gen.h index 1ce929d3f5..7c0fb9ca77 100644 --- a/sky/compacts/linc_gen.h +++ b/sky/compacts/linc_gen.h @@ -29,7 +29,7 @@ namespace SkyCompact { uint16 window_mouse[] = { ID_INFO_BUTTON, - 0, + 0 }; uint16 logon[] = { @@ -64,7 +64,7 @@ uint16 logon[] = { 1, 1, 0, - 0, + 0 }; uint32 *grid96 = 0; @@ -74,7 +74,7 @@ uint16 note_module[] = { 176, 0, 199, - 226, + 226 }; uint16 window_logic[] = { @@ -93,7 +93,7 @@ uint16 window_logic[] = { 30, 31, 32, - 0, + 0 }; uint16 crouch_right_b[] = { @@ -113,7 +113,7 @@ uint16 crouch_right_b[] = { 1, 1, 0, - 0, + 0 }; uint16 crouch_down[] = { @@ -148,7 +148,7 @@ uint16 crouch_down[] = { 201, 272, 0, - 0, + 0 }; uint16 auth_module[] = { @@ -156,7 +156,7 @@ uint16 auth_module[] = { 176, 0, 199, - 202, + 202 }; Compact window_3 = { @@ -188,6 +188,7 @@ Compact window_3 = { C_BASE_MODE, // mode INFO_WINDOW_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint32 *grid91 = 0; @@ -221,6 +222,7 @@ Compact info_button = { C_BASE_MODE, // mode INFO_BUTTON_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 size_module[] = { @@ -228,7 +230,7 @@ uint16 size_module[] = { 176, 0, 199, - 190, + 190 }; Compact window_2 = { @@ -260,6 +262,7 @@ Compact window_2 = { C_BASE_MODE, // mode INFO_WINDOW_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 logoff[] = { @@ -294,7 +297,7 @@ uint16 logoff[] = { 261, 181, 8, - 0, + 0 }; uint32 *grid94 = 0; @@ -322,7 +325,7 @@ uint16 enter_top[] = { 200, 215, 6, - 0, + 0 }; uint16 crouch_right[] = { @@ -357,7 +360,7 @@ uint16 crouch_right[] = { 260, 215, 0, - 0, + 0 }; uint32 *grid95 = 0; @@ -391,6 +394,7 @@ Compact window_1 = { C_BASE_MODE, // mode INFO_WINDOW_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint32 *grid90 = 0; @@ -418,7 +422,7 @@ uint16 exit_top[] = { 200, 215, 6, - 0, + 0 }; uint16 shrug[] = { @@ -441,7 +445,7 @@ uint16 shrug[] = { 1, 1, 48, - 0, + 0 }; uint16 head_module[] = { @@ -449,7 +453,7 @@ uint16 head_module[] = { 176, 0, 199, - 161, + 161 }; uint16 crouch_right_a[] = { @@ -469,7 +473,7 @@ uint16 crouch_right_a[] = { 1, 1, 3, - 0, + 0 }; uint16 file_module[] = { @@ -477,7 +481,7 @@ uint16 file_module[] = { 176, 0, 199, - 178, + 178 }; uint16 crouch_left[] = { @@ -512,7 +516,7 @@ uint16 crouch_left[] = { 320, 215, 0, - 0, + 0 }; uint32 *grid92 = 0; @@ -546,6 +550,7 @@ Compact window_4 = { C_BASE_MODE, // mode INFO_WINDOW_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 rs_foster_s90[] = { @@ -561,7 +566,7 @@ uint16 rs_foster_s90[] = { DOWN, C_FRAME, 117*64, - 65535, + 65535 }; uint32 *grid93 = 0; diff --git a/sky/compacts/lincmenu.h b/sky/compacts/lincmenu.h index dd14169d67..8283c1bf24 100644 --- a/sky/compacts/lincmenu.h +++ b/sky/compacts/lincmenu.h @@ -56,6 +56,7 @@ Compact playbak_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact persona_menu = { @@ -87,6 +88,7 @@ Compact persona_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact info_menu = { @@ -118,6 +120,7 @@ Compact info_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact decrypt_menu = { @@ -149,6 +152,7 @@ Compact decrypt_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; uint16 linc_menu_mouse[] = { @@ -198,7 +202,7 @@ uint16 linc_menu_mouse[] = { ID_KILL_MENU, ID_VIRUS_MENU, 46, - 0, + 0 }; Compact kill_menu = { @@ -230,6 +234,7 @@ Compact kill_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact read_menu = { @@ -261,6 +266,7 @@ Compact read_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact orders_menu = { @@ -292,6 +298,7 @@ Compact orders_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact report_menu = { @@ -323,6 +330,7 @@ Compact report_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact virus_menu = { @@ -354,6 +362,7 @@ Compact virus_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact adjust_menu = { @@ -385,6 +394,7 @@ Compact adjust_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact charon_menu = { @@ -416,6 +426,7 @@ Compact charon_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact orders2_menu = { @@ -447,6 +458,7 @@ Compact orders2_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact report2_menu = { @@ -478,6 +490,7 @@ Compact report2_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact oscill_menu = { @@ -509,6 +522,7 @@ Compact oscill_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact join_menu = { @@ -540,6 +554,7 @@ Compact join_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact green_menu = { @@ -571,6 +586,7 @@ Compact green_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; uint16 linc_menu_logic[] = { @@ -619,7 +635,7 @@ uint16 linc_menu_logic[] = { 30, 31, 32, - 0, + 0 }; Compact adjust2_menu = { @@ -651,6 +667,7 @@ Compact adjust2_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact red_menu = { @@ -682,6 +699,7 @@ Compact red_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact open_menu = { @@ -713,6 +731,7 @@ Compact open_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact decomp_menu = { @@ -744,6 +763,7 @@ Compact decomp_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact blind_menu = { @@ -775,6 +795,7 @@ Compact blind_menu = { 0, // mode LINC_MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/objects.h b/sky/compacts/objects.h index ed6ac30fa5..6b6932cfc4 100644 --- a/sky/compacts/objects.h +++ b/sky/compacts/objects.h @@ -56,6 +56,7 @@ Compact blank5 = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact tape_menu = { @@ -87,6 +88,7 @@ Compact tape_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact right_arrow = { @@ -118,11 +120,12 @@ Compact right_arrow = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; uint16 move_2[] = { 20, - 0, + 0 }; Compact glass_menu = { @@ -154,6 +157,7 @@ Compact glass_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact lightbulb_menu = { @@ -185,6 +189,7 @@ Compact lightbulb_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact blank3 = { @@ -216,6 +221,7 @@ Compact blank3 = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact wd40_menu = { @@ -247,6 +253,7 @@ Compact wd40_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact plaster_menu = { @@ -278,6 +285,7 @@ Compact plaster_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact new_cable_menu = { @@ -309,6 +317,7 @@ Compact new_cable_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact blank8 = { @@ -340,6 +349,7 @@ Compact blank8 = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact joeyb_menu = { @@ -371,16 +381,17 @@ Compact joeyb_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; uint16 move_menu[] = { 46, - 18, + 18 }; uint16 *move_list[] = { move_menu, - move_2, + move_2 }; Compact blank6 = { @@ -412,6 +423,7 @@ Compact blank6 = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact shades_menu = { @@ -443,6 +455,7 @@ Compact shades_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact citycard_menu = { @@ -474,6 +487,7 @@ Compact citycard_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact blank9 = { @@ -505,6 +519,7 @@ Compact blank9 = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact rope_menu = { @@ -536,6 +551,7 @@ Compact rope_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact left_arrow = { @@ -567,6 +583,7 @@ Compact left_arrow = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact magazine_menu = { @@ -598,6 +615,7 @@ Compact magazine_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact gallcard_menu = { @@ -629,6 +647,7 @@ Compact gallcard_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact dog_food_menu = { @@ -660,6 +679,7 @@ Compact dog_food_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact blank7 = { @@ -691,6 +711,7 @@ Compact blank7 = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact blank2 = { @@ -722,6 +743,7 @@ Compact blank2 = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact blank11 = { @@ -753,6 +775,7 @@ Compact blank11 = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact anchor_menu = { @@ -784,6 +807,7 @@ Compact anchor_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact anita_card_menu = { @@ -815,6 +839,7 @@ Compact anita_card_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact tongs_menu = { @@ -846,6 +871,7 @@ Compact tongs_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact blank4 = { @@ -877,6 +903,7 @@ Compact blank4 = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact crow_bar_menu = { @@ -908,6 +935,7 @@ Compact crow_bar_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact secateurs_menu = { @@ -939,6 +967,7 @@ Compact secateurs_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact sarnie_menu = { @@ -970,6 +999,7 @@ Compact sarnie_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact spanner_menu = { @@ -1001,6 +1031,7 @@ Compact spanner_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact blank10 = { @@ -1032,6 +1063,7 @@ Compact blank10 = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact skey_menu = { @@ -1063,6 +1095,7 @@ Compact skey_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact blank1 = { @@ -1094,6 +1127,7 @@ Compact blank1 = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact ticket_menu = { @@ -1125,6 +1159,7 @@ Compact ticket_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact brick_menu = { @@ -1156,6 +1191,7 @@ Compact brick_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact putty_menu = { @@ -1187,6 +1223,7 @@ Compact putty_menu = { 0, // mode MENU_SCRIPT, // baseSub 0, // baseSub_off + 0 }; Compact menu_bar = { @@ -1207,6 +1244,18 @@ Compact menu_bar = { 0, // mouseRel_y 320, // mouseSize_x 1, // mouseSize_y + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; }; // namespace SkyCompact diff --git a/sky/compacts/z_compac.h b/sky/compacts/z_compac.h index 4740e7a415..74b7e1ce6c 100644 --- a/sky/compacts/z_compac.h +++ b/sky/compacts/z_compac.h @@ -72,7 +72,7 @@ uint16 fradman_up[] = { 9+90*64, 0, 65534, - 0, + 0 }; uint16 high_floor_table[] = { @@ -88,7 +88,7 @@ uint16 high_floor_table[] = { RET_OK, ID_NOTICE, GET_TO_NOTICE, - 0, + 0 }; Compact floor = { @@ -110,13 +110,24 @@ Compact floor = { 248, // mouseSize_x 23, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 wjoey_d_to_u[] = { 23+136*64, 12+136*64, 22+136*64, - 0, + 0 }; uint16 wjoey_st_left[] = { @@ -124,12 +135,12 @@ uint16 wjoey_st_left[] = { 1, 1, 4, - 0, + 0 }; uint16 ljoey_r_to_d[] = { 23+173*64, - 0, + 0 }; uint16 s2_talk_table[] = { @@ -155,7 +166,7 @@ uint16 s2_talk_table[] = { GET_TO_SHELL, ID_PANEL, GET_TO_LEDS, - 65535, + 65535 }; Compact r_talk_s2 = { @@ -165,13 +176,36 @@ Compact r_talk_s2 = { 0, // screen 0, // place s2_talk_table, // getToTable + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 fradman_u_to_d[] = { 43+90*64, 42+90*64, 41+90*64, - 0, + 0 }; uint16 door_table[] = { @@ -187,7 +221,7 @@ uint16 door_table[] = { GET_TO_FEXIT, ID_NOTICE, GET_TO_NOTICE, - 65535, + 65535 }; uint16 mfoster_st_right[] = { @@ -195,7 +229,7 @@ uint16 mfoster_st_right[] = { 1, 1, 46, - 0, + 0 }; uint16 bfoster_st_right[] = { @@ -203,7 +237,7 @@ uint16 bfoster_st_right[] = { 1, 0, 46, - 0, + 0 }; uint16 seq3_pal[] = { @@ -238,18 +272,18 @@ uint16 seq3_pal[] = { 3410, 2882, 1057, - 3718, + 3718 }; uint16 bfoster_u_to_r[] = { 45+182*64, - 0, + 0 }; uint16 foster_l_to_t[] = { 41+12*64, 40+12*64, - 0, + 0 }; uint16 s9_fast_list[] = { @@ -268,7 +302,7 @@ uint16 s9_fast_list[] = { 100+DISK_2, 108+DISK_2, 109+DISK_2, - 0, + 0 }; uint16 wjoey_st_up[] = { @@ -276,12 +310,12 @@ uint16 wjoey_st_up[] = { 1, 1, 0, - 0, + 0 }; uint16 bfoster_r_to_u[] = { 45+182*64, - 0, + 0 }; uint16 monitor_left[] = { @@ -317,7 +351,7 @@ uint16 monitor_left[] = { 23+74*64, 65532, 0, - 0, + 0 }; uint16 rs_lamb_to_three[] = { @@ -325,7 +359,7 @@ uint16 rs_lamb_to_three[] = { ST_LOGIC, C_LOGIC, L_SCRIPT, - 65535, + 65535 }; uint16 std_menu_logic[] = { @@ -378,7 +412,7 @@ uint16 std_menu_logic[] = { 25, 24, 23, - 0, + 0 }; uint16 but_7[] = { @@ -392,7 +426,7 @@ uint16 but_7[] = { 1, 1, 0, - 0, + 0 }; uint16 ljoey_up[] = { @@ -404,12 +438,12 @@ uint16 ljoey_up[] = { 1+173*64, 0, 65535, - 0, + 0 }; uint16 wjoey_r_to_d[] = { 23+136*64, - 0, + 0 }; Compact small_door = { @@ -441,6 +475,7 @@ Compact small_door = { C_BASE_MODE, // mode SMALL_DOOR_LOGIC, // baseSub 0, // baseSub_off + 0 }; uint16 shrug_seq[] = { @@ -463,7 +498,7 @@ uint16 shrug_seq[] = { 1, 1, 49, - 0, + 0 }; uint16 foster_up[] = { @@ -507,12 +542,12 @@ uint16 foster_up[] = { 9+12*64, 0, 65534, - 0, + 0 }; uint16 mfoster_d_to_l[] = { 41+13*64, - 0, + 0 }; uint16 ljoey_down[] = { @@ -524,7 +559,7 @@ uint16 ljoey_down[] = { 3+173*64, 0, 1, - 0, + 0 }; uint16 rs_blanks_linc[] = { @@ -534,7 +569,7 @@ uint16 rs_blanks_linc[] = { LINC_MENU_SCRIPT, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint16 mini_shrug_seq[] = { @@ -557,7 +592,7 @@ uint16 mini_shrug_seq[] = { 1, 1, 49, - 0, + 0 }; uint16 talk_table[] = { @@ -574,12 +609,12 @@ uint16 talk_table[] = { 111, GET_TO_ER0, 17, - STAIRS_FROM_LOW, + STAIRS_FROM_LOW }; uint16 fradman_l_to_d[] = { 41+90*64, - 0, + 0 }; uint16 low_floor_table[] = { @@ -601,7 +636,7 @@ uint16 low_floor_table[] = { GET_TO_UPLOAD, ID_PRESS, GET_TO_PRESS, - 0, + 0 }; Compact low_floor = { @@ -623,13 +658,24 @@ Compact low_floor = { 237, // mouseSize_x 40, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 bfoster_d_to_u[] = { 47+182*64, 46+182*64, 45+182*64, - 0, + 0 }; uint16 but_0[] = { @@ -643,7 +689,7 @@ uint16 but_0[] = { 1, 1, 0, - 0, + 0 }; uint16 but_4[] = { @@ -657,7 +703,7 @@ uint16 but_4[] = { 1, 1, 0, - 0, + 0 }; uint8 new_grid[120]; @@ -703,7 +749,7 @@ uint16 fradman_right[] = { 39+90*64, 4, 0, - 0, + 0 }; uint16 bfoster_st_left[] = { @@ -711,7 +757,7 @@ uint16 bfoster_st_left[] = { 1, 0, 42, - 0, + 0 }; uint16 sjoey_up[] = { @@ -723,7 +769,7 @@ uint16 sjoey_up[] = { 1+86*64, 0, 65535, - 0, + 0 }; uint16 s10_fast_list[] = { @@ -735,22 +781,22 @@ uint16 s10_fast_list[] = { 135, 43+DISK_1, 44+DISK_1, - 0, + 0 }; uint16 fradman_u_to_l[] = { 43+90*64, - 0, + 0 }; uint16 ljoey_r_to_u[] = { 22+173*64, - 0, + 0 }; uint16 foster_u_to_l[] = { 43+12*64, - 0, + 0 }; uint8 lamb_auto[64]; @@ -796,7 +842,7 @@ uint16 lamb_up[] = { 9+131*64, 0, 65534, - 0, + 0 }; uint16 lamb_down[] = { @@ -840,7 +886,7 @@ uint16 lamb_down[] = { 19+131*64, 0, 2, - 0, + 0 }; uint16 lamb_left[] = { @@ -884,7 +930,7 @@ uint16 lamb_left[] = { 29+131*64, 65532, 0, - 0, + 0 }; uint16 lamb_right[] = { @@ -928,7 +974,7 @@ uint16 lamb_right[] = { 39+131*64, 4, 0, - 0, + 0 }; uint16 lamb_st_up[] = { @@ -936,7 +982,7 @@ uint16 lamb_st_up[] = { 1, 1, 44, - 0, + 0 }; uint16 lamb_st_down[] = { @@ -944,7 +990,7 @@ uint16 lamb_st_down[] = { 1, 1, 40, - 0, + 0 }; uint16 lamb_st_left[] = { @@ -952,7 +998,7 @@ uint16 lamb_st_left[] = { 1, 1, 42, - 0, + 0 }; uint16 lamb_st_right[] = { @@ -960,7 +1006,7 @@ uint16 lamb_st_right[] = { 1, 1, 46, - 0, + 0 }; uint16 lamb_st_talk[] = { @@ -968,75 +1014,75 @@ uint16 lamb_st_talk[] = { 1, 1, 0, - 0, + 0 }; uint16 lamb_u_to_d[] = { 43+131*64, 42+131*64, 41+131*64, - 0, + 0 }; uint16 lamb_u_to_l[] = { 43+131*64, - 0, + 0 }; uint16 lamb_u_to_r[] = { 45+131*64, - 0, + 0 }; uint16 lamb_d_to_u[] = { 47+131*64, 46+131*64, 45+131*64, - 0, + 0 }; uint16 lamb_d_to_l[] = { 41+131*64, - 0, + 0 }; uint16 lamb_d_to_r[] = { 47+131*64, - 0, + 0 }; uint16 lamb_l_to_u[] = { 43+131*64, - 0, + 0 }; uint16 lamb_l_to_d[] = { 41+131*64, - 0, + 0 }; uint16 lamb_l_to_r[] = { 41+131*64, 40+131*64, 47+131*64, - 0, + 0 }; uint16 lamb_r_to_u[] = { 45+131*64, - 0, + 0 }; uint16 lamb_r_to_d[] = { 47+131*64, - 0, + 0 }; uint16 lamb_r_to_l[] = { 45+131*64, 44+131*64, 43+131*64, - 0, + 0 }; TurnTable lamb_turnTable0 = { @@ -1074,7 +1120,7 @@ TurnTable lamb_turnTable0 = { 0, 0, 0 - }, + } }; MegaSet lamb_megaSet0 = { @@ -1091,7 +1137,7 @@ MegaSet lamb_megaSet0 = { lamb_st_left, // standLeft lamb_st_right, // standRight lamb_st_talk, // standTalk - &lamb_turnTable0, + &lamb_turnTable0 }; ExtCompact lamb_ext = { @@ -1121,6 +1167,9 @@ ExtCompact lamb_ext = { lamb_auto, // animScratch 0, // megaSet &lamb_megaSet0, + 0, + 0, + 0 }; Compact lamb = { @@ -1152,7 +1201,7 @@ Compact lamb = { C_BASE_MODE, // mode LAMB_FACTORY_START, // baseSub 0, // baseSub_off - &lamb_ext, + &lamb_ext }; uint16 bfoster_left[] = { @@ -1196,7 +1245,7 @@ uint16 bfoster_left[] = { 29+182*64, 65532, 0, - 0, + 0 }; uint16 fast_intro[] = { @@ -1204,7 +1253,7 @@ uint16 fast_intro[] = { 184+DISK_15, 185+DISK_15, 186+DISK_15, - 0, + 0 }; uint16 foster_st_right[] = { @@ -1212,7 +1261,7 @@ uint16 foster_st_right[] = { 1, 0, 46, - 0, + 0 }; uint16 monitor_st_up[] = { @@ -1220,12 +1269,12 @@ uint16 monitor_st_up[] = { 1, 1, 36, - 0, + 0 }; uint16 sjoey_d_to_r[] = { 12+86*64, - 0, + 0 }; uint16 foster_st_down[] = { @@ -1233,12 +1282,12 @@ uint16 foster_st_down[] = { 1, 0, 40, - 0, + 0 }; uint16 mfoster_u_to_r[] = { 45+13*64, - 0, + 0 }; uint16 sml_up_mid_get_seq[] = { @@ -1270,21 +1319,21 @@ uint16 sml_up_mid_get_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 mfoster_u_to_d[] = { 43+13*64, 42+13*64, 41+13*64, - 0, + 0 }; uint16 wjoey_u_to_d[] = { 21+136*64, 4+136*64, 20+136*64, - 0, + 0 }; uint16 chip_intro[] = { @@ -1293,7 +1342,7 @@ uint16 chip_intro[] = { 195+DISK_15, 196+DISK_15, 197+DISK_15, - 0, + 0 }; uint16 fast_list_0[] = { @@ -1305,7 +1354,7 @@ uint16 fast_list_0[] = { 52, 53, 13+0X8000, - 0, + 0 }; uint16 rs_right_arrow[] = { @@ -1315,7 +1364,7 @@ uint16 rs_right_arrow[] = { MENU_SCRIPT, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint16 ljoey_st_left[] = { @@ -1323,7 +1372,7 @@ uint16 ljoey_st_left[] = { 1, 1, 4, - 0, + 0 }; uint16 s28_fast_list[] = { @@ -1333,7 +1382,7 @@ uint16 s28_fast_list[] = { 53, 54, 135, - 0, + 0 }; uint16 monitor_right[] = { @@ -1369,7 +1418,7 @@ uint16 monitor_right[] = { 31+74*64, 4, 0, - 0, + 0 }; uint16 wjoey_st_down[] = { @@ -1377,7 +1426,7 @@ uint16 wjoey_st_down[] = { 1, 1, 2, - 0, + 0 }; uint16 r2_floor_table[] = { @@ -1415,7 +1464,7 @@ uint16 r2_floor_table[] = { S2_WALK_ON, 1, ER0_WALK_ON, - 65535, + 65535 }; Compact s2_floor = { @@ -1437,6 +1486,17 @@ Compact s2_floor = { 240, // mouseSize_x 71, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 fradman_down[] = { @@ -1480,26 +1540,26 @@ uint16 fradman_down[] = { 19+90*64, 0, 2, - 0, + 0 }; uint16 foster_u_to_d[] = { 43+12*64, 42+12*64, 41+12*64, - 0, + 0 }; uint32 *c68 = 0; uint16 ljoey_d_to_r[] = { 23+173*64, - 0, + 0 }; uint16 mfoster_r_to_u[] = { 45+13*64, - 0, + 0 }; uint16 fast_list_sc3[] = { @@ -1515,7 +1575,7 @@ uint16 fast_list_sc3[] = { 222+DISK_1, 223+DISK_1, 213+DISK_1, - 0, + 0 }; uint16 rs_left_arrow[] = { @@ -1525,7 +1585,7 @@ uint16 rs_left_arrow[] = { MENU_SCRIPT, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint16 rs_l_arr_linc[] = { @@ -1535,7 +1595,7 @@ uint16 rs_l_arr_linc[] = { LINC_MENU_SCRIPT, C_BASE_SUB+2, 0, - 65535, + 65535 }; Compact text_8 = { @@ -1561,11 +1621,18 @@ Compact text_8 = { 0, // downFlag 0, // getToFlag 0, // flag + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 wjoey_l_to_d[] = { 20+136*64, - 0, + 0 }; uint16 stair_table[] = { @@ -1587,7 +1654,7 @@ uint16 stair_table[] = { GET_TO_UPLOAD, ID_PRESS, GET_TO_PRESS, - 0, + 0 }; Compact stairs = { @@ -1609,6 +1676,17 @@ Compact stairs = { 12, // mouseSize_x 14, // mouseSize_y STAIR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 text_mouse[] = { @@ -1662,17 +1740,17 @@ uint16 text_mouse[] = { IDO_DOG_FOOD, IDO_GALLCARD, 46, - 0, + 0 }; uint16 monitor_d_to_r[] = { 47-8+74*64, - 0, + 0 }; uint16 ljoey_l_to_d[] = { 20+173*64, - 0, + 0 }; uint16 sjoey_st_right[] = { @@ -1680,7 +1758,7 @@ uint16 sjoey_st_right[] = { 1, 1, 8, - 0, + 0 }; uint16 sjoey_st_down[] = { @@ -1688,7 +1766,7 @@ uint16 sjoey_st_down[] = { 1, 1, 2, - 0, + 0 }; uint16 sjoey_st_left[] = { @@ -1696,7 +1774,7 @@ uint16 sjoey_st_left[] = { 1, 1, 4, - 0, + 0 }; uint16 upstair_table[] = { @@ -1712,7 +1790,7 @@ uint16 upstair_table[] = { GET_TO_FEXIT, ID_NOTICE, GET_TO_NOTICE, - 0, + 0 }; uint16 sjoey_right[] = { @@ -1732,12 +1810,12 @@ uint16 sjoey_right[] = { 11+86*64, 1, 0, - 0, + 0 }; uint16 ljoey_u_to_r[] = { 22+173*64, - 0, + 0 }; uint16 mfoster_st_up[] = { @@ -1745,7 +1823,7 @@ uint16 mfoster_st_up[] = { 1, 1, 44, - 0, + 0 }; uint16 mfoster_st_down[] = { @@ -1753,7 +1831,7 @@ uint16 mfoster_st_down[] = { 1, 1, 40, - 0, + 0 }; uint16 foster_st_talk[] = { @@ -1761,14 +1839,14 @@ uint16 foster_st_talk[] = { 1, 0, 0, - 0, + 0 }; uint16 mfoster_l_to_r[] = { 41+13*64, 40+13*64, 47+13*64, - 0, + 0 }; uint16 bar_table[] = { @@ -1783,12 +1861,12 @@ uint16 bar_table[] = { 85, RET_OK, ID_NOTICE, - GET_TO_NOTICE, + GET_TO_NOTICE }; uint16 foster_d_to_l[] = { 41+12*64, - 0, + 0 }; Compact text_1 = { @@ -1814,6 +1892,13 @@ Compact text_1 = { 0, // downFlag 0, // getToFlag 0, // flag + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 fradman_left[] = { @@ -1857,7 +1942,7 @@ uint16 fradman_left[] = { 29+90*64, 65532, 0, - 0, + 0 }; uint16 s29_fast_list[] = { @@ -1869,7 +1954,7 @@ uint16 s29_fast_list[] = { 135, 170+DISK_8, 171+DISK_8, - 0, + 0 }; uint16 r1door_table[] = { @@ -1881,7 +1966,7 @@ uint16 r1door_table[] = { GET_TO_NOTICE2, ID_SS_SIGN, GET_TO_SS_SIGN, - 65535, + 65535 }; Compact r1_door = { @@ -1913,6 +1998,7 @@ Compact r1_door = { C_BASE_MODE, // mode R1EXIT_DOOR, // baseSub 0, // baseSub_off + 0 }; Compact upstairs = { @@ -1934,18 +2020,29 @@ Compact upstairs = { 200-164, // mouseSize_x 211-207, // mouseSize_y UPSTAIR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 ljoey_u_to_d[] = { 21+173*64, 4+173*64, 20+173*64, - 0, + 0 }; uint16 monitor_u_to_l[] = { 43-8+74*64, - 0, + 0 }; uint16 fradman_st_right[] = { @@ -1953,7 +2050,7 @@ uint16 fradman_st_right[] = { 1, 0, 46, - 0, + 0 }; uint16 sml_door_table[] = { @@ -1970,7 +2067,7 @@ uint16 sml_door_table[] = { 44, GET_TO_TALK1, 45, - GET_TO_TALK2, + GET_TO_TALK2 }; uint32 *l_talk_s2 = 0; @@ -1979,7 +2076,7 @@ uint16 bfoster_r_to_l[] = { 45+182*64, 44+182*64, 43+182*64, - 0, + 0 }; uint16 mfoster_left[] = { @@ -2023,7 +2120,7 @@ uint16 mfoster_left[] = { 29+13*64, 65534, 0, - 0, + 0 }; uint16 wjoey_up[] = { @@ -2035,19 +2132,19 @@ uint16 wjoey_up[] = { 1+136*64, 0, 65535, - 0, + 0 }; uint16 foster_r_to_u[] = { 45+12*64, - 0, + 0 }; uint16 mfoster_d_to_u[] = { 47+13*64, 46+13*64, 45+13*64, - 0, + 0 }; uint16 but_8[] = { @@ -2061,7 +2158,7 @@ uint16 but_8[] = { 1, 1, 0, - 0, + 0 }; uint16 but_5[] = { @@ -2075,22 +2172,22 @@ uint16 but_5[] = { 1, 1, 0, - 0, + 0 }; uint16 monitor_l_to_u[] = { 43-8+74*64, - 0, + 0 }; uint16 mfoster_l_to_u[] = { 43+13*64, - 0, + 0 }; uint16 bfoster_d_to_r[] = { 47+182*64, - 0, + 0 }; uint16 wjoey_down[] = { @@ -2102,7 +2199,7 @@ uint16 wjoey_down[] = { 3+136*64, 0, 1, - 0, + 0 }; Compact text_10 = { @@ -2128,13 +2225,20 @@ Compact text_10 = { 0, // downFlag 0, // getToFlag 0, // flag + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 monitor_u_to_d[] = { 43-8+74*64, 42-8+74*64, 41-8+74*64, - 0, + 0 }; Compact text_5 = { @@ -2160,6 +2264,13 @@ Compact text_5 = { 0, // downFlag 0, // getToFlag 0, // flag + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 forklift1_cdt[] = { @@ -2485,7 +2596,7 @@ uint16 forklift1_cdt[] = { 292, 291, 0, - 0, + 0 }; uint16 bfoster_up[] = { @@ -2529,7 +2640,7 @@ uint16 bfoster_up[] = { 9+182*64, 0, 65534, - 0, + 0 }; uint16 s11_fast_list[] = { @@ -2540,19 +2651,19 @@ uint16 s11_fast_list[] = { 54, 135, 16+DISK_1, - 0, + 0 }; uint16 fradman_d_to_u[] = { 47+90*64, 46+90*64, 45+90*64, - 0, + 0 }; uint16 monitor_r_to_u[] = { 45-8+74*64, - 0, + 0 }; uint16 bfoster_down[] = { @@ -2596,7 +2707,7 @@ uint16 bfoster_down[] = { 19+182*64, 0, 2, - 0, + 0 }; uint16 ledge_table[] = { @@ -2608,14 +2719,14 @@ uint16 ledge_table[] = { GET_TO_NOTICE2, ID_SS_SIGN, GET_TO_SS_SIGN, - 65535, + 65535 }; uint16 ljoey_d_to_u[] = { 23+173*64, 12+173*64, 22+173*64, - 0, + 0 }; uint16 foster_left[] = { @@ -2659,7 +2770,7 @@ uint16 foster_left[] = { 29+12*64, 65532, 0, - 0, + 0 }; uint16 sjoey_st_up[] = { @@ -2667,14 +2778,14 @@ uint16 sjoey_st_up[] = { 1, 1, 0, - 0, + 0 }; uint16 fradman_l_to_r[] = { 41+90*64, 40+90*64, 47+90*64, - 0, + 0 }; Compact outside_ledge = { @@ -2696,6 +2807,17 @@ Compact outside_ledge = { 64, // mouseSize_x 33-8, // mouseSize_y FLOOR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 fradman_st_up[] = { @@ -2703,23 +2825,23 @@ uint16 fradman_st_up[] = { 1, 0, 44, - 0, + 0 }; uint16 foster_l_to_u[] = { 43+12*64, - 0, + 0 }; uint16 foster_u_to_t[] = { 45+12*64, 46+12*64, - 0, + 0 }; uint16 ljoey_d_to_l[] = { 20+173*64, - 0, + 0 }; uint8 joey_auto[64]; @@ -2757,7 +2879,7 @@ uint16 ljoey_left[] = { 11+173*64, 65534, 0, - 0, + 0 }; uint16 ljoey_right[] = { @@ -2793,7 +2915,7 @@ uint16 ljoey_right[] = { 19+173*64, 2, 0, - 0, + 0 }; uint16 ljoey_st_up[] = { @@ -2801,7 +2923,7 @@ uint16 ljoey_st_up[] = { 1, 1, 0, - 0, + 0 }; uint16 ljoey_st_down[] = { @@ -2809,7 +2931,7 @@ uint16 ljoey_st_down[] = { 1, 1, 2, - 0, + 0 }; uint16 ljoey_st_right[] = { @@ -2817,31 +2939,31 @@ uint16 ljoey_st_right[] = { 1, 1, 12, - 0, + 0 }; uint16 ljoey_u_to_l[] = { 21+173*64, - 0, + 0 }; uint16 ljoey_l_to_u[] = { 21+173*64, - 0, + 0 }; uint16 ljoey_l_to_r[] = { 20+173*64, 2+173*64, 23+173*64, - 0, + 0 }; uint16 ljoey_r_to_l[] = { 22+173*64, 0+173*64, 21+173*64, - 0, + 0 }; uint16 wjoey_left[] = { @@ -2877,7 +2999,7 @@ uint16 wjoey_left[] = { 11+136*64, 65534, 0, - 0, + 0 }; uint16 wjoey_right[] = { @@ -2913,7 +3035,7 @@ uint16 wjoey_right[] = { 19+136*64, 2, 0, - 0, + 0 }; uint16 wjoey_st_right[] = { @@ -2921,51 +3043,51 @@ uint16 wjoey_st_right[] = { 1, 1, 12, - 0, + 0 }; uint16 wjoey_u_to_l[] = { 21+136*64, - 0, + 0 }; uint16 wjoey_u_to_r[] = { 22+136*64, - 0, + 0 }; uint16 wjoey_d_to_l[] = { 20+136*64, - 0, + 0 }; uint16 wjoey_d_to_r[] = { 23+136*64, - 0, + 0 }; uint16 wjoey_l_to_u[] = { 21+136*64, - 0, + 0 }; uint16 wjoey_l_to_r[] = { 20+136*64, 2+136*64, 23+136*64, - 0, + 0 }; uint16 wjoey_r_to_u[] = { 22+136*64, - 0, + 0 }; uint16 wjoey_r_to_l[] = { 22+136*64, 0+136*64, 21+136*64, - 0, + 0 }; uint16 sjoey_down[] = { @@ -2977,7 +3099,7 @@ uint16 sjoey_down[] = { 3+86*64, 0, 1, - 0, + 0 }; uint16 sjoey_left[] = { @@ -2997,70 +3119,70 @@ uint16 sjoey_left[] = { 7+86*64, 65535, 0, - 0, + 0 }; uint16 sjoey_u_to_d[] = { 14+86*64, 4+86*64, 13+86*64, - 0, + 0 }; uint16 sjoey_u_to_l[] = { 14+86*64, - 0, + 0 }; uint16 sjoey_u_to_r[] = { 15+86*64, - 0, + 0 }; uint16 sjoey_d_to_u[] = { 12+86*64, 8+86*64, 15+86*64, - 0, + 0 }; uint16 sjoey_d_to_l[] = { 13+86*64, - 0, + 0 }; uint16 sjoey_l_to_u[] = { 14+86*64, - 0, + 0 }; uint16 sjoey_l_to_d[] = { 13+86*64, - 0, + 0 }; uint16 sjoey_l_to_r[] = { 13+86*64, 2+86*64, 12+86*64, - 0, + 0 }; uint16 sjoey_r_to_u[] = { 15+86*64, - 0, + 0 }; uint16 sjoey_r_to_d[] = { 12+86*64, - 0, + 0 }; uint16 sjoey_r_to_l[] = { 15+86*64, 0+86*64, 14+86*64, - 0, + 0 }; TurnTable joey_turnTable0 = { @@ -3174,7 +3296,7 @@ TurnTable joey_turnTable2 = { 0, 0, 0 - }, + } }; MegaSet joey_megaSet0 = { @@ -3225,7 +3347,7 @@ MegaSet joey_megaSet2 = { sjoey_st_left, // standLeft sjoey_st_right, // standRight 0, // standTalk - &joey_turnTable2, + &joey_turnTable2 }; ExtCompact joey_ext = { @@ -3257,6 +3379,7 @@ ExtCompact joey_ext = { &joey_megaSet0, &joey_megaSet1, &joey_megaSet2, + 0 }; Compact joey = { @@ -3288,12 +3411,12 @@ Compact joey = { C_BASE_MODE, // mode JOEY_LOGIC, // baseSub 0, // baseSub_off - &joey_ext, + &joey_ext }; uint16 baby_logic_list[] = { ID_FOSTER, - 0, + 0 }; uint16 save_restore_mouse[] = { @@ -3308,14 +3431,14 @@ uint16 save_restore_mouse[] = { 31, 32, 20, - 0, + 0 }; uint16 fradman_r_to_l[] = { 45+90*64, 44+90*64, 43+90*64, - 0, + 0 }; uint16 foster_right[] = { @@ -3359,7 +3482,7 @@ uint16 foster_right[] = { 39+12*64, 4, 0, - 0, + 0 }; uint16 seq2_pal[] = { @@ -3394,7 +3517,7 @@ uint16 seq2_pal[] = { 3155, 3411, 3412, - 3428, + 3428 }; uint16 seq1_pal[] = { @@ -3429,12 +3552,12 @@ uint16 seq1_pal[] = { 3668, 3857, 3703, - 3736, + 3736 }; uint16 bfoster_r_to_d[] = { 47+182*64, - 0, + 0 }; uint16 low_get_seq[] = { @@ -3469,18 +3592,18 @@ uint16 low_get_seq[] = { 1, 1, 0, - 0, + 0 }; uint16 fradman_u_to_r[] = { 45+90*64, - 0, + 0 }; uint16 rs_mega_alive[] = { C_STATUS, ST_SORT+ST_RECREATE+ST_LOGIC+ST_GRID_PLOT+ST_COLLISION+ST_MOUSE, - 65535, + 65535 }; Compact whole_screen = { @@ -3501,11 +3624,23 @@ Compact whole_screen = { 0, // mouseRel_y 320, // mouseSize_x 192, // mouseSize_y + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 bfoster_u_to_l[] = { 43+182*64, - 0, + 0 }; Compact bar = { @@ -3527,6 +3662,17 @@ Compact bar = { 13+4, // mouseSize_x 3, // mouseSize_y BAR_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 foster_st_left[] = { @@ -3534,14 +3680,14 @@ uint16 foster_st_left[] = { 1, 0, 42, - 0, + 0 }; uint16 monitor_l_to_r[] = { 41-8+74*64, 40-8+74*64, 47-8+74*64, - 0, + 0 }; uint16 rs_lamb_start_3[] = { @@ -3561,7 +3707,7 @@ uint16 rs_lamb_start_3[] = { 65488, C_DIR, DOWN, - 65535, + 65535 }; uint16 forklift2_cdt[] = { @@ -3863,7 +4009,7 @@ uint16 forklift2_cdt[] = { 299, 292, 57, - 0, + 0 }; Compact talk2 = { @@ -3873,6 +4019,29 @@ Compact talk2 = { 0, // screen 0, // place talk_table, // getToTable + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact text_4 = { @@ -3898,11 +4067,18 @@ Compact text_4 = { 0, // downFlag 0, // getToFlag 0, // flag + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 mfoster_d_to_r[] = { 47+13*64, - 0, + 0 }; Compact door = { @@ -3934,19 +4110,20 @@ Compact door = { C_BASE_MODE, // mode FEXIT_DOOR, // baseSub 0, // baseSub_off + 0 }; uint16 foster_d_to_u[] = { 47+12*64, 46+12*64, 45+12*64, - 0, + 0 }; uint16 park_table[] = { ID_SLOT, GET_TO_SLOT, - 65535, + 65535 }; uint8 minif_auto[64]; @@ -3992,7 +4169,7 @@ uint16 mfoster_up[] = { 9+13*64, 0, 65535, - 0, + 0 }; uint16 mfoster_down[] = { @@ -4036,7 +4213,7 @@ uint16 mfoster_down[] = { 19+13*64, 0, 1, - 0, + 0 }; uint16 mfoster_right[] = { @@ -4080,7 +4257,7 @@ uint16 mfoster_right[] = { 39+13*64, 2, 0, - 0, + 0 }; uint16 mfoster_st_left[] = { @@ -4088,29 +4265,29 @@ uint16 mfoster_st_left[] = { 1, 1, 42, - 0, + 0 }; uint16 mfoster_u_to_l[] = { 43+13*64, - 0, + 0 }; uint16 mfoster_l_to_d[] = { 41+13*64, - 0, + 0 }; uint16 mfoster_r_to_d[] = { 47+13*64, - 0, + 0 }; uint16 mfoster_r_to_l[] = { 45+13*64, 44+13*64, 43+13*64, - 0, + 0 }; uint16 foster_down[] = { @@ -4154,7 +4331,7 @@ uint16 foster_down[] = { 19+12*64, 0, 2, - 0, + 0 }; uint16 foster_st_up[] = { @@ -4162,54 +4339,54 @@ uint16 foster_st_up[] = { 1, 0, 44, - 0, + 0 }; uint16 foster_u_to_r[] = { 45+12*64, - 0, + 0 }; uint16 foster_d_to_r[] = { 47+12*64, - 0, + 0 }; uint16 foster_l_to_d[] = { 41+12*64, - 0, + 0 }; uint16 foster_l_to_r[] = { 41+12*64, 40+12*64, 47+12*64, - 0, + 0 }; uint16 foster_r_to_d[] = { 47+12*64, - 0, + 0 }; uint16 foster_r_to_l[] = { 45+12*64, 44+12*64, 43+12*64, - 0, + 0 }; uint16 foster_t_to_u[] = { 47+12*64, 46+12*64, 45+12*64, - 0, + 0 }; uint16 foster_t_to_l[] = { 40+12*64, 41+12*64, - 0, + 0 }; uint16 fradman_st_down[] = { @@ -4217,7 +4394,7 @@ uint16 fradman_st_down[] = { 1, 0, 40, - 0, + 0 }; uint16 fradman_st_left[] = { @@ -4225,7 +4402,7 @@ uint16 fradman_st_left[] = { 1, 0, 42, - 0, + 0 }; uint16 fradman_st_talk[] = { @@ -4233,32 +4410,32 @@ uint16 fradman_st_talk[] = { 1, 0, 0, - 0, + 0 }; uint16 fradman_d_to_l[] = { 41+90*64, - 0, + 0 }; uint16 fradman_d_to_r[] = { 47+90*64, - 0, + 0 }; uint16 fradman_l_to_u[] = { 43+90*64, - 0, + 0 }; uint16 fradman_r_to_u[] = { 45+90*64, - 0, + 0 }; uint16 fradman_r_to_d[] = { 47+90*64, - 0, + 0 }; uint16 bfoster_right[] = { @@ -4302,7 +4479,7 @@ uint16 bfoster_right[] = { 39+182*64, 4, 0, - 0, + 0 }; uint16 bfoster_st_up[] = { @@ -4310,7 +4487,7 @@ uint16 bfoster_st_up[] = { 1, 0, 44, - 0, + 0 }; uint16 bfoster_st_down[] = { @@ -4318,36 +4495,36 @@ uint16 bfoster_st_down[] = { 1, 0, 40, - 0, + 0 }; uint16 bfoster_u_to_d[] = { 43+182*64, 42+182*64, 41+182*64, - 0, + 0 }; uint16 bfoster_d_to_l[] = { 41+182*64, - 0, + 0 }; uint16 bfoster_l_to_u[] = { 43+182*64, - 0, + 0 }; uint16 bfoster_l_to_d[] = { 41+182*64, - 0, + 0 }; uint16 bfoster_l_to_r[] = { 41+182*64, 40+182*64, 47+182*64, - 0, + 0 }; TurnTable foster_turnTable0 = { @@ -4499,7 +4676,7 @@ TurnTable foster_turnTable3 = { 0, 0, 0 - }, + } }; MegaSet foster_megaSet0 = { @@ -4567,7 +4744,7 @@ MegaSet foster_megaSet3 = { bfoster_st_left, // standLeft bfoster_st_right, // standRight 0, // standTalk - &foster_turnTable3, + &foster_turnTable3 }; ExtCompact foster_ext = { @@ -4599,7 +4776,7 @@ ExtCompact foster_ext = { &foster_megaSet0, &foster_megaSet1, &foster_megaSet2, - &foster_megaSet3, + &foster_megaSet3 }; Compact foster = { @@ -4631,7 +4808,7 @@ Compact foster = { C_BASE_MODE, // mode BASE_INTRO, // baseSub 0, // baseSub_off - &foster_ext, + &foster_ext }; uint16 monitor_up[] = { @@ -4667,7 +4844,7 @@ uint16 monitor_up[] = { 7+74*64, 0, 65534, - 0, + 0 }; uint16 s0_fast_list[] = { @@ -4683,7 +4860,7 @@ uint16 s0_fast_list[] = { 15+0X8000, 71+0X8000, 72+0X8000, - 0, + 0 }; uint16 s7_fast_list[] = { @@ -4697,7 +4874,7 @@ uint16 s7_fast_list[] = { 146+DISK_2, 151+DISK_2, 149+DISK_2, - 0, + 0 }; uint16 monitor_st_talk[] = { @@ -4705,7 +4882,7 @@ uint16 monitor_st_talk[] = { 1, 1, 0, - 0, + 0 }; uint16 fast_list_sc90[] = { @@ -4724,7 +4901,7 @@ uint16 fast_list_sc90[] = { IT_SC90_LAYER_0+DISK_4, IT_SC90_LAYER_1+DISK_4, IT_SC90_GRID_1+DISK_4, - 0, + 0 }; uint16 but_2[] = { @@ -4738,7 +4915,7 @@ uint16 but_2[] = { 1, 1, 0, - 0, + 0 }; uint16 but_3[] = { @@ -4752,7 +4929,7 @@ uint16 but_3[] = { 1, 1, 0, - 0, + 0 }; uint16 monitor_st_down[] = { @@ -4760,7 +4937,7 @@ uint16 monitor_st_down[] = { 1, 1, 32, - 0, + 0 }; uint32 *zt = 0; @@ -4776,7 +4953,7 @@ uint16 but_9[] = { 1, 1, 0, - 0, + 0 }; Compact text_11 = { @@ -4802,6 +4979,13 @@ Compact text_11 = { 0, // downFlag 0, // getToFlag 0, // flag + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact joey_park = { @@ -4811,6 +4995,29 @@ Compact joey_park = { 0, // screen 0, // place park_table, // getToTable + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact coordinate_test = { @@ -4831,6 +5038,18 @@ Compact coordinate_test = { 0, // mouseRel_y 64, // mouseSize_x 12, // mouseSize_y + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact text_2 = { @@ -4856,6 +5075,13 @@ Compact text_2 = { 0, // downFlag 0, // getToFlag 0, // flag + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact text_3 = { @@ -4881,6 +5107,13 @@ Compact text_3 = { 0, // downFlag 0, // getToFlag 0, // flag + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact text_6 = { @@ -4906,6 +5139,13 @@ Compact text_6 = { 0, // downFlag 0, // getToFlag 0, // flag + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact text_7 = { @@ -4931,6 +5171,13 @@ Compact text_7 = { 0, // downFlag 0, // getToFlag 0, // flag + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; Compact text_9 = { @@ -4956,6 +5203,13 @@ Compact text_9 = { 0, // downFlag 0, // getToFlag 0, // flag + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rad_shrug_seq[] = { @@ -4978,7 +5232,7 @@ uint16 rad_shrug_seq[] = { 1, 1, 49, - 0, + 0 }; uint32 *talk1 = 0; @@ -5000,7 +5254,7 @@ uint16 rs_lamb_start_2[] = { 65488, C_DIR, DOWN, - 65535, + 65535 }; uint16 s6_fast_list[] = { @@ -5012,7 +5266,7 @@ uint16 s6_fast_list[] = { 135, 24+DISK_2+0X8000, 25+DISK_2+0X8000, - 0, + 0 }; uint16 swing_list[] = { @@ -5020,7 +5274,7 @@ uint16 swing_list[] = { 86+DISK_1, 87+DISK_1, 88+DISK_1, - 0, + 0 }; Compact right_exit0 = { @@ -5042,6 +5296,17 @@ Compact right_exit0 = { 9, // mouseSize_x 36, // mouseSize_y ER0_ACTION, // actionScript + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 }; uint16 rs_blank[] = { @@ -5051,7 +5316,7 @@ uint16 rs_blank[] = { MENU_SCRIPT, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint8 monitor_auto[64]; @@ -5089,7 +5354,7 @@ uint16 monitor_down[] = { 15+74*64, 0, 2, - 0, + 0 }; uint16 monitor_st_left[] = { @@ -5097,7 +5362,7 @@ uint16 monitor_st_left[] = { 1, 1, 34, - 0, + 0 }; uint16 monitor_st_right[] = { @@ -5105,41 +5370,41 @@ uint16 monitor_st_right[] = { 1, 1, 38, - 0, + 0 }; uint16 monitor_u_to_r[] = { 45-8+74*64, - 0, + 0 }; uint16 monitor_d_to_u[] = { 47-8+74*64, 46-8+74*64, 45-8+74*64, - 0, + 0 }; uint16 monitor_d_to_l[] = { 41-8+74*64, - 0, + 0 }; uint16 monitor_l_to_d[] = { 41-8+74*64, - 0, + 0 }; uint16 monitor_r_to_d[] = { 47-8+74*64, - 0, + 0 }; uint16 monitor_r_to_l[] = { 45-8+74*64, 44-8+74*64, 43-8+74*64, - 0, + 0 }; TurnTable monitor_turnTable0 = { @@ -5177,7 +5442,7 @@ TurnTable monitor_turnTable0 = { 0, 0, 0 - }, + } }; MegaSet monitor_megaSet0 = { @@ -5194,7 +5459,7 @@ MegaSet monitor_megaSet0 = { monitor_st_left, // standLeft monitor_st_right, // standRight monitor_st_talk, // standTalk - &monitor_turnTable0, + &monitor_turnTable0 }; ExtCompact monitor_ext = { @@ -5224,6 +5489,9 @@ ExtCompact monitor_ext = { monitor_auto, // animScratch 0, // megaSet &monitor_megaSet0, + 0, + 0, + 0 }; Compact monitor = { @@ -5255,7 +5523,7 @@ Compact monitor = { 0, // mode MONITOR_SLEEP, // baseSub 0, // baseSub_off - &monitor_ext, + &monitor_ext }; ExtCompact anita_ext = { @@ -5284,6 +5552,10 @@ ExtCompact anita_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet + 0, + 0, + 0, + 0 }; Compact anita = { @@ -5315,7 +5587,7 @@ Compact anita = { 0, // mode ANITA_WORK, // baseSub 0, // baseSub_off - &anita_ext, + &anita_ext }; uint16 rs_r_arr_linc[] = { @@ -5325,7 +5597,7 @@ uint16 rs_r_arr_linc[] = { LINC_MENU_SCRIPT, C_BASE_SUB+2, 0, - 65535, + 65535 }; uint16 s5_fast_list[] = { @@ -5338,7 +5610,7 @@ uint16 s5_fast_list[] = { 17+DISK_2, 18+DISK_2, 113+DISK_2, - 0, + 0 }; uint16 but_e[] = { @@ -5352,7 +5624,7 @@ uint16 but_e[] = { 1, 1, 0, - 0, + 0 }; uint16 but_1[] = { @@ -5366,7 +5638,7 @@ uint16 but_1[] = { 1, 1, 0, - 0, + 0 }; uint16 but_6[] = { @@ -5380,21 +5652,21 @@ uint16 but_6[] = { 1, 1, 0, - 0, + 0 }; uint16 fast_intro_2[] = { 189+DISK_15, 190+DISK_15, 191+DISK_15, - 0, + 0 }; uint16 fast_intro_3[] = { 192+DISK_15, 193+DISK_15, 194+DISK_15, - 0, + 0 }; uint16 retina_scan_cdt[] = { @@ -5477,7 +5749,7 @@ uint16 retina_scan_cdt[] = { 378, 302, 17, - 0, + 0 }; Compact forklift_cpt = { @@ -5509,6 +5781,7 @@ Compact forklift_cpt = { C_BASE_MODE, // mode FORKLIFT_LOGIC, // baseSub 0, // baseSub_off + 0 }; void *data_0[] = { @@ -5691,7 +5964,7 @@ void *data_0[] = { exit_seq, &forklift_cpt, forklift1_cdt, - forklift2_cdt, + forklift2_cdt }; uint32 *z_compact_table = 0; |