patch #791738 g++ 3.4 compile fix, from Falk Hueffner and a few minor local bits in my tree

svn-id: r9807

80 files changed, 81 insertions, 81 deletions

diff --git a/sky/compact.cpp b/sky/compact.cpp
index 22e27ce730..ae244f65e9 100644
--- a/sky/compact.cpp
+++ b/sky/compact.cpp
@@ -51,7 +51,7 @@ namespace SkyTalkAnims {
 	extern bool animTalkTableIsPointer[];
 	extern uint16 animTalkTableVal[];
 	extern void *animTalkTablePtr[];
-};
+}
 
 namespace SkyCompact {
 
@@ -602,5 +602,5 @@ void patchFor288(void) {
 	((Compact *)SkyCompact::data_3[409])->actionScript = 0x3127; // slot_28
 }
 
-};
+}
 
diff --git a/sky/compact.h b/sky/compact.h
index aabad83fef..451140d2c3 100644
--- a/sky/compact.h
+++ b/sky/compact.h
@@ -3252,6 +3252,6 @@ namespace SkyCompact {
 	extern uint16 ss_auto[];
 	extern uint16 wit_auto[];
 	extern uint16 minif_auto[];
-};
+}
 
 #endif
diff --git a/sky/compacts/0compact.h b/sky/compacts/0compact.h
index c193b7a603..3f64104f73 100644
--- a/sky/compacts/0compact.h
+++ b/sky/compacts/0compact.h
@@ -9322,6 +9322,6 @@ void *data_1[] = {
 	car_down_seq
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/101comp.h b/sky/compacts/101comp.h
index aaf16d0790..10af25f9b3 100644
--- a/sky/compacts/101comp.h
+++ b/sky/compacts/101comp.h
@@ -882,6 +882,6 @@ uint16 s101_chip_list[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/102comp.h b/sky/compacts/102comp.h
index 6d7b5873af..8640106b80 100644
--- a/sky/compacts/102comp.h
+++ b/sky/compacts/102comp.h
@@ -568,6 +568,6 @@ Compact restart_butt = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/10comp.h b/sky/compacts/10comp.h
index e5c8297172..6f1028ae8b 100644
--- a/sky/compacts/10comp.h
+++ b/sky/compacts/10comp.h
@@ -2430,6 +2430,6 @@ Compact liyt_1 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/11comp.h b/sky/compacts/11comp.h
index 165b4fa1a0..c882a4484a 100644
--- a/sky/compacts/11comp.h
+++ b/sky/compacts/11comp.h
@@ -1725,6 +1725,6 @@ uint16 cable_fall2_seq[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/12comp.h b/sky/compacts/12comp.h
index 30005e7846..f5fa78f82f 100644
--- a/sky/compacts/12comp.h
+++ b/sky/compacts/12comp.h
@@ -2227,6 +2227,6 @@ uint16 topbelt_seq[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/13comp.h b/sky/compacts/13comp.h
index c8291b5905..9c6d80e541 100644
--- a/sky/compacts/13comp.h
+++ b/sky/compacts/13comp.h
@@ -3765,6 +3765,6 @@ uint16 armsup_seq[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/14comp.h b/sky/compacts/14comp.h
index 0954bdce3b..fc155ba632 100644
--- a/sky/compacts/14comp.h
+++ b/sky/compacts/14comp.h
@@ -2073,6 +2073,6 @@ uint16 change6_seq[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/15comp.h b/sky/compacts/15comp.h
index 4da2c3aa1b..a826e4f82b 100644
--- a/sky/compacts/15comp.h
+++ b/sky/compacts/15comp.h
@@ -1106,6 +1106,6 @@ uint16 s15_chip_list[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/16comp.h b/sky/compacts/16comp.h
index b7c23a3f51..e599913e78 100644
--- a/sky/compacts/16comp.h
+++ b/sky/compacts/16comp.h
@@ -980,6 +980,6 @@ uint16 fost_con_look[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/17comp.h b/sky/compacts/17comp.h
index 45fbc459cb..99945baea8 100644
--- a/sky/compacts/17comp.h
+++ b/sky/compacts/17comp.h
@@ -914,6 +914,6 @@ Compact pulse = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/18comp.h b/sky/compacts/18comp.h
index 64624635b2..37c073bb58 100644
--- a/sky/compacts/18comp.h
+++ b/sky/compacts/18comp.h
@@ -1601,6 +1601,6 @@ Compact right_exit_s18 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/19comp.h b/sky/compacts/19comp.h
index 3eaa69957f..925b27b646 100644
--- a/sky/compacts/19comp.h
+++ b/sky/compacts/19comp.h
@@ -721,6 +721,6 @@ uint16 s19_fast_list[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/1compact.h b/sky/compacts/1compact.h
index afc986b4f3..8f44bb362c 100644
--- a/sky/compacts/1compact.h
+++ b/sky/compacts/1compact.h
@@ -1972,6 +1972,6 @@ uint16 fire1_seq[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/20comp.h b/sky/compacts/20comp.h
index 2220248f0b..a672732b59 100644
--- a/sky/compacts/20comp.h
+++ b/sky/compacts/20comp.h
@@ -1221,6 +1221,6 @@ uint16 s20_mouse[] = {
 	ID_TEXT_MOUSE
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/21comp.h b/sky/compacts/21comp.h
index ac2e19af32..afe95beaf8 100644
--- a/sky/compacts/21comp.h
+++ b/sky/compacts/21comp.h
@@ -2142,6 +2142,6 @@ uint16 take_cassette_seq[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/22comp.h b/sky/compacts/22comp.h
index 03c34ea4ff..5cc4278061 100644
--- a/sky/compacts/22comp.h
+++ b/sky/compacts/22comp.h
@@ -1581,6 +1581,6 @@ Compact fish_poster = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/23comp.h b/sky/compacts/23comp.h
index 0e259d7549..15bdc0d1c5 100644
--- a/sky/compacts/23comp.h
+++ b/sky/compacts/23comp.h
@@ -795,6 +795,6 @@ uint16 rs_foster_29_23[] = {
 	65535
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/24comp.h b/sky/compacts/24comp.h
index 6ad0a0795a..b19041e493 100644
--- a/sky/compacts/24comp.h
+++ b/sky/compacts/24comp.h
@@ -1311,6 +1311,6 @@ uint16 s24_fast_list[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/25comp.h b/sky/compacts/25comp.h
index 023cb36f5d..8bd9e9536c 100644
--- a/sky/compacts/25comp.h
+++ b/sky/compacts/25comp.h
@@ -1117,6 +1117,6 @@ Compact s25_floor = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/26comp.h b/sky/compacts/26comp.h
index adb0d35f6e..2e605d8799 100644
--- a/sky/compacts/26comp.h
+++ b/sky/compacts/26comp.h
@@ -1303,6 +1303,6 @@ Compact s26_floor = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/27comp.h b/sky/compacts/27comp.h
index b8b23ce2d7..6e83bb42bd 100644
--- a/sky/compacts/27comp.h
+++ b/sky/compacts/27comp.h
@@ -3274,6 +3274,6 @@ Compact chair_27 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/28comp.h b/sky/compacts/28comp.h
index 43be8f8a34..ad606a4a97 100644
--- a/sky/compacts/28comp.h
+++ b/sky/compacts/28comp.h
@@ -989,6 +989,6 @@ Compact small_l_28 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/29comp.h b/sky/compacts/29comp.h
index 50858fe272..a07f663efe 100644
--- a/sky/compacts/29comp.h
+++ b/sky/compacts/29comp.h
@@ -1590,6 +1590,6 @@ void *data_3[] = {
 	rs_31_28
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/2compact.h b/sky/compacts/2compact.h
index 7ea316c2a0..00e8d52eef 100644
--- a/sky/compacts/2compact.h
+++ b/sky/compacts/2compact.h
@@ -1820,6 +1820,6 @@ Compact top_barrel = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/30comp.h b/sky/compacts/30comp.h
index 454c5fa443..b24b01ffba 100644
--- a/sky/compacts/30comp.h
+++ b/sky/compacts/30comp.h
@@ -6615,6 +6615,6 @@ void *data_4[] = {
 	&sc31_at_watcher
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/31comp.h b/sky/compacts/31comp.h
index 7f9b1ff537..be6f9e5f49 100644
--- a/sky/compacts/31comp.h
+++ b/sky/compacts/31comp.h
@@ -2850,6 +2850,6 @@ uint16 sc31_joey_list[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/32comp.h b/sky/compacts/32comp.h
index b1f28f9bc2..c3f4bcd4db 100644
--- a/sky/compacts/32comp.h
+++ b/sky/compacts/32comp.h
@@ -1836,6 +1836,6 @@ Compact sc32_exit_33 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/33comp.h b/sky/compacts/33comp.h
index 806c990a98..7446f1f344 100644
--- a/sky/compacts/33comp.h
+++ b/sky/compacts/33comp.h
@@ -824,6 +824,6 @@ uint16 reset_30_33[] = {
 	65535
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/34comp.h b/sky/compacts/34comp.h
index 954db133c3..dfa81a305c 100644
--- a/sky/compacts/34comp.h
+++ b/sky/compacts/34comp.h
@@ -954,6 +954,6 @@ Compact sc34_door = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/36comp.h b/sky/compacts/36comp.h
index 9285673d40..0bd3cbc980 100644
--- a/sky/compacts/36comp.h
+++ b/sky/compacts/36comp.h
@@ -4269,6 +4269,6 @@ Compact sc36_exit_30 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/37comp.h b/sky/compacts/37comp.h
index b094889e30..37b2361bc6 100644
--- a/sky/compacts/37comp.h
+++ b/sky/compacts/37comp.h
@@ -1904,6 +1904,6 @@ uint16 sc37_crbarbox[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/38comp.h b/sky/compacts/38comp.h
index b16b92ab99..27ba864c39 100644
--- a/sky/compacts/38comp.h
+++ b/sky/compacts/38comp.h
@@ -3828,6 +3828,6 @@ uint16 sc38_lift_down[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/39comp.h b/sky/compacts/39comp.h
index 565df3bb8f..cad8dad7c8 100644
--- a/sky/compacts/39comp.h
+++ b/sky/compacts/39comp.h
@@ -774,6 +774,6 @@ uint16 sc39_palette[] = {
 	16191
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/3compact.h b/sky/compacts/3compact.h
index 7b3086790d..3b04bd2577 100644
--- a/sky/compacts/3compact.h
+++ b/sky/compacts/3compact.h
@@ -1843,6 +1843,6 @@ Compact low_barrel = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/40comp.h b/sky/compacts/40comp.h
index c9983c71a0..c59a494367 100644
--- a/sky/compacts/40comp.h
+++ b/sky/compacts/40comp.h
@@ -1220,6 +1220,6 @@ uint16 sc40_ascend[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/41comp.h b/sky/compacts/41comp.h
index b71b87ffc6..f195d1cc80 100644
--- a/sky/compacts/41comp.h
+++ b/sky/compacts/41comp.h
@@ -744,6 +744,6 @@ uint16 sc41_palette[] = {
 	16191
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/42comp.h b/sky/compacts/42comp.h
index c67e76d21f..fbcd0a2978 100644
--- a/sky/compacts/42comp.h
+++ b/sky/compacts/42comp.h
@@ -1708,6 +1708,6 @@ uint16 sc42_fos_leave[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/44comp.h b/sky/compacts/44comp.h
index 486166f6e0..57a9817e8b 100644
--- a/sky/compacts/44comp.h
+++ b/sky/compacts/44comp.h
@@ -649,6 +649,6 @@ uint16 reset_37_44[] = {
 	65535
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/45comp.h b/sky/compacts/45comp.h
index 6a1187a3fc..757a3d092d 100644
--- a/sky/compacts/45comp.h
+++ b/sky/compacts/45comp.h
@@ -629,6 +629,6 @@ uint16 sc45_mouse_list[] = {
 	ID_TEXT_MOUSE
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/46comp.h b/sky/compacts/46comp.h
index 1c17ce12b9..65e20a4887 100644
--- a/sky/compacts/46comp.h
+++ b/sky/compacts/46comp.h
@@ -564,6 +564,6 @@ Compact sc46_floor = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/47comp.h b/sky/compacts/47comp.h
index aec4d06d74..b184778259 100644
--- a/sky/compacts/47comp.h
+++ b/sky/compacts/47comp.h
@@ -578,6 +578,6 @@ Compact sc47_floor = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/48comp.h b/sky/compacts/48comp.h
index f4dc496631..9649a5a109 100644
--- a/sky/compacts/48comp.h
+++ b/sky/compacts/48comp.h
@@ -1162,6 +1162,6 @@ uint16 sc48_light_pal[] = {
 	16191
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/4compact.h b/sky/compacts/4compact.h
index e03fa78967..51ddf83446 100644
--- a/sky/compacts/4compact.h
+++ b/sky/compacts/4compact.h
@@ -1346,6 +1346,6 @@ Compact cupboard_s4 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/5compact.h b/sky/compacts/5compact.h
index e91669c10b..3f9b1d80d5 100644
--- a/sky/compacts/5compact.h
+++ b/sky/compacts/5compact.h
@@ -4923,6 +4923,6 @@ void *data_2[] = {
 
 uint32 *table2 = (uint32*)data_2;
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/65comp.h b/sky/compacts/65comp.h
index f4c9ab538f..ba91f581c6 100644
--- a/sky/compacts/65comp.h
+++ b/sky/compacts/65comp.h
@@ -671,6 +671,6 @@ uint16 sc65_palette[] = {
 	16191
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/66comp.h b/sky/compacts/66comp.h
index 44d3fa1e68..f11f3125d5 100644
--- a/sky/compacts/66comp.h
+++ b/sky/compacts/66comp.h
@@ -6689,6 +6689,6 @@ void *data_5[] = {
 	reset_dad_spec
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/67comp.h b/sky/compacts/67comp.h
index 218a3cd763..7959835c6e 100644
--- a/sky/compacts/67comp.h
+++ b/sky/compacts/67comp.h
@@ -2089,6 +2089,6 @@ Compact sc67_clot = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/68comp.h b/sky/compacts/68comp.h
index b9d749b238..10f8896eb3 100644
--- a/sky/compacts/68comp.h
+++ b/sky/compacts/68comp.h
@@ -1409,6 +1409,6 @@ uint16 sc68_joey_list[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/69comp.h b/sky/compacts/69comp.h
index 68a85fd5e8..045472001d 100644
--- a/sky/compacts/69comp.h
+++ b/sky/compacts/69comp.h
@@ -1191,6 +1191,6 @@ Compact sc69_floor = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/70comp.h b/sky/compacts/70comp.h
index c729cd2b81..b1fa9ab8f1 100644
--- a/sky/compacts/70comp.h
+++ b/sky/compacts/70comp.h
@@ -1260,6 +1260,6 @@ uint16 sc70_mouse_list[] = {
 	ID_TEXT_MOUSE
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/71comp.h b/sky/compacts/71comp.h
index 54cd493e2c..6725674e54 100644
--- a/sky/compacts/71comp.h
+++ b/sky/compacts/71comp.h
@@ -1700,6 +1700,6 @@ uint16 sc71_light2_anim[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/72comp.h b/sky/compacts/72comp.h
index b6dd4f2734..ef946d0e43 100644
--- a/sky/compacts/72comp.h
+++ b/sky/compacts/72comp.h
@@ -2414,6 +2414,6 @@ Compact sc72_chamber1 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/73comp.h b/sky/compacts/73comp.h
index 399f612960..2588a2e668 100644
--- a/sky/compacts/73comp.h
+++ b/sky/compacts/73comp.h
@@ -2546,6 +2546,6 @@ Compact sc73_cham4_light = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/74comp.h b/sky/compacts/74comp.h
index 373dbf815c..1800b87788 100644
--- a/sky/compacts/74comp.h
+++ b/sky/compacts/74comp.h
@@ -6681,6 +6681,6 @@ uint16 sc74_slot_flash[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/75comp.h b/sky/compacts/75comp.h
index 7f649c37fd..407ee20cee 100644
--- a/sky/compacts/75comp.h
+++ b/sky/compacts/75comp.h
@@ -1910,6 +1910,6 @@ uint16 sc75_get_tiss[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/76comp.h b/sky/compacts/76comp.h
index b42c474887..733a82960c 100644
--- a/sky/compacts/76comp.h
+++ b/sky/compacts/76comp.h
@@ -2814,6 +2814,6 @@ Compact sc76_door75 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/77comp.h b/sky/compacts/77comp.h
index fce8eb14bd..f916cad0e3 100644
--- a/sky/compacts/77comp.h
+++ b/sky/compacts/77comp.h
@@ -1092,6 +1092,6 @@ Compact sc77_door76 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/78comp.h b/sky/compacts/78comp.h
index 81bd0bc7ae..8d806c8c66 100644
--- a/sky/compacts/78comp.h
+++ b/sky/compacts/78comp.h
@@ -1204,6 +1204,6 @@ uint16 sc78_fast_list[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/79comp.h b/sky/compacts/79comp.h
index 69aa4b5edf..f46dfb9fbb 100644
--- a/sky/compacts/79comp.h
+++ b/sky/compacts/79comp.h
@@ -1655,6 +1655,6 @@ Compact sc79_pipe = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/80comp.h b/sky/compacts/80comp.h
index 5a79546fe3..437d7aa78b 100644
--- a/sky/compacts/80comp.h
+++ b/sky/compacts/80comp.h
@@ -3565,6 +3565,6 @@ Compact sc80_goo = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/81comp.h b/sky/compacts/81comp.h
index 52bea3fb91..e7d2af5062 100644
--- a/sky/compacts/81comp.h
+++ b/sky/compacts/81comp.h
@@ -2762,6 +2762,6 @@ uint16 sc81_foster_sit[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/82comp.h b/sky/compacts/82comp.h
index f9b4635ac1..e56c52df3e 100644
--- a/sky/compacts/82comp.h
+++ b/sky/compacts/82comp.h
@@ -712,6 +712,6 @@ uint16 sc82_jobs_return[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/85comp.h b/sky/compacts/85comp.h
index 44d9cfcb48..db1201ebed 100644
--- a/sky/compacts/85comp.h
+++ b/sky/compacts/85comp.h
@@ -434,6 +434,6 @@ uint16 sc85_logic_list[] = {
 	ID_STD_MENU_LOGIC
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/90comp.h b/sky/compacts/90comp.h
index 76443a451c..89e4e6c130 100644
--- a/sky/compacts/90comp.h
+++ b/sky/compacts/90comp.h
@@ -1857,6 +1857,6 @@ void *data_6[] = {
 
 uint32 *sec6_compacts = (uint32*)data_6;
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/91comp.h b/sky/compacts/91comp.h
index 4a92a52db2..909178580e 100644
--- a/sky/compacts/91comp.h
+++ b/sky/compacts/91comp.h
@@ -1518,6 +1518,6 @@ Compact door_r91f = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/92comp.h b/sky/compacts/92comp.h
index c2e25139c9..7ac3feaae9 100644
--- a/sky/compacts/92comp.h
+++ b/sky/compacts/92comp.h
@@ -1682,6 +1682,6 @@ Compact slab3 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/93comp.h b/sky/compacts/93comp.h
index cb6eb733ee..3ef839ebcc 100644
--- a/sky/compacts/93comp.h
+++ b/sky/compacts/93comp.h
@@ -834,6 +834,6 @@ uint16 pal93[] = {
 	16191
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/94comp.h b/sky/compacts/94comp.h
index 3fedc378be..6e0ed773f4 100644
--- a/sky/compacts/94comp.h
+++ b/sky/compacts/94comp.h
@@ -1377,6 +1377,6 @@ Compact hologram_a = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/95comp.h b/sky/compacts/95comp.h
index 2a5d8192b6..073d8f44e7 100644
--- a/sky/compacts/95comp.h
+++ b/sky/compacts/95comp.h
@@ -1357,6 +1357,6 @@ uint16 door_l95_anim[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/96comp.h b/sky/compacts/96comp.h
index e928dd523f..cceead6fe0 100644
--- a/sky/compacts/96comp.h
+++ b/sky/compacts/96comp.h
@@ -924,6 +924,6 @@ uint16 fast_list_sc96[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/9compact.h b/sky/compacts/9compact.h
index fa9554c0dc..d7b5233592 100644
--- a/sky/compacts/9compact.h
+++ b/sky/compacts/9compact.h
@@ -1689,6 +1689,6 @@ uint16 s9_pal[] = {
 	16191
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/linc_gen.h b/sky/compacts/linc_gen.h
index 57dd4c08cb..c1992c47b3 100644
--- a/sky/compacts/linc_gen.h
+++ b/sky/compacts/linc_gen.h
@@ -571,6 +571,6 @@ uint16 rs_foster_s90[] = {
 
 uint32 *grid93 = 0;
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/lincmenu.h b/sky/compacts/lincmenu.h
index 2ee1c282c8..e28c793012 100644
--- a/sky/compacts/lincmenu.h
+++ b/sky/compacts/lincmenu.h
@@ -798,6 +798,6 @@ Compact blind_menu = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/objects.h b/sky/compacts/objects.h
index eb0e015a8f..299bdd390b 100644
--- a/sky/compacts/objects.h
+++ b/sky/compacts/objects.h
@@ -1258,6 +1258,6 @@ Compact menu_bar = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/z_compac.h b/sky/compacts/z_compac.h
index 11805441ac..d3da6bdd99 100644
--- a/sky/compacts/z_compac.h
+++ b/sky/compacts/z_compac.h
@@ -5969,6 +5969,6 @@ void *data_0[] = {
 
 uint32 *z_compact_table = (uint32*)data_0;
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/debug.cpp b/sky/debug.cpp
index df46f5825b..cb7ddb067f 100644
--- a/sky/debug.cpp
+++ b/sky/debug.cpp
@@ -1260,5 +1260,5 @@ void SkyDebug::script(uint32 command, uint16 *scriptData) {
 
 void SkyDebug::mcode(uint32 mcode, uint32 a, uint32 b, uint32 c) {
 	debug(6, "MCODE: %s(%d, %d, %d)", mcodes[mcode], a, b, c);
-};
+}
 
diff --git a/sky/logic.cpp b/sky/logic.cpp
index 846227fede..02c4f3cb8b 100644
--- a/sky/logic.cpp
+++ b/sky/logic.cpp
@@ -1148,7 +1148,7 @@ uint16 SkyLogic::mouseScript(uint32 scrNum, Compact *scriptComp) {
 	uint16 retVal = script((uint16)(scrNum & 0xFFFF), (uint16)(scrNum >> 16)); 
 	_compact = tmpComp;
 	return retVal;
-};
+}
 
 /**
  * This is the actual script engine.  It interprets script \a scriptNo starting at \a offset