diff options
| author | Max Horn | 2004-01-03 01:58:58 +0000 |
|---|---|---|
| committer | Max Horn | 2004-01-03 01:58:58 +0000 |
| commit | b0e23e35ee7f0b7c080e821fd521e007dcd80a18 (patch) | |
| tree | dc2a992ac09753f78be1b12ce30a48aa5aa75b69 /sky/compacts | |
| parent | b1d729d6dd23c093b18d9093a195a399d44d69ce (diff) | |
| download | scummvm-rg350-b0e23e35ee7f0b7c080e821fd521e007dcd80a18.tar.gz scummvm-rg350-b0e23e35ee7f0b7c080e821fd521e007dcd80a18.tar.bz2 scummvm-rg350-b0e23e35ee7f0b7c080e821fd521e007dcd80a18.zip | |
Introduce namespace 'Sky'
svn-id: r12099
Diffstat (limited to 'sky/compacts')
77 files changed, 307 insertions, 0 deletions
diff --git a/sky/compacts/0compact.h b/sky/compacts/0compact.h index 3f64104f73..b7d7b75ada 100644 --- a/sky/compacts/0compact.h +++ b/sky/compacts/0compact.h @@ -29,6 +29,8 @@ #include "1compact.h" +namespace Sky { + namespace SkyCompact { uint16 slide2_seq[] = { @@ -9324,4 +9326,6 @@ void *data_1[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/101comp.h b/sky/compacts/101comp.h index 10af25f9b3..7b572cbad0 100644 --- a/sky/compacts/101comp.h +++ b/sky/compacts/101comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact cancel_button = { @@ -884,4 +886,6 @@ uint16 s101_chip_list[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/102comp.h b/sky/compacts/102comp.h index 8640106b80..90142a80e8 100644 --- a/sky/compacts/102comp.h +++ b/sky/compacts/102comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 restore_seq[] = { @@ -570,4 +572,6 @@ Compact restart_butt = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/10comp.h b/sky/compacts/10comp.h index 6f1028ae8b..24494949d5 100644 --- a/sky/compacts/10comp.h +++ b/sky/compacts/10comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 liyt_4_seq[] = { @@ -2432,4 +2434,6 @@ Compact liyt_1 = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/11comp.h b/sky/compacts/11comp.h index c882a4484a..f034562e9d 100644 --- a/sky/compacts/11comp.h +++ b/sky/compacts/11comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact slat_3 = { @@ -1727,4 +1729,6 @@ uint16 cable_fall2_seq[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/12comp.h b/sky/compacts/12comp.h index f5fa78f82f..7ab7b7cf5d 100644 --- a/sky/compacts/12comp.h +++ b/sky/compacts/12comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 botbelt_seq[] = { @@ -2229,4 +2231,6 @@ uint16 topbelt_seq[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/13comp.h b/sky/compacts/13comp.h index 9c6d80e541..4336ed30ed 100644 --- a/sky/compacts/13comp.h +++ b/sky/compacts/13comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 foreman_l_to_r[] = { @@ -3767,4 +3769,6 @@ uint16 armsup_seq[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/14comp.h b/sky/compacts/14comp.h index fc155ba632..c9739fd3c0 100644 --- a/sky/compacts/14comp.h +++ b/sky/compacts/14comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 rs_foster_14_13[] = { @@ -2075,4 +2077,6 @@ uint16 change6_seq[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/15comp.h b/sky/compacts/15comp.h index a826e4f82b..0c083f3ece 100644 --- a/sky/compacts/15comp.h +++ b/sky/compacts/15comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 rs_foster_13_15[] = { @@ -1108,4 +1110,6 @@ uint16 s15_chip_list[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/16comp.h b/sky/compacts/16comp.h index e599913e78..66157406e9 100644 --- a/sky/compacts/16comp.h +++ b/sky/compacts/16comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact reactor_lower = { @@ -982,4 +984,6 @@ uint16 fost_con_look[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/17comp.h b/sky/compacts/17comp.h index 99945baea8..2f212bfe90 100644 --- a/sky/compacts/17comp.h +++ b/sky/compacts/17comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 pulseb_seq[] = { @@ -916,4 +918,6 @@ Compact pulse = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/18comp.h b/sky/compacts/18comp.h index 37c073bb58..74b8ae7eac 100644 --- a/sky/compacts/18comp.h +++ b/sky/compacts/18comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 steam_alert_seq[] = { @@ -1603,4 +1605,6 @@ Compact right_exit_s18 = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/19comp.h b/sky/compacts/19comp.h index 925b27b646..cc613420f2 100644 --- a/sky/compacts/19comp.h +++ b/sky/compacts/19comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 rs_foster_19_28[] = { @@ -723,4 +725,6 @@ uint16 s19_fast_list[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/1compact.h b/sky/compacts/1compact.h index 8f44bb362c..c96eefe235 100644 --- a/sky/compacts/1compact.h +++ b/sky/compacts/1compact.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 car_down_seq[] = { @@ -1974,4 +1976,6 @@ uint16 fire1_seq[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/20comp.h b/sky/compacts/20comp.h index a672732b59..7fb21798f0 100644 --- a/sky/compacts/20comp.h +++ b/sky/compacts/20comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 gal_look_up[] = { @@ -1223,4 +1225,6 @@ uint16 s20_mouse[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/21comp.h b/sky/compacts/21comp.h index afe95beaf8..83e982f396 100644 --- a/sky/compacts/21comp.h +++ b/sky/compacts/21comp.h @@ -26,6 +26,8 @@ #include "22comp.h" +namespace Sky { + namespace SkyCompact { uint16 lamb_sit_up[] = { @@ -2144,4 +2146,6 @@ uint16 take_cassette_seq[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/22comp.h b/sky/compacts/22comp.h index 5cc4278061..6ac7ba044e 100644 --- a/sky/compacts/22comp.h +++ b/sky/compacts/22comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 fost_replace_pill[] = { @@ -1583,4 +1585,6 @@ Compact fish_poster = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/23comp.h b/sky/compacts/23comp.h index 15bdc0d1c5..924bcd944f 100644 --- a/sky/compacts/23comp.h +++ b/sky/compacts/23comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint32 *grid23 = 0; @@ -797,4 +799,6 @@ uint16 rs_foster_29_23[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/24comp.h b/sky/compacts/24comp.h index b19041e493..376cb85a98 100644 --- a/sky/compacts/24comp.h +++ b/sky/compacts/24comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 give_mag_seq[] = { @@ -1313,4 +1315,6 @@ uint16 s24_fast_list[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/25comp.h b/sky/compacts/25comp.h index 8bd9e9536c..4adc6fab9d 100644 --- a/sky/compacts/25comp.h +++ b/sky/compacts/25comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact sales_chart = { @@ -1119,4 +1121,6 @@ Compact s25_floor = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/26comp.h b/sky/compacts/26comp.h index 2e605d8799..efdc6b192f 100644 --- a/sky/compacts/26comp.h +++ b/sky/compacts/26comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact bio_door = { @@ -1305,4 +1307,6 @@ Compact s26_floor = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/27comp.h b/sky/compacts/27comp.h index 6e83bb42bd..4220f54787 100644 --- a/sky/compacts/27comp.h +++ b/sky/compacts/27comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 s27_logic[] = { @@ -3276,4 +3278,6 @@ Compact chair_27 = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/28comp.h b/sky/compacts/28comp.h index ad606a4a97..cb68c66539 100644 --- a/sky/compacts/28comp.h +++ b/sky/compacts/28comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 s28_chip_list[] = { @@ -991,4 +993,6 @@ Compact small_l_28 = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/29comp.h b/sky/compacts/29comp.h index a07f663efe..0974f5d8a1 100644 --- a/sky/compacts/29comp.h +++ b/sky/compacts/29comp.h @@ -37,6 +37,8 @@ #include "10comp.h" +namespace Sky { + namespace SkyCompact { uint16 rs_joey_7_29[] = { @@ -1592,4 +1594,6 @@ void *data_3[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/2compact.h b/sky/compacts/2compact.h index 00e8d52eef..bdfa5692bd 100644 --- a/sky/compacts/2compact.h +++ b/sky/compacts/2compact.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sml_loaderb_l_to_u[] = { @@ -1822,4 +1824,6 @@ Compact top_barrel = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/30comp.h b/sky/compacts/30comp.h index b24b01ffba..9d5fcd70fd 100644 --- a/sky/compacts/30comp.h +++ b/sky/compacts/30comp.h @@ -42,6 +42,8 @@ #include "42comp.h" +namespace Sky { + namespace SkyCompact { uint16 sc32_vinc_talk[] = { @@ -6617,4 +6619,6 @@ void *data_4[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/31comp.h b/sky/compacts/31comp.h index be6f9e5f49..660688d340 100644 --- a/sky/compacts/31comp.h +++ b/sky/compacts/31comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 reset_start_31[] = { @@ -2852,4 +2854,6 @@ uint16 sc31_joey_list[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/32comp.h b/sky/compacts/32comp.h index c3f4bcd4db..dace349ec8 100644 --- a/sky/compacts/32comp.h +++ b/sky/compacts/32comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc32_gardening1[] = { @@ -1838,4 +1840,6 @@ Compact sc32_exit_33 = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/33comp.h b/sky/compacts/33comp.h index 7446f1f344..305ebafeb4 100644 --- a/sky/compacts/33comp.h +++ b/sky/compacts/33comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact sc33_lock = { @@ -826,4 +828,6 @@ uint16 reset_30_33[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/34comp.h b/sky/compacts/34comp.h index dfa81a305c..af52d79012 100644 --- a/sky/compacts/34comp.h +++ b/sky/compacts/34comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc34_fast_list[] = { @@ -956,4 +958,6 @@ Compact sc34_door = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/36comp.h b/sky/compacts/36comp.h index 0bd3cbc980..3066c04576 100644 --- a/sky/compacts/36comp.h +++ b/sky/compacts/36comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc36_get_glass[] = { @@ -4271,4 +4273,6 @@ Compact sc36_exit_30 = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/37comp.h b/sky/compacts/37comp.h index 37b2361bc6..ba3d403f5b 100644 --- a/sky/compacts/37comp.h +++ b/sky/compacts/37comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc37_mouse_list[] = { @@ -1906,4 +1908,6 @@ uint16 sc37_crbarbox[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/38comp.h b/sky/compacts/38comp.h index 27ba864c39..f35011c9c6 100644 --- a/sky/compacts/38comp.h +++ b/sky/compacts/38comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 spu_left[] = { @@ -3830,4 +3832,6 @@ uint16 sc38_lift_down[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/39comp.h b/sky/compacts/39comp.h index cad8dad7c8..6f434b93ac 100644 --- a/sky/compacts/39comp.h +++ b/sky/compacts/39comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact sc39_exit_31 = { @@ -776,4 +778,6 @@ uint16 sc39_palette[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/3compact.h b/sky/compacts/3compact.h index 3b04bd2577..125bb9c972 100644 --- a/sky/compacts/3compact.h +++ b/sky/compacts/3compact.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 rs_low_lift2[] = { @@ -1845,4 +1847,6 @@ Compact low_barrel = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/40comp.h b/sky/compacts/40comp.h index c59a494367..e0c31b2402 100644 --- a/sky/compacts/40comp.h +++ b/sky/compacts/40comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact sc40_body_2 = { @@ -1222,4 +1224,6 @@ uint16 sc40_ascend[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/41comp.h b/sky/compacts/41comp.h index f195d1cc80..61412ebd9c 100644 --- a/sky/compacts/41comp.h +++ b/sky/compacts/41comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc41_mouse_list[] = { @@ -746,4 +748,6 @@ uint16 sc41_palette[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/42comp.h b/sky/compacts/42comp.h index fbcd0a2978..7970c31c83 100644 --- a/sky/compacts/42comp.h +++ b/sky/compacts/42comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc42_jdg_hammer[] = { @@ -1710,4 +1712,6 @@ uint16 sc42_fos_leave[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/44comp.h b/sky/compacts/44comp.h index 57a9817e8b..bb3f536103 100644 --- a/sky/compacts/44comp.h +++ b/sky/compacts/44comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc44_chip_list[] = { @@ -651,4 +653,6 @@ uint16 reset_37_44[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/45comp.h b/sky/compacts/45comp.h index 757a3d092d..d0bee9077b 100644 --- a/sky/compacts/45comp.h +++ b/sky/compacts/45comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 reset_44_45[] = { @@ -631,4 +633,6 @@ uint16 sc45_mouse_list[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/46comp.h b/sky/compacts/46comp.h index 65e20a4887..3ee601af8a 100644 --- a/sky/compacts/46comp.h +++ b/sky/compacts/46comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc46_floor_table[] = { @@ -566,4 +568,6 @@ Compact sc46_floor = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/47comp.h b/sky/compacts/47comp.h index b184778259..00be9ee502 100644 --- a/sky/compacts/47comp.h +++ b/sky/compacts/47comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 reset_48_47[] = { @@ -580,4 +582,6 @@ Compact sc47_floor = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/48comp.h b/sky/compacts/48comp.h index 9649a5a109..58438f6058 100644 --- a/sky/compacts/48comp.h +++ b/sky/compacts/48comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact sc48_eyes = { @@ -1164,4 +1166,6 @@ uint16 sc48_light_pal[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/4compact.h b/sky/compacts/4compact.h index 51ddf83446..7e4a2a5a88 100644 --- a/sky/compacts/4compact.h +++ b/sky/compacts/4compact.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 jobs_u_to_l[] = { @@ -1348,4 +1350,6 @@ Compact cupboard_s4 = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/5compact.h b/sky/compacts/5compact.h index 3f9b1d80d5..e40595ab22 100644 --- a/sky/compacts/5compact.h +++ b/sky/compacts/5compact.h @@ -33,6 +33,8 @@ #include "17comp.h" +namespace Sky { + namespace SkyCompact { Compact copter = { @@ -4925,4 +4927,6 @@ uint32 *table2 = (uint32*)data_2; } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/65comp.h b/sky/compacts/65comp.h index ba91f581c6..ad4ea801e6 100644 --- a/sky/compacts/65comp.h +++ b/sky/compacts/65comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint32 *sc65_walk_grid = 0; @@ -673,4 +675,6 @@ uint16 sc65_palette[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/66comp.h b/sky/compacts/66comp.h index f11f3125d5..fc662b7ba9 100644 --- a/sky/compacts/66comp.h +++ b/sky/compacts/66comp.h @@ -41,6 +41,8 @@ #include "82comp.h" +namespace Sky { + namespace SkyCompact { uint16 sc66_hi_beam_an1[] = { @@ -6691,4 +6693,6 @@ void *data_5[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/67comp.h b/sky/compacts/67comp.h index 7959835c6e..585cd09181 100644 --- a/sky/compacts/67comp.h +++ b/sky/compacts/67comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc67_logic_list[] = { @@ -2091,4 +2093,6 @@ Compact sc67_clot = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/68comp.h b/sky/compacts/68comp.h index 10f8896eb3..44a892dd60 100644 --- a/sky/compacts/68comp.h +++ b/sky/compacts/68comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact sc68_pulse5 = { @@ -1411,4 +1413,6 @@ uint16 sc68_joey_list[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/69comp.h b/sky/compacts/69comp.h index 045472001d..a803a588bd 100644 --- a/sky/compacts/69comp.h +++ b/sky/compacts/69comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint32 *grid69 = 0; @@ -1193,4 +1195,6 @@ Compact sc69_floor = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/70comp.h b/sky/compacts/70comp.h index b1fa9ab8f1..19c107b59c 100644 --- a/sky/compacts/70comp.h +++ b/sky/compacts/70comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact sc70_bar = { @@ -1262,4 +1264,6 @@ uint16 sc70_mouse_list[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/71comp.h b/sky/compacts/71comp.h index 6725674e54..8add9ba4ac 100644 --- a/sky/compacts/71comp.h +++ b/sky/compacts/71comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 medi_d_to_u[] = { @@ -1702,4 +1704,6 @@ uint16 sc71_light2_anim[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/72comp.h b/sky/compacts/72comp.h index ef946d0e43..249d23834b 100644 --- a/sky/compacts/72comp.h +++ b/sky/compacts/72comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 wit_st_right[] = { @@ -2416,4 +2418,6 @@ Compact sc72_chamber1 = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/73comp.h b/sky/compacts/73comp.h index 2588a2e668..82c7642996 100644 --- a/sky/compacts/73comp.h +++ b/sky/compacts/73comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 gal_u_to_l[] = { @@ -2548,4 +2550,6 @@ Compact sc73_cham4_light = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/74comp.h b/sky/compacts/74comp.h index 1800b87788..c6267426f7 100644 --- a/sky/compacts/74comp.h +++ b/sky/compacts/74comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact sc74_monitor3 = { @@ -6683,4 +6685,6 @@ uint16 sc74_slot_flash[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/75comp.h b/sky/compacts/75comp.h index 407ee20cee..67db52426d 100644 --- a/sky/compacts/75comp.h +++ b/sky/compacts/75comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc75_floor_table[] = { @@ -1912,4 +1914,6 @@ uint16 sc75_get_tiss[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/76comp.h b/sky/compacts/76comp.h index 733a82960c..a535f3609e 100644 --- a/sky/compacts/76comp.h +++ b/sky/compacts/76comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 ken_u_to_r[] = { @@ -2816,4 +2818,6 @@ Compact sc76_door75 = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/77comp.h b/sky/compacts/77comp.h index f916cad0e3..39e1e2eec1 100644 --- a/sky/compacts/77comp.h +++ b/sky/compacts/77comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc77_fpushl_2[] = { @@ -1094,4 +1096,6 @@ Compact sc77_door76 = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/78comp.h b/sky/compacts/78comp.h index 8d806c8c66..0aed1e0e24 100644 --- a/sky/compacts/78comp.h +++ b/sky/compacts/78comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc78_ledge_table[] = { @@ -1206,4 +1208,6 @@ uint16 sc78_fast_list[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/79comp.h b/sky/compacts/79comp.h index f46dfb9fbb..b82248d708 100644 --- a/sky/compacts/79comp.h +++ b/sky/compacts/79comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc791_palette[] = { @@ -1657,4 +1659,6 @@ Compact sc79_pipe = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/80comp.h b/sky/compacts/80comp.h index 437d7aa78b..70157cd967 100644 --- a/sky/compacts/80comp.h +++ b/sky/compacts/80comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact sc80_bubble10 = { @@ -3567,4 +3569,6 @@ Compact sc80_goo = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/81comp.h b/sky/compacts/81comp.h index e7d2af5062..69d43b8c94 100644 --- a/sky/compacts/81comp.h +++ b/sky/compacts/81comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact sc81_big_tent3 = { @@ -2764,4 +2766,6 @@ uint16 sc81_foster_sit[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/82comp.h b/sky/compacts/82comp.h index e56c52df3e..ad12f1c1ca 100644 --- a/sky/compacts/82comp.h +++ b/sky/compacts/82comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc82_push_button[] = { @@ -714,4 +716,6 @@ uint16 sc82_jobs_return[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/85comp.h b/sky/compacts/85comp.h index db1201ebed..22ed70da90 100644 --- a/sky/compacts/85comp.h +++ b/sky/compacts/85comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc85_palette[] = { @@ -436,4 +438,6 @@ uint16 sc85_logic_list[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/90comp.h b/sky/compacts/90comp.h index 89e4e6c130..c5f6046a7a 100644 --- a/sky/compacts/90comp.h +++ b/sky/compacts/90comp.h @@ -33,6 +33,8 @@ #include "96comp.h" +namespace Sky { + namespace SkyCompact { Compact door_r90f = { @@ -1859,4 +1861,6 @@ uint32 *sec6_compacts = (uint32*)data_6; } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/91comp.h b/sky/compacts/91comp.h index 909178580e..0b07e46a29 100644 --- a/sky/compacts/91comp.h +++ b/sky/compacts/91comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact decomp_obj = { @@ -1520,4 +1522,6 @@ Compact door_r91f = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/92comp.h b/sky/compacts/92comp.h index 7ac3feaae9..2137cb40c2 100644 --- a/sky/compacts/92comp.h +++ b/sky/compacts/92comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact bridge_e = { @@ -1684,4 +1686,6 @@ Compact slab3 = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/93comp.h b/sky/compacts/93comp.h index 3ef839ebcc..0b39ead7a4 100644 --- a/sky/compacts/93comp.h +++ b/sky/compacts/93comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 get_adjust[] = { @@ -836,4 +838,6 @@ uint16 pal93[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/94comp.h b/sky/compacts/94comp.h index 6e0ed773f4..696c0166d7 100644 --- a/sky/compacts/94comp.h +++ b/sky/compacts/94comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 door_l94_anim[] = { @@ -1379,4 +1381,6 @@ Compact hologram_a = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/95comp.h b/sky/compacts/95comp.h index 073d8f44e7..b4abe9e345 100644 --- a/sky/compacts/95comp.h +++ b/sky/compacts/95comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 fast_list_sc95[] = { @@ -1359,4 +1361,6 @@ uint16 door_l95_anim[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/96comp.h b/sky/compacts/96comp.h index cceead6fe0..26316ea221 100644 --- a/sky/compacts/96comp.h +++ b/sky/compacts/96comp.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 sc96_mouse[] = { @@ -926,4 +928,6 @@ uint16 fast_list_sc96[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/9compact.h b/sky/compacts/9compact.h index d7b5233592..c69c69cf2b 100644 --- a/sky/compacts/9compact.h +++ b/sky/compacts/9compact.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 s9_floor_table[] = { @@ -1691,4 +1693,6 @@ uint16 s9_pal[] = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/linc_gen.h b/sky/compacts/linc_gen.h index c1992c47b3..c4ea377afe 100644 --- a/sky/compacts/linc_gen.h +++ b/sky/compacts/linc_gen.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { uint16 window_mouse[] = { @@ -573,4 +575,6 @@ uint32 *grid93 = 0; } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/lincmenu.h b/sky/compacts/lincmenu.h index e28c793012..a4ae6d5a24 100644 --- a/sky/compacts/lincmenu.h +++ b/sky/compacts/lincmenu.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact playbak_menu = { @@ -800,4 +802,6 @@ Compact blind_menu = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/objects.h b/sky/compacts/objects.h index 299bdd390b..024ebbf35f 100644 --- a/sky/compacts/objects.h +++ b/sky/compacts/objects.h @@ -25,6 +25,8 @@ +namespace Sky { + namespace SkyCompact { Compact blank5 = { @@ -1260,4 +1262,6 @@ Compact menu_bar = { } // namespace SkyCompact +} // namespace Sky + #endif diff --git a/sky/compacts/savedata.cpp b/sky/compacts/savedata.cpp index 29f18aa9a2..30a5cd9e8b 100644 --- a/sky/compacts/savedata.cpp +++ b/sky/compacts/savedata.cpp @@ -22,6 +22,8 @@ #include "sky/compact.h" #include "sky/control.h" +namespace Sky { + Compact *SkyControl::_saveLoadCpts[833] = { // 0compact.asm: // Z_compac.inc: @@ -2150,3 +2152,4 @@ uint8 SkyControl::_resetDiffCd[856] = { 0x35, 0x00, 0x34, 0x31, 0x1A, 0x00, 0x36, 0x31 }; +} // End of namespace Sky diff --git a/sky/compacts/z_compac.h b/sky/compacts/z_compac.h index d3da6bdd99..7024d62e2e 100644 --- a/sky/compacts/z_compac.h +++ b/sky/compacts/z_compac.h @@ -29,6 +29,8 @@ #include "102comp.h" +namespace Sky { + namespace SkyCompact { uint16 fradman_up[] = { @@ -5971,4 +5973,6 @@ uint32 *z_compact_table = (uint32*)data_0; } // namespace SkyCompact +} // namespace Sky + #endif |