[Scummvm-cvs-logs] CVS: scummvm/sky compact.cpp,1.13,1.14 compact.h,1.7,1.8 logic.cpp,1.110,1.111 sky.cpp,1.69,1.70
Robert G?ffringmann
lavosspawn at users.sourceforge.net
Thu Jul 3 10:18:18 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/common engine.cpp,1.20,1.21 timer.cpp,1.10,1.11 timer.h,1.6,1.7
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl.cpp,1.39,1.40 sdl_gl.cpp,1.45,1.46
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv11648/sky
Modified Files:
compact.cpp compact.h logic.cpp sky.cpp
Log Message:
Compact data for v. 0.0288, works as well as 0.0368 now.
Index: compact.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compact.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- compact.cpp 11 Jun 2003 05:06:22 -0000 1.13
+++ compact.cpp 3 Jul 2003 17:17:32 -0000 1.14
@@ -279,5 +279,307 @@
error("Offset %X out of bounds of compact", off + COMPACT_SIZE + EXTCOMPACT_SIZE + 4 * MEGASET_SIZE + 4 * TURNTABLE_SIZE);
}
+
+// getToTables
+uint16 s11_fl_tab288[33] = {
+ 0x3132, 0x001C, 0x3139, 0x3017, 0x3145, 0x301B, 0x3148, 0x301D,
+ 0x314C, 0x301F, 0x314D, 0x3021, 0x314E, 0x3022, 0x314F, 0x3023,
+ 0x3150, 0x3024, 0x3152, 0x301F, 0x3153, 0x3021, 0x3154, 0x3022,
+ 0x3155, 0x3023, 0x3156, 0x3024, 0x3157, 0x3026, 0x0000, 0x3028,
+ 0xFFFF
+};
+
+uint16 s19_fl_tab288[17] = {
+ 0x3042, 0x001C, 0x0002, 0x002A, 0x0000, 0x302A, 0x0001, 0x3029,
+ 0x3046, 0x302B, 0x3049, 0x302D, 0x3189, 0x302F, 0x3001, 0x3033,
+ 0xFFFF
+};
+
+uint16 s20_fl_tab288[37] = {
+ 0x30A4, 0x001C, 0x0002, 0x002A, 0x0000, 0x3035, 0x0001, 0x303F,
+ 0x0003, 0x3049, 0x30A8, 0x3037, 0x30AB, 0x303B, 0x30BA, 0x3047,
+ 0x30AE, 0x303D, 0x30BD, 0x3043, 0x30C8, 0x304A, 0x30C9, 0x304C,
+ 0x30CA, 0x304E, 0x3102, 0x3052, 0x310B, 0x3054, 0x310C, 0x3056,
+ 0x0017, 0x3059, 0x0018, 0x305B, 0xFFFF
+};
+
+uint16 s21_fl_tab288[31] = {
+ 0x30C2, 0x001C, 0x0002, 0x002A, 0x0000, 0x305C, 0x30C6, 0x305D,
+ 0x30DE, 0x305F, 0x30DF, 0x3061, 0x30E0, 0x3063, 0x30E2, 0x3066,
+ 0x30E4, 0x3069, 0x30E5, 0x306B, 0x30EC, 0x306D, 0x30EE, 0x3072,
+ 0x30EF, 0x3074, 0x30ED, 0x306F, 0x30F6, 0x3077, 0xFFFF
+};
+
+uint16 s22_fl_tab288[31] = {
+ 0x30B3, 0x001C, 0x0002, 0x002A, 0x0000, 0x307A, 0x30B7, 0x307B,
+ 0x30CC, 0x307D, 0x30CD, 0x307F, 0x30CE, 0x3081, 0x30CF, 0x3081,
+ 0x30D0, 0x3085, 0x30D5, 0x3087, 0x30D9, 0x308A, 0x30DA, 0x308C,
+ 0x30DB, 0x308E, 0x30DC, 0x3090, 0x30DD, 0x3092, 0xFFFF
+} ;
+
+uint16 s23_fl_tab288[27] = {
+ 0x3015, 0x001C, 0x0002, 0x002A, 0x0000, 0x3095, 0x0001, 0x3096,
+ 0x0003, 0x3097, 0x3019, 0x3098, 0x301B, 0x309A, 0x3027, 0x309D,
+ 0x305E, 0x309F, 0x305F, 0x30A1, 0x3060, 0x30A3, 0x3061, 0x30A5,
+ 0x3184, 0x30A7, 0xFFFF
+};
+
+uint16 s24_fl_tab288[23] = {
+ 0x302C, 0x001C, 0x0002, 0x002A, 0x0000, 0x30A9, 0x3030, 0x30AA,
+ 0x3062, 0x30AC, 0x3063, 0x30AE, 0x3064, 0x30B0, 0x3075, 0x30B2,
+ 0x309A, 0x30B7, 0x3115, 0x30BA, 0x3118, 0x30BB, 0xFFFF
+};
+
+uint16 s25_fl_tab288[19] = {
+ 0x3020, 0x001C, 0x0002, 0x002A, 0x0000, 0x30BE, 0x3024, 0x30BF,
+ 0x308E, 0x30C4, 0x0003, 0x30C7, 0x3093, 0x30C9, 0x3092, 0x30CE,
+ 0x3101, 0x30D0, 0xFFFF
+};
+
+uint16 s26_fl_tab288[29] = {
+ 0x304E, 0x001C, 0x0002, 0x002A, 0x0000, 0x30D3, 0x0001, 0x30D2,
+ 0x3052, 0x30D4, 0x3066, 0x30E3, 0x3057, 0x30D7, 0x3058, 0x30D7,
+ 0x3059, 0x30D7, 0x305A, 0x30D7, 0x305B, 0x30DC, 0x305C, 0x30E9,
+ 0x305D, 0x30DF, 0x30FD, 0x30E7, 0xFFFF
+};
+
+uint16 body_tab288[7] = {
+ 0x3081, 0x30F5, 0x3073, 0x30F3, 0x0018, 0x30FC, 0xFFFF
+};
+
+uint16 chair_tab288[23] = {
+ 0x3081, 0x001C, 0x306B, 0x30F7, 0x306F, 0x30F7, 0x0017, 0x30F7,
+ 0x3071, 0x30F7, 0x3072, 0x30F7, 0x3073, 0x30F7, 0x3074, 0x30F7,
+ 0x3089, 0x30F7, 0x308D, 0x30F7, 0x3084, 0x30F7, 0xFFFF
+};
+
+uint16 s27_fl_tab288[29] = {
+ 0x306B, 0x001C, 0x306F, 0x30ED, 0x0002, 0x002A, 0x0017, 0x30FA,
+ 0x0018, 0x30FC, 0x0000, 0x30EC, 0x3071, 0x30EF, 0x3072, 0x30F1,
+ 0x3073, 0x30F3, 0x3074, 0x30F8, 0x3089, 0x30FE, 0x3081, 0x30F5,
+ 0x3084, 0x3109, 0x308D, 0x3108, 0xFFFF
+};
+
+uint16 s28_fl_tab288[27] = {
+ 0x3037, 0x001C, 0x0002, 0x002A, 0x0000, 0x310E, 0x0001, 0x3113,
+ 0x0003, 0x3119, 0x303B, 0x310F, 0x303D, 0x3111, 0x309F, 0x3117,
+ 0x3054, 0x3114, 0x0017, 0x311B, 0x0018, 0x311D, 0x3196, 0x3125,
+ 0x3199, 0x3128, 0xFFFF
+};
+
+uint16 s28_sml_tab288[13] = {
+ 0x318E, 0x001C, 0x0002, 0x002A, 0x3187, 0x311E, 0x3188, 0x3120,
+ 0x0004, 0x3122, 0x0005, 0x3123, 0xFFFF
+} ;
+
+
+uint16 s29_fl_tab288[27] = {
+ 0x3004, 0x001C, 0x0002, 0x002A, 0x3008, 0x312C, 0x300B, 0x312E,
+ 0x002A, 0x3137, 0x3010, 0x3130, 0x3032, 0x3133, 0x0001, 0x3132,
+ 0x0003, 0x3135, 0x002A, 0x3137, 0x0017, 0x313C, 0x0018, 0x313E,
+ 0x312C, 0x313F, 0xFFFF
+};
+
+uint16 s29_sml_tab288[13] = {
+ 0x318A, 0x001C, 0x0002, 0x002A, 0x3185, 0x3141, 0x3186, 0x3143,
+ 0x0004, 0x3145, 0x0005, 0x3146, 0xFFFF
+};
+
+void patchFor288(void) {
+ memcpy(s11_floor_table, s11_fl_tab288, sizeof(s11_fl_tab288));
+ memcpy(s19_floor_table, s19_fl_tab288, sizeof(s19_fl_tab288));
+ memcpy(s20_floor_table, s20_fl_tab288, sizeof(s20_fl_tab288));
+ memcpy(s21_floor_table, s21_fl_tab288, sizeof(s21_fl_tab288));
+ memcpy(s22_floor_table, s22_fl_tab288, sizeof(s22_fl_tab288));
+ memcpy(s23_floor_table, s23_fl_tab288, sizeof(s23_fl_tab288));
+ memcpy(s24_floor_table, s24_fl_tab288, sizeof(s24_fl_tab288));
+ memcpy(s25_floor_table, s25_fl_tab288, sizeof(s25_fl_tab288));
+ memcpy(s26_floor_table, s26_fl_tab288, sizeof(s26_fl_tab288));
+ memcpy(s27_floor_table, s27_fl_tab288, sizeof(s27_fl_tab288));
+ memcpy(s28_floor_table, s28_fl_tab288, sizeof(s28_fl_tab288));
+ memcpy(s28_sml_table, s28_sml_tab288, sizeof(s28_sml_tab288));
+ memcpy(s29_floor_table, s29_fl_tab288, sizeof(s29_fl_tab288));
+ memcpy(s29_sml_table, s29_sml_tab288, sizeof(s29_sml_tab288));
+ memcpy(body_table, body_tab288, sizeof(body_tab288));
+ memcpy(chair_table, chair_tab288, sizeof(chair_tab288));
+
+ ((Compact *)SkyCompact::data_0[121])->baseSub = 0x50; // full_screen
+ ((Compact *)SkyCompact::data_0[122])->mouseClick = 0x51; // cancel_button
+ ((Compact *)SkyCompact::data_0[122])->baseSub = 0x53;
+ ((Compact *)SkyCompact::data_0[123])->mouseClick = 0x52; // button_0
+ ((Compact *)SkyCompact::data_0[123])->baseSub = 0x53;
+ ((Compact *)SkyCompact::data_0[124])->mouseClick = 0x52; // button_1
+ ((Compact *)SkyCompact::data_0[124])->baseSub = 0x53;
+ ((Compact *)SkyCompact::data_0[125])->mouseClick = 0x52; // button_2
+ ((Compact *)SkyCompact::data_0[125])->baseSub = 0x53;
+ ((Compact *)SkyCompact::data_0[126])->mouseClick = 0x52; // button_3
+ ((Compact *)SkyCompact::data_0[126])->baseSub = 0x53;
+ ((Compact *)SkyCompact::data_0[127])->mouseClick = 0x52; // button_4
+ ((Compact *)SkyCompact::data_0[127])->baseSub = 0x53;
+ ((Compact *)SkyCompact::data_0[128])->mouseClick = 0x52; // button_5
+ ((Compact *)SkyCompact::data_0[128])->baseSub = 0x53;
+ ((Compact *)SkyCompact::data_0[129])->mouseClick = 0x52; // button_6
+ ((Compact *)SkyCompact::data_0[129])->baseSub = 0x53;
+ ((Compact *)SkyCompact::data_0[130])->mouseClick = 0x52; // button_7
+ ((Compact *)SkyCompact::data_0[130])->baseSub = 0x53;
+ ((Compact *)SkyCompact::data_0[131])->mouseClick = 0x52; // button_8
+ ((Compact *)SkyCompact::data_0[131])->baseSub = 0x53;
+ ((Compact *)SkyCompact::data_0[132])->mouseClick = 0x52; // button_9
+ ((Compact *)SkyCompact::data_0[132])->baseSub = 0x53;
+ ((Compact *)SkyCompact::data_0[173])->baseSub = 0x54; // retina_scan
+ ((Compact *)SkyCompact::data_3[1])->actionScript = 0x3032; // useless_char
+ ((Compact *)SkyCompact::data_3[1])->baseSub = 0x3034;
+ ((Compact *)SkyCompact::data_3[8])->actionScript = 0x312B; // lift_29
+ ((Compact *)SkyCompact::data_3[8])->baseSub = 0x3129;
+ ((Compact *)SkyCompact::data_3[11])->actionScript = 0x312D; // s29_card_slot
+ ((uint16 *)SkyCompact::data_3[14])[11] = 0x312F; // rs_joey_7_29
+ ((Compact *)SkyCompact::data_3[16])->actionScript = 0x3131; // right_exit_29
+ ((Compact *)SkyCompact::data_3[25])->actionScript = 0x3099; // left_exit_23
+ ((Compact *)SkyCompact::data_3[27])->actionScript = 0x309B; // anchor_exit_23
+ ((Compact *)SkyCompact::data_3[36])->actionScript = 0x30C0; // anchor_exit_25
+ ((Compact *)SkyCompact::data_3[39])->actionScript = 0x309E; // travel_exit_23
+ ((Compact *)SkyCompact::data_3[48])->actionScript = 0x30AB; // left_exit_24
+ ((Compact *)SkyCompact::data_3[50])->actionScript = 0x3134; // left_exit_29
+ ((Compact *)SkyCompact::data_3[59])->actionScript = 0x3110; // right_exit_28
+ ((Compact *)SkyCompact::data_3[61])->actionScript = 0x3112; // left_exit_28
+ ((Compact *)SkyCompact::data_3[70])->actionScript = 0x302C; // right_exit_19
+ ((Compact *)SkyCompact::data_3[73])->actionScript = 0x302E; // left_exit_19
+ ((Compact *)SkyCompact::data_3[82])->actionScript = 0x30D5; // right_exit_26
+ ((Compact *)SkyCompact::data_3[84])->actionScript = 0x3115; // dustbin_28
+ ((Compact *)SkyCompact::data_3[87])->actionScript = 0x30D8; // poster1
+ ((Compact *)SkyCompact::data_3[88])->actionScript = 0x30D9; // poster2
+ ((Compact *)SkyCompact::data_3[89])->actionScript = 0x30DA; // poster3
+ ((Compact *)SkyCompact::data_3[90])->actionScript = 0x30DB; // poster4
+ ((Compact *)SkyCompact::data_3[91])->actionScript = 0x30DD; // plant_26
+ ((Compact *)SkyCompact::data_3[92])->actionScript = 0x30EB; // leaflet
+ ((Compact *)SkyCompact::data_3[92])->baseSub = 0x30EA;
+ ((Compact *)SkyCompact::data_3[93])->actionScript = 0x30E0; // holo
+ ((Compact *)SkyCompact::data_3[93])->baseSub = 0x30E1;
+ ((Compact *)SkyCompact::data_3[94])->actionScript = 0x30A0; // bin_23
+ ((Compact *)SkyCompact::data_3[95])->actionScript = 0x30A2; // sculpture
+ ((Compact *)SkyCompact::data_3[96])->actionScript = 0x30A4; // link_23
+ ((Compact *)SkyCompact::data_3[97])->actionScript = 0x30A6; // wreck_23
+ ((Compact *)SkyCompact::data_3[98])->actionScript = 0x30AD; // london_poster
+ ((Compact *)SkyCompact::data_3[99])->actionScript = 0x30AF; // new_york_poster
+ ((Compact *)SkyCompact::data_3[100])->actionScript = 0x30B1; // mural
+ ((Compact *)SkyCompact::data_3[102])->actionScript = 0x30E4; // left_exit_26
+ ((Compact *)SkyCompact::data_3[111])->actionScript = 0x30EE; // right_exit_27
+ ((Compact *)SkyCompact::data_3[113])->actionScript = 0x30F0; // chart1
+ ((Compact *)SkyCompact::data_3[114])->actionScript = 0x30F2; // chart2
+ ((Compact *)SkyCompact::data_3[115])->actionScript = 0x30F4; // gas
+ ((Compact *)SkyCompact::data_3[116])->actionScript = 0x30F9; // scanner_27
+ ((Compact *)SkyCompact::data_3[116])->baseSub = 0x3103;
+ ((Compact *)SkyCompact::data_3[117])->actionScript = 0x30B3; // pidgeons
+ ((Compact *)SkyCompact::data_3[119])->baseSub = 0x30FD; // burke
+ ((Compact *)SkyCompact::data_3[129])->actionScript = 0x30F6; // chair_27
+ ((Compact *)SkyCompact::data_3[132])->actionScript = 0x310A; // helmet_cole
+ ((Compact *)SkyCompact::data_3[132])->baseSub = 0x3104;
+ ((Compact *)SkyCompact::data_3[137])->actionScript = 0x30FF; // medi_comp
+ ((Compact *)SkyCompact::data_3[137])->baseSub = 0x310D;
+ ((Compact *)SkyCompact::data_3[141])->actionScript = 0x3106; // body
+ ((Compact *)SkyCompact::data_3[141])->baseSub = 0x3105;
+ ((Compact *)SkyCompact::data_3[142])->actionScript = 0x30C3; // anchor
+ ((Compact *)SkyCompact::data_3[142])->baseSub = 0x30C1; // anchor
+ ((Compact *)SkyCompact::data_3[146])->actionScript = 0x30CF; // hook
+ ((Compact *)SkyCompact::data_3[146])->baseSub = 0x30C8; // hook
+ ((Compact *)SkyCompact::data_3[147])->actionScript = 0x30CA; // statue_25
+ ((Compact *)SkyCompact::data_3[149])->baseSub = 0x30CC; // lazer_25
+ ((Compact *)SkyCompact::data_3[151])->baseSub = 0x30CD; // spark_25
+ ((Compact *)SkyCompact::data_3[154])->actionScript = 0x30B6; // trevor
+ ((Compact *)SkyCompact::data_3[154])->baseSub = 0x30B4; // trevor
+ ((Compact *)SkyCompact::data_3[159])->actionScript = 0x3118; // up_exit_28
+ ((Compact *)SkyCompact::data_3[168])->actionScript = 0x3038; // down_exit_20
+ ((Compact *)SkyCompact::data_3[171])->mouseOn = 0x3039; // reich_door_20
+ ((Compact *)SkyCompact::data_3[171])->actionScript = 0x303C;
+ ((Compact *)SkyCompact::data_3[171])->baseSub = 0x3040;
+ ((Compact *)SkyCompact::data_3[174])->actionScript = 0x303E; // reich_slot
+ ((Compact *)SkyCompact::data_3[183])->actionScript = 0x307C; // right_exit_22
+
+ ((Compact *)SkyCompact::data_3[186])->mouseOn = 0x3045; // lamb_door_20
+ ((Compact *)SkyCompact::data_3[186])->actionScript = 0x3048; // lamb_door_20
+ ((Compact *)SkyCompact::data_3[186])->baseSub = 0x3041; // lamb_door_20
+
+ ((Compact *)SkyCompact::data_3[189])->actionScript = 0x3044; // lamb_slot
+ ((Compact *)SkyCompact::data_3[198])->actionScript = 0x305E; // left_exit_21
+ ((Compact *)SkyCompact::data_3[200])->actionScript = 0x304B; // shrub_1
+ ((Compact *)SkyCompact::data_3[201])->actionScript = 0x304D; // shrub_2
+ ((Compact *)SkyCompact::data_3[202])->actionScript = 0x304F; // shrub_3
+ ((Compact *)SkyCompact::data_3[204])->actionScript = 0x307E; // lamb_bed
+ ((Compact *)SkyCompact::data_3[205])->actionScript = 0x3080; // lamb_tv
+ ((Compact *)SkyCompact::data_3[206])->actionScript = 0x3082; // fish_tank
+ ((Compact *)SkyCompact::data_3[206])->baseSub = 0x3089;
+ ((Compact *)SkyCompact::data_3[207])->actionScript = 0x3083; // fish_poster
+ ((Compact *)SkyCompact::data_3[208])->actionScript = 0x3086; // pillow
+ ((Compact *)SkyCompact::data_3[208])->baseSub = 0x3084;
+ ((Compact *)SkyCompact::data_3[213])->actionScript = 0x3088; // magazine
+ ((Compact *)SkyCompact::data_3[217])->actionScript = 0x308B; // reich_chair
+ ((Compact *)SkyCompact::data_3[218])->actionScript = 0x308D; // cabinet
+ ((Compact *)SkyCompact::data_3[219])->actionScript = 0x308F; // cert
+ ((Compact *)SkyCompact::data_3[220])->actionScript = 0x3091; // reich_picture
+ ((Compact *)SkyCompact::data_3[221])->actionScript = 0x3093; // fish_food
+ ((Compact *)SkyCompact::data_3[222])->actionScript = 0x3060; // lambs_books
+ ((Compact *)SkyCompact::data_3[223])->actionScript = 0x3062; // lambs_chair
+ ((Compact *)SkyCompact::data_3[224])->actionScript = 0x3064; // dispensor
+ ((Compact *)SkyCompact::data_3[226])->actionScript = 0x3067; // cat_food
+ ((Compact *)SkyCompact::data_3[226])->baseSub = 0x3065; // cat_food
+ ((Compact *)SkyCompact::data_3[228])->actionScript = 0x306A; // video
+ ((Compact *)SkyCompact::data_3[228])->baseSub = 0x3068; // video
+ ((Compact *)SkyCompact::data_3[229])->actionScript = 0x306C; // cassette
+ ((Compact *)SkyCompact::data_3[236])->actionScript = 0x306E; // big_pict1
+ ((Compact *)SkyCompact::data_3[237])->actionScript = 0x3070; // video_screen
+ ((Compact *)SkyCompact::data_3[237])->baseSub = 0x3071;
+ ((Compact *)SkyCompact::data_3[238])->actionScript = 0x3073; // big_pict2
+ ((Compact *)SkyCompact::data_3[239])->actionScript = 0x3075; // big_pict3
+ ((Compact *)SkyCompact::data_3[246])->actionScript = 0x3078; // cat
+ ((Compact *)SkyCompact::data_3[246])->baseSub = 0x3076;
+ ((Compact *)SkyCompact::data_3[253])->actionScript = 0x30E8; // bio_door
+ ((Compact *)SkyCompact::data_3[253])->baseSub = 0x30E6;
+ ((Compact *)SkyCompact::data_3[257])->actionScript = 0x30D1; // sales_chart
+ ((Compact *)SkyCompact::data_3[258])->actionScript = 0x3053; // gallager_bel
+ ((Compact *)SkyCompact::data_3[258])->baseSub = 0x3051; // gallager_bel
+ ((Compact *)SkyCompact::data_3[267])->actionScript = 0x3055; // reich_window
+ ((Compact *)SkyCompact::data_3[268])->actionScript = 0x3057; // lamb_window
+ ((Compact *)SkyCompact::data_3[270])->baseSub = 0x3079; // inner_lamb_door
+ ((Compact *)SkyCompact::data_3[277])->actionScript = 0x30B9; // ticket
+ ((Compact *)SkyCompact::data_3[277])->baseSub = 0x30B8;
+ ((Compact *)SkyCompact::data_3[280])->actionScript = 0x30BC; // globe
+ ((Compact *)SkyCompact::data_3[280])->baseSub = 0x30BD; // globe
+ ((Compact *)SkyCompact::data_3[283])->baseSub = 0x3094; // inner_reich_door
+ ((Compact *)SkyCompact::data_3[286])->baseSub = 0x310B; // glass_slot
+ ((uint16*)SkyCompact::data_3[13])[13] = 0x3138; // rs_lamb_28
+ ((Compact *)SkyCompact::data_3[300])->actionScript = 0x3140; // cable_29
+ ((Compact *)SkyCompact::data_3[313])->actionScript = 0x3018; // cable_fall
+ ((Compact *)SkyCompact::data_3[313])->baseSub = 0x3014;
+ ((Compact *)SkyCompact::data_3[316])->actionScript = 0x3018; // cable_fall2
+ ((Compact *)SkyCompact::data_3[316])->baseSub = 0x3013;
+ ((Compact *)SkyCompact::data_3[317])->baseSub = 0x3015; // smashed_window
+ ((Compact *)SkyCompact::data_3[319])->baseSub = 0x3016; // bits
+ ((Compact *)SkyCompact::data_3[321])->baseSub = 0x3016; // bits2
+ ((Compact *)SkyCompact::data_3[324])->baseSub = 0x3019; // spy_11
+ ((Compact *)SkyCompact::data_3[325])->actionScript = 0x301C; // locker_11
+ ((Compact *)SkyCompact::data_3[325])->baseSub = 0x301A; // locker_11
+ ((Compact *)SkyCompact::data_3[328])->actionScript = 0x301E; // slot_11
+ ((Compact *)SkyCompact::data_3[332])->actionScript = 0x3020; // soccer_1
+ ((Compact *)SkyCompact::data_3[333])->actionScript = 0x3020; // soccer_2
+ ((Compact *)SkyCompact::data_3[334])->actionScript = 0x3020; // soccer_3
+ ((Compact *)SkyCompact::data_3[335])->actionScript = 0x3020; // soccer_4
+ ((Compact *)SkyCompact::data_3[336])->actionScript = 0x3020; // soccer_5
+ ((Compact *)SkyCompact::data_3[338])->actionScript = 0x3025; // slat_1
+ ((Compact *)SkyCompact::data_3[339])->actionScript = 0x3025; // slat_2
+ ((Compact *)SkyCompact::data_3[340])->actionScript = 0x3025; // slat_3
+ ((Compact *)SkyCompact::data_3[341])->actionScript = 0x3025; // slat_4
+ ((Compact *)SkyCompact::data_3[342])->actionScript = 0x3025; // slat_5
+ ((Compact *)SkyCompact::data_3[343])->actionScript = 0x3027; // right_exit_11
+ ((Compact *)SkyCompact::data_3[388])->actionScript = 0x30A8; // small_exit_23
+ ((Compact *)SkyCompact::data_3[389])->actionScript = 0x3142; // small_r_29
+ ((Compact *)SkyCompact::data_3[390])->actionScript = 0x3144; // small_l_29
+ ((Compact *)SkyCompact::data_3[391])->actionScript = 0x311F; // small_r_28
+ ((Compact *)SkyCompact::data_3[392])->actionScript = 0x3121; // small_l_28
+ ((Compact *)SkyCompact::data_3[393])->actionScript = 0x3030; // top_right_19
+ ((Compact *)SkyCompact::data_3[406])->actionScript = 0x3126; // lift_28
+ ((Compact *)SkyCompact::data_3[406])->baseSub = 0x3124; // lift_28
+ ((Compact *)SkyCompact::data_3[409])->actionScript = 0x3127; // slot_28
+}
+
};
Index: compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compact.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- compact.h 27 Jun 2003 02:54:05 -0000 1.7
+++ compact.h 3 Jul 2003 17:17:32 -0000 1.8
@@ -31,6 +31,24 @@
uint16 **getTurnTable(Compact *cpt, uint16 megaSet, uint16 dir);
uint16 *getSub(Compact *cpt, uint16 mode);
void *getCompactElem(Compact *cpt, uint32 off);
+ void patchFor288(void);
+
+ extern uint16 s11_fl_tab288[33];
+ extern uint16 s19_fl_tab288[17];
+ extern uint16 s20_fl_tab288[37];
+ extern uint16 s21_fl_tab288[31];
+ extern uint16 s22_fl_tab288[31];
+ extern uint16 s23_fl_tab288[27];
+ extern uint16 s24_fl_tab288[23];
+ extern uint16 s25_fl_tab288[19];
+ extern uint16 s26_fl_tab288[29];
+ extern uint16 s27_fl_tab288[29];
+ extern uint16 s28_fl_tab288[27];
+ extern uint16 s28_sml_tab288[13];
+ extern uint16 s29_fl_tab288[27];
+ extern uint16 s29_sml_tab288[13];
+ extern uint16 body_tab288[7];
+ extern uint16 chair_tab288[23];
extern uint16 slide2_seq[];
extern uint16 m_ss_st_up[];
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- logic.cpp 2 Jul 2003 01:46:24 -0000 1.110
+++ logic.cpp 3 Jul 2003 17:17:32 -0000 1.111
@@ -984,6 +984,72 @@
DEATH_SCRIPT
};
+static uint32 forwardList1b288[] = {
+ JOBS_SPEECH,
+ JOBS_S4,
+ JOBS_ALARMED,
+ JOEY_RECYCLE,
+ SHOUT_SSS,
+ JOEY_MISSION,
+ TRANS_MISSION,
+ SLOT_MISSION,
+ CORNER_MISSION,
+ JOEY_LOGIC,
+ GORDON_SPEECH,
+ JOEY_BUTTON_MISSION,
+ LOB_DAD_SPEECH,
+ LOB_SON_SPEECH,
+ GUARD_SPEECH,
+ 0x68,
+ WRECK_SPEECH,
+ ANITA_SPEECH,
+ LAMB_FACTORY,
+ FORE_SPEECH,
+ JOEY_42_MISS,
+ JOEY_JUNCTION_MISS,
+ WELDER_MISSION,
+ JOEY_WELD_MISSION,
+ RADMAN_SPEECH,
+ LINK_7_29,
+ LINK_29_7,
+ LAMB_TO_3,
+ LAMB_TO_2,
+ 0x3147,
+ 0x3100,
+ 0x3101,
+ 0x3102,
+ 0x3148,
+ 0x3149,
+ 0x314A,
+ 0x30C5,
+ 0x30C6,
+ 0x30CB,
+ 0x314B,
+ JOEY_FACTORY,
+ 0x314C,
+ 0x30E2,
+ 0x314D,
+ 0x310C,
+ LAMB_FACT_RETURN,
+ 0x3139,
+ 0x313A,
+ 0x004F,
+ CABLE_MISSION,
+ FOSTER_TOUR,
+ LAMB_TOUR,
+ FOREMAN_LOGIC,
+ LAMB_LEAVE_FACTORY,
+ 0x3138,
+ LAMB_FACT_2,
+ 0x004D,
+ 0,
+ 0,
+ LINK_28_31,
+ LINK_31_28,
+ 0x004E,
+ DEATH_SCRIPT
+};
+
static const uint32 forwardList2b[] = {
STD_ON,
STD_EXIT_LEFT_ON,
@@ -1077,7 +1143,11 @@
_scriptVariables[820] = 1;
_scriptVariables[821] = 1;
- memcpy(_scriptVariables + 352, forwardList1b, sizeof(forwardList1b));
+ if (SkyState::_systemVars.gameVersion == 288)
+ memcpy(_scriptVariables + 352, forwardList1b288, sizeof(forwardList1b288));
+ else
+ memcpy(_scriptVariables + 352, forwardList1b, sizeof(forwardList1b));
+
memcpy(_scriptVariables + 656, forwardList2b, sizeof(forwardList2b));
memcpy(_scriptVariables + 721, forwardList3b, sizeof(forwardList3b));
memcpy(_scriptVariables + 663, forwardList4b, sizeof(forwardList4b));
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- sky.cpp 2 Jul 2003 01:46:25 -0000 1.69
+++ sky.cpp 3 Jul 2003 17:17:32 -0000 1.70
@@ -128,8 +128,7 @@
if (_key_pressed == 63) {
_key_pressed = 0;
_skyControl->doControlPanel();
- }
-
+ }
/*if ((_key_pressed == 27) && (!_systemVars.pastIntro))
_skyControl->restartGame();*/
@@ -188,6 +187,9 @@
_skyControl = new SkyControl(_skyScreen, _skyDisk, _skyMouse, _skyText, _skyMusic, _skyLogic, _system, getSavePath());
_skyLogic->useControlInstance(_skyControl);
+
+ if (_systemVars.gameVersion == 288)
+ SkyCompact::patchFor288();
}
void SkyState::initItemList() {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/common engine.cpp,1.20,1.21 timer.cpp,1.10,1.11 timer.h,1.6,1.7
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl.cpp,1.39,1.40 sdl_gl.cpp,1.45,1.46
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list