aboutsummaryrefslogtreecommitdiff
path: root/sky/compact.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-10-01 09:40:28 +0000
committerTorbjörn Andersson2003-10-01 09:40:28 +0000
commitcee745dbf93ef1919a2eafec630f4a1991578052 (patch)
tree9547b297b83467324d60d57ef732848eb9fd2092 /sky/compact.cpp
parent920c11972eb1e3a2fe49fa9acff9814e2fac0eb3 (diff)
downloadscummvm-rg350-cee745dbf93ef1919a2eafec630f4a1991578052.tar.gz
scummvm-rg350-cee745dbf93ef1919a2eafec630f4a1991578052.tar.bz2
scummvm-rg350-cee745dbf93ef1919a2eafec630f4a1991578052.zip
Whitespace changes
svn-id: r10516
Diffstat (limited to 'sky/compact.cpp')
-rw-r--r--sky/compact.cpp113
1 files changed, 56 insertions, 57 deletions
diff --git a/sky/compact.cpp b/sky/compact.cpp
index 90879ba512..f890f4ee19 100644
--- a/sky/compact.cpp
+++ b/sky/compact.cpp
@@ -303,107 +303,106 @@ void *getCompactElem(Compact *cpt, uint32 off) {
// 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
+ 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,
+ 0x3042, 0x001C, 0x0002, 0x002A, 0x0000, 0x302A, 0x0001, 0x3029,
0x3046, 0x302B, 0x3049, 0x302D, 0x3189, 0x302F, 0x3001, 0x3033,
- 0xFFFF
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
-} ;
-
+ 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
+ 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
+ 0x318A, 0x001C, 0x0002, 0x002A, 0x3185, 0x3141, 0x3186, 0x3143,
+ 0x0004, 0x3145, 0x0005, 0x3146, 0xFFFF
};
void patchFor288(void) {
@@ -560,7 +559,7 @@ void patchFor288(void) {
((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[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
@@ -581,7 +580,7 @@ void patchFor288(void) {
((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[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