diff options
author | Robert Göffringmann | 2003-06-09 20:38:26 +0000 |
---|---|---|
committer | Robert Göffringmann | 2003-06-09 20:38:26 +0000 |
commit | d899de98ba7e61337058f19d8dbc5fa8f9bb3326 (patch) | |
tree | 15effea28af70bef8bee628a72c192710dbd5a73 /sky/compacts | |
parent | 74bacc470f9442edad227cb9163abda6f7ba4f10 (diff) | |
download | scummvm-rg350-d899de98ba7e61337058f19d8dbc5fa8f9bb3326.tar.gz scummvm-rg350-d899de98ba7e61337058f19d8dbc5fa8f9bb3326.tar.bz2 scummvm-rg350-d899de98ba7e61337058f19d8dbc5fa8f9bb3326.zip |
fixed compact data
svn-id: r8420
Diffstat (limited to 'sky/compacts')
-rw-r--r-- | sky/compacts/0compact.h | 6 | ||||
-rw-r--r-- | sky/compacts/27comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/2compact.h | 6 | ||||
-rw-r--r-- | sky/compacts/30comp.h | 4 | ||||
-rw-r--r-- | sky/compacts/31comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/32comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/33comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/34comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/36comp.h | 4 | ||||
-rw-r--r-- | sky/compacts/37comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/38comp.h | 6 | ||||
-rw-r--r-- | sky/compacts/39comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/3compact.h | 2 | ||||
-rw-r--r-- | sky/compacts/40comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/41comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/42comp.h | 4 | ||||
-rw-r--r-- | sky/compacts/44comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/45comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/46comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/47comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/48comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/4compact.h | 4 | ||||
-rw-r--r-- | sky/compacts/5compact.h | 4 | ||||
-rw-r--r-- | sky/compacts/66comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/72comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/73comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/90comp.h | 2 | ||||
-rw-r--r-- | sky/compacts/z_compac.h | 10 |
28 files changed, 43 insertions, 43 deletions
diff --git a/sky/compacts/0compact.h b/sky/compacts/0compact.h index f335e455c0..73d81e3939 100644 --- a/sky/compacts/0compact.h +++ b/sky/compacts/0compact.h @@ -457,7 +457,7 @@ uint16 f_ss_st_right[] = { 0 }; -uint32 *c74 = 0; +uint32 *c74 = (uint32*)(&mini_so); uint16 f_ss_left[] = { 4, @@ -1131,7 +1131,7 @@ uint16 rs_foster_to_1[] = { 65535 }; -uint32 *rs_jobs_4_2 = 0; +uint32 *rs_jobs_4_2 = (uint32*)rs_foster_4_2; uint16 monitor_seq[] = { 151*64, @@ -6869,7 +6869,7 @@ uint16 guard_lean_out[] = { 0 }; -uint32 *c101 = 0; +uint32 *c101 = (uint32*)(&full_so); uint16 put_bar_away[] = { 88*64, diff --git a/sky/compacts/27comp.h b/sky/compacts/27comp.h index 38c07a8f67..2e48deade9 100644 --- a/sky/compacts/27comp.h +++ b/sky/compacts/27comp.h @@ -1291,7 +1291,7 @@ uint16 helmet_down[] = { 0 }; -uint32 *heart_seq = 0; +uint32 *heart_seq = (uint32*)lung_seq; uint16 squirm_seq[] = { 164*64, diff --git a/sky/compacts/2compact.h b/sky/compacts/2compact.h index 07d7178963..0a8999c7fc 100644 --- a/sky/compacts/2compact.h +++ b/sky/compacts/2compact.h @@ -56,7 +56,7 @@ uint16 sml_loader_u_to_l[] = { 0 }; -uint32 *c4121 = 0; +uint32 *c4121 = (uint32*)&loader; uint16 loader_right[] = { 2, @@ -625,7 +625,7 @@ uint16 loader_l_to_d[] = { 0 }; -uint16 *left_table2 = 0; +uint16 *left_table2 = (uint16*)(&junk1); uint16 sml_loaderb_u_to_d[] = { 24+158*64, @@ -865,7 +865,7 @@ uint16 chip_list_s2[] = { 0 }; -uint32 *exit_table = 0; +uint32 *exit_table = (uint32*)(&junk1); uint16 sml_loaderb_r_to_l[] = { 23+158*64, diff --git a/sky/compacts/30comp.h b/sky/compacts/30comp.h index 044a409ba7..cd12968002 100644 --- a/sky/compacts/30comp.h +++ b/sky/compacts/30comp.h @@ -629,7 +629,7 @@ uint16 sc30_palette[] = { 16191 }; -uint32 *sec4_compacts = 0; +uint32 *sec4_compacts = (uint32*)data_4; uint16 sc36_col_talk2[] = { 63*64, @@ -1491,7 +1491,7 @@ uint16 sc30_mouse_list[] = { ID_TEXT_MOUSE }; -uint32 *sc30_walk_grid = 0; +uint32 *sc30_walk_grid = (uint32*)sc30_joey_list; Compact sc30_exit_31 = { 0, // logic diff --git a/sky/compacts/31comp.h b/sky/compacts/31comp.h index adb80ca11c..43b099604f 100644 --- a/sky/compacts/31comp.h +++ b/sky/compacts/31comp.h @@ -743,7 +743,7 @@ uint16 sc31_rope_pulled[] = { 0 }; -uint32 *sc31_walk_grid = 0; +uint32 *sc31_walk_grid = (uint32*)sc31_joey_list; Compact sc31_rope = { L_SCRIPT, // logic diff --git a/sky/compacts/32comp.h b/sky/compacts/32comp.h index 65292297a4..bcfe2f6bc5 100644 --- a/sky/compacts/32comp.h +++ b/sky/compacts/32comp.h @@ -498,7 +498,7 @@ Compact sc32_vincent = { &sc32_vincent_ext }; -uint32 *sc32_walk_grid = 0; +uint32 *sc32_walk_grid = (uint32*)sc32_joey_list; uint16 sc32_gard_turn_d[] = { 59*64, diff --git a/sky/compacts/33comp.h b/sky/compacts/33comp.h index e91a622df4..ef5f3cf4fc 100644 --- a/sky/compacts/33comp.h +++ b/sky/compacts/33comp.h @@ -469,7 +469,7 @@ uint16 sc33_door_open[] = { 0 }; -uint32 *sc33_walk_grid = 0; +uint32 *sc33_walk_grid = (uint32*)sc33_joey_list; uint16 reset_34_33[] = { C_SCREEN, diff --git a/sky/compacts/34comp.h b/sky/compacts/34comp.h index 45a46c9142..143c43490a 100644 --- a/sky/compacts/34comp.h +++ b/sky/compacts/34comp.h @@ -81,7 +81,7 @@ Compact sc34_secateurs = { 0 }; -uint32 *sc34_walk_grid = 0; +uint32 *sc34_walk_grid = (uint32*)sc34_fast_list; uint16 sc34_logic_list[] = { ID_FOSTER, diff --git a/sky/compacts/36comp.h b/sky/compacts/36comp.h index 7fe5e4f4e6..c2e20c9fe5 100644 --- a/sky/compacts/36comp.h +++ b/sky/compacts/36comp.h @@ -3268,7 +3268,7 @@ uint16 sc36_col_blink1[] = { 0 }; -uint32 *babs = 0; +uint32 *babs = (uint32*)&sc36_babs; uint16 bar_wipe[] = { 32*64, @@ -3846,7 +3846,7 @@ Compact sc36_floor = { 0 }; -uint32 *sc36_walk_grid = 0; +uint32 *sc36_walk_grid = (uint32*)sc36_fast_list; uint16 sc36_dooropen[] = { 144*64, diff --git a/sky/compacts/37comp.h b/sky/compacts/37comp.h index 3afc8bf2d8..24af1d9532 100644 --- a/sky/compacts/37comp.h +++ b/sky/compacts/37comp.h @@ -1541,7 +1541,7 @@ uint16 sc37_doorshut[] = { 0 }; -uint32 *sc37_walk_grid = 0; +uint32 *sc37_walk_grid = (uint32*)sc37_fast_list; Compact sc37_door = { L_SCRIPT, // logic diff --git a/sky/compacts/38comp.h b/sky/compacts/38comp.h index 69a7c26cd6..0b51efacd9 100644 --- a/sky/compacts/38comp.h +++ b/sky/compacts/38comp.h @@ -1209,7 +1209,7 @@ uint16 sex_d_to_r[] = { 0 }; -uint32 *spu = 0; +uint32 *spu = (uint32*)&spunky; uint16 sc38_floor_table[] = { ID_SC38_FLOOR, @@ -2833,9 +2833,9 @@ uint16 sc38_ringer_anim[] = { 0 }; -uint32 *sc38_walk_grid = 0; +uint32 *sc38_walk_grid = (uint32*)sc38_fast_list; -uint32 *dna = 0; +uint32 *dna = (uint32*)&danielle; uint16 spu_st_right[] = { 71*64, diff --git a/sky/compacts/39comp.h b/sky/compacts/39comp.h index 25cfdf71dc..a5943355d1 100644 --- a/sky/compacts/39comp.h +++ b/sky/compacts/39comp.h @@ -327,7 +327,7 @@ Compact sc39_exit_41 = { 0 }; -uint32 *sc39_walk_grid = 0; +uint32 *sc39_walk_grid = (uint32*)sc39_fast_list; uint16 sc39_descend[] = { 23*64, diff --git a/sky/compacts/3compact.h b/sky/compacts/3compact.h index 31e6d07a13..0aea181a52 100644 --- a/sky/compacts/3compact.h +++ b/sky/compacts/3compact.h @@ -574,7 +574,7 @@ Compact eye_ball = { &eye_ball_ext }; -uint32 *sh = 0; +uint32 *sh = (uint32*)&shades; uint16 liftc3_up[] = { 204*64, diff --git a/sky/compacts/40comp.h b/sky/compacts/40comp.h index 98addc7575..f35cea29c6 100644 --- a/sky/compacts/40comp.h +++ b/sky/compacts/40comp.h @@ -168,7 +168,7 @@ Compact sc40_cabinet = { 0 }; -uint32 *sc40_walk_grid = 0; +uint32 *sc40_walk_grid = (uint32*)sc40_fast_list; uint16 sc40_palette[] = { 0, diff --git a/sky/compacts/41comp.h b/sky/compacts/41comp.h index 8dd4f9d1ad..83669c75a0 100644 --- a/sky/compacts/41comp.h +++ b/sky/compacts/41comp.h @@ -154,7 +154,7 @@ uint16 sc41_heat_1_anim[] = { 0 }; -uint32 *sc41_walk_grid = 0; +uint32 *sc41_walk_grid = (uint32*)sc41_fast_list; uint16 sc41_fast_list[] = { 13+DISK_14, diff --git a/sky/compacts/42comp.h b/sky/compacts/42comp.h index 7957a587fe..5c8e77ed1c 100644 --- a/sky/compacts/42comp.h +++ b/sky/compacts/42comp.h @@ -541,8 +541,6 @@ uint16 sc42_logic_list[] = { ID_STD_MENU_LOGIC }; -uint32 *sc42_walk_grid = 0; - uint16 sc42_jdg_turn[] = { 167*64, 1, @@ -566,6 +564,8 @@ uint16 sc42_fast_list[] = { 0 }; +uint32 *sc42_walk_grid = (uint32*)sc42_fast_list; + ExtCompact sc42_prosecution_ext = { 0, // actionSub 0, // actionSub_off diff --git a/sky/compacts/44comp.h b/sky/compacts/44comp.h index 519820d06a..2e49fad198 100644 --- a/sky/compacts/44comp.h +++ b/sky/compacts/44comp.h @@ -33,7 +33,7 @@ uint16 sc44_chip_list[] = { 0 }; -uint32 *sc44_walk_grid = 0; +uint32 *sc44_walk_grid = (uint32*)sc44_fast_list; Compact sc44_rubble = { 0, // logic diff --git a/sky/compacts/45comp.h b/sky/compacts/45comp.h index 880b7878c4..708ef71c76 100644 --- a/sky/compacts/45comp.h +++ b/sky/compacts/45comp.h @@ -567,7 +567,7 @@ uint16 sc45_fast_list[] = { 0 }; -uint32 *sc45_walk_grid = 0; +uint32 *sc45_walk_grid = (uint32*)sc45_fast_list; uint16 reset_47_45[] = { C_SCREEN, diff --git a/sky/compacts/46comp.h b/sky/compacts/46comp.h index 6deddc9a38..f2ed41be48 100644 --- a/sky/compacts/46comp.h +++ b/sky/compacts/46comp.h @@ -477,7 +477,7 @@ uint16 sc46_mouse_list[] = { ID_TEXT_MOUSE }; -uint32 *sc46_walk_grid = 0; +uint32 *sc46_walk_grid = (uint32*)sc46_fast_list; uint16 sc46_fast_list[] = { 12+DISK_13, diff --git a/sky/compacts/47comp.h b/sky/compacts/47comp.h index 72e409781c..e60b366a7d 100644 --- a/sky/compacts/47comp.h +++ b/sky/compacts/47comp.h @@ -478,7 +478,7 @@ Compact sc47_exit_48 = { 0 }; -uint32 *sc47_walk_grid = 0; +uint32 *sc47_walk_grid = (uint32*)sc47_fast_list; uint16 sc47_fast_list[] = { 12+DISK_13, diff --git a/sky/compacts/48comp.h b/sky/compacts/48comp.h index 130923f204..53f58cfa15 100644 --- a/sky/compacts/48comp.h +++ b/sky/compacts/48comp.h @@ -741,7 +741,7 @@ Compact sc48_exit_65 = { 0 }; -uint32 *sc48_walk_grid = 0; +uint32 *sc48_walk_grid = (uint32*)sc48_fast_list; Compact sc48_floor = { 0, // logic diff --git a/sky/compacts/4compact.h b/sky/compacts/4compact.h index 29c95a0eca..7629276206 100644 --- a/sky/compacts/4compact.h +++ b/sky/compacts/4compact.h @@ -151,7 +151,7 @@ uint16 s4_talk_table[] = { 65535 }; -uint32 *l_talk_s4 = 0; +uint32 *l_talk_s4 = (uint32*)&r_talk_s4; uint16 chip_list_sc4[] = { 56, @@ -1192,7 +1192,7 @@ uint16 joey_list_s4[] = { 0 }; -uint32 *c43 = 0; +uint32 *c43 = (uint32*)&jobsworth; Compact chuck_s4 = { L_SCRIPT, // logic diff --git a/sky/compacts/5compact.h b/sky/compacts/5compact.h index 623b1080f4..2f4274dc40 100644 --- a/sky/compacts/5compact.h +++ b/sky/compacts/5compact.h @@ -3497,7 +3497,7 @@ uint16 s5_pal[] = { 16191 }; -uint32 *z2 = 0; +uint32 *z2 = (uint32*)data_2; uint32 *grid6 = 0; @@ -4921,7 +4921,7 @@ void *data_2[] = { &foreman }; -uint32 *table2 = 0; +uint32 *table2 = (uint32*)data_2; }; // namespace SkyCompact diff --git a/sky/compacts/66comp.h b/sky/compacts/66comp.h index b6d12a347a..9a9099fa15 100644 --- a/sky/compacts/66comp.h +++ b/sky/compacts/66comp.h @@ -4001,7 +4001,7 @@ uint16 fost_conv_left[] = { 0 }; -uint32 *sec5_compacts = 0; +uint32 *sec5_compacts = (uint32*)data_5; uint16 sc81_fos_sat_tlk[] = { 205*64, diff --git a/sky/compacts/72comp.h b/sky/compacts/72comp.h index df183ea0c9..5e3ef9a579 100644 --- a/sky/compacts/72comp.h +++ b/sky/compacts/72comp.h @@ -443,7 +443,7 @@ uint16 wit_u_to_d[] = { 0 }; -uint32 *wit = 0; +uint32 *wit = (uint32*)&witness; Compact sc72_cham2_light = { L_SCRIPT, // logic diff --git a/sky/compacts/73comp.h b/sky/compacts/73comp.h index 7cf76b9359..5c6d69657b 100644 --- a/sky/compacts/73comp.h +++ b/sky/compacts/73comp.h @@ -2512,7 +2512,7 @@ Compact sc73_big_door = { 0 }; -uint32 *gal = 0; +uint32 *gal = (uint32*)&gal; Compact sc73_cham4_light = { L_SCRIPT, // logic diff --git a/sky/compacts/90comp.h b/sky/compacts/90comp.h index 1fa8252858..5c93f3bd21 100644 --- a/sky/compacts/90comp.h +++ b/sky/compacts/90comp.h @@ -1855,7 +1855,7 @@ void *data_6[] = { linc_menu_mouse }; -uint32 *sec6_compacts = 0; +uint32 *sec6_compacts = (uint32*)data_6; }; // namespace SkyCompact diff --git a/sky/compacts/z_compac.h b/sky/compacts/z_compac.h index bd4deb7730..ef293541c6 100644 --- a/sky/compacts/z_compac.h +++ b/sky/compacts/z_compac.h @@ -1550,7 +1550,7 @@ uint16 foster_u_to_d[] = { 0 }; -uint32 *c68 = 0; +uint32 *c68 = (uint32*)&foster; uint16 ljoey_d_to_r[] = { 23+173*64, @@ -2070,7 +2070,7 @@ uint16 sml_door_table[] = { GET_TO_TALK2 }; -uint32 *l_talk_s2 = 0; +uint32 *l_talk_s2 = (uint32*)&r_talk_s2; uint16 bfoster_r_to_l[] = { 45+182*64, @@ -4940,7 +4940,7 @@ uint16 monitor_st_down[] = { 0 }; -uint32 *zt = 0; +uint32 *zt = (uint32*)data_0; uint16 but_9[] = { 149*64, @@ -5235,7 +5235,7 @@ uint16 rad_shrug_seq[] = { 0 }; -uint32 *talk1 = 0; +uint32 *talk1 = (uint32*)(&talk2); uint16 rs_lamb_start_2[] = { C_STATUS, @@ -5967,7 +5967,7 @@ void *data_0[] = { forklift2_cdt }; -uint32 *z_compact_table = 0; +uint32 *z_compact_table = (uint32*)data_0; }; // namespace SkyCompact |