diff -Naur scummvm-0.5.1.org/common/list.h scummvm-0.5.1/common/list.h --- scummvm-0.5.1.org/common/list.h 2004-04-28 18:55:02.430048840 +0200 +++ scummvm-0.5.1/common/list.h 2004-04-28 18:55:57.782633968 +0200 @@ -126,6 +126,6 @@ } }; -};// End of namespace ScummVM +} // End of namespace ScummVM #endif diff -Naur scummvm-0.5.1.org/common/map.h scummvm-0.5.1/common/map.h --- scummvm-0.5.1.org/common/map.h 2004-04-28 18:55:02.428049144 +0200 +++ scummvm-0.5.1/common/map.h 2004-04-28 18:56:34.144106184 +0200 @@ -237,6 +237,6 @@ typedef Map StringMap; -}; // End of namespace ScummVM +} // End of namespace ScummVM #endif diff -Naur scummvm-0.5.1.org/common/rect.h scummvm-0.5.1/common/rect.h --- scummvm-0.5.1.org/common/rect.h 2004-04-28 18:55:02.430048840 +0200 +++ scummvm-0.5.1/common/rect.h 2004-04-28 18:55:38.228606632 +0200 @@ -108,6 +108,6 @@ } }; -}; // End of namespace ScummVM +} // End of namespace ScummVM #endif diff -Naur scummvm-0.5.1.org/common/str.cpp scummvm-0.5.1/common/str.cpp --- scummvm-0.5.1.org/common/str.cpp 2004-04-28 18:55:02.430048840 +0200 +++ scummvm-0.5.1/common/str.cpp 2004-04-28 19:15:34.570734984 +0200 @@ -266,4 +266,4 @@ return x != y; } -}; // End of namespace ScummVM +} // End of namespace ScummVM diff -Naur scummvm-0.5.1.org/common/str.h scummvm-0.5.1/common/str.h --- scummvm-0.5.1.org/common/str.h 2004-04-28 18:55:02.428049144 +0200 +++ scummvm-0.5.1/common/str.h 2004-04-28 18:55:24.731658480 +0200 @@ -141,6 +141,6 @@ } }; -}; // End of namespace ScummVM +} // End of namespace ScummVM #endif diff -Naur scummvm-0.5.1.org/sky/compact.cpp scummvm-0.5.1/sky/compact.cpp --- scummvm-0.5.1.org/sky/compact.cpp 2004-04-28 18:55:02.395054160 +0200 +++ scummvm-0.5.1/sky/compact.cpp 2004-04-28 19:14:08.232860336 +0200 @@ -64,7 +64,7 @@ extern bool animTalkTableIsPointer[]; extern uint16 animTalkTableVal[]; extern void *animTalkTablePtr[]; -}; +} namespace SkyCompact { @@ -617,5 +617,5 @@ ((Compact *)SkyCompact::data_3[409])->actionScript = 0x3127; // slot_28 } -}; +} diff -Naur scummvm-0.5.1.org/sky/compact.h scummvm-0.5.1/sky/compact.h --- scummvm-0.5.1.org/sky/compact.h 2004-04-28 18:55:02.371057808 +0200 +++ scummvm-0.5.1/sky/compact.h 2004-04-28 18:57:15.624800160 +0200 @@ -3252,6 +3252,6 @@ extern uint16 ss_auto[]; extern uint16 wit_auto[]; extern uint16 minif_auto[]; -}; +} #endif diff -Naur scummvm-0.5.1.org/sky/compacts/0compact.h scummvm-0.5.1/sky/compacts/0compact.h --- scummvm-0.5.1.org/sky/compacts/0compact.h 2004-04-28 18:55:02.380056440 +0200 +++ scummvm-0.5.1/sky/compacts/0compact.h 2004-04-28 18:58:22.881575576 +0200 @@ -9322,6 +9322,6 @@ car_down_seq }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/101comp.h scummvm-0.5.1/sky/compacts/101comp.h --- scummvm-0.5.1.org/sky/compacts/101comp.h 2004-04-28 18:55:02.384055832 +0200 +++ scummvm-0.5.1/sky/compacts/101comp.h 2004-04-28 19:02:03.405050912 +0200 @@ -882,6 +882,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/102comp.h scummvm-0.5.1/sky/compacts/102comp.h --- scummvm-0.5.1.org/sky/compacts/102comp.h 2004-04-28 18:55:02.386055528 +0200 +++ scummvm-0.5.1/sky/compacts/102comp.h 2004-04-28 19:02:10.220014880 +0200 @@ -568,6 +568,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/10comp.h scummvm-0.5.1/sky/compacts/10comp.h --- scummvm-0.5.1.org/sky/compacts/10comp.h 2004-04-28 18:55:02.374057352 +0200 +++ scummvm-0.5.1/sky/compacts/10comp.h 2004-04-28 19:00:15.419467216 +0200 @@ -2430,6 +2430,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/11comp.h scummvm-0.5.1/sky/compacts/11comp.h --- scummvm-0.5.1.org/sky/compacts/11comp.h 2004-04-28 18:55:02.376057048 +0200 +++ scummvm-0.5.1/sky/compacts/11comp.h 2004-04-28 19:00:24.736050880 +0200 @@ -1725,6 +1725,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/12comp.h scummvm-0.5.1/sky/compacts/12comp.h --- scummvm-0.5.1.org/sky/compacts/12comp.h 2004-04-28 18:55:02.378056744 +0200 +++ scummvm-0.5.1/sky/compacts/12comp.h 2004-04-28 19:00:32.441879416 +0200 @@ -2227,6 +2227,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/13comp.h scummvm-0.5.1/sky/compacts/13comp.h --- scummvm-0.5.1.org/sky/compacts/13comp.h 2004-04-28 18:55:02.380056440 +0200 +++ scummvm-0.5.1/sky/compacts/13comp.h 2004-04-28 19:00:42.753311840 +0200 @@ -3765,6 +3765,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/14comp.h scummvm-0.5.1/sky/compacts/14comp.h --- scummvm-0.5.1.org/sky/compacts/14comp.h 2004-04-28 18:55:02.382056136 +0200 +++ scummvm-0.5.1/sky/compacts/14comp.h 2004-04-28 19:00:50.584121376 +0200 @@ -2073,6 +2073,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/15comp.h scummvm-0.5.1/sky/compacts/15comp.h --- scummvm-0.5.1.org/sky/compacts/15comp.h 2004-04-28 18:55:02.384055832 +0200 +++ scummvm-0.5.1/sky/compacts/15comp.h 2004-04-28 19:00:57.967998856 +0200 @@ -1106,6 +1106,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/16comp.h scummvm-0.5.1/sky/compacts/16comp.h --- scummvm-0.5.1.org/sky/compacts/16comp.h 2004-04-28 18:55:02.389055072 +0200 +++ scummvm-0.5.1/sky/compacts/16comp.h 2004-04-28 19:01:05.635833168 +0200 @@ -980,6 +980,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/17comp.h scummvm-0.5.1/sky/compacts/17comp.h --- scummvm-0.5.1.org/sky/compacts/17comp.h 2004-04-28 18:55:02.374057352 +0200 +++ scummvm-0.5.1/sky/compacts/17comp.h 2004-04-28 19:01:36.181189568 +0200 @@ -914,6 +914,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/18comp.h scummvm-0.5.1/sky/compacts/18comp.h --- scummvm-0.5.1.org/sky/compacts/18comp.h 2004-04-28 18:55:02.376057048 +0200 +++ scummvm-0.5.1/sky/compacts/18comp.h 2004-04-28 19:01:44.453931920 +0200 @@ -1601,6 +1601,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/19comp.h scummvm-0.5.1/sky/compacts/19comp.h --- scummvm-0.5.1.org/sky/compacts/19comp.h 2004-04-28 18:55:02.378056744 +0200 +++ scummvm-0.5.1/sky/compacts/19comp.h 2004-04-28 19:01:51.630840864 +0200 @@ -721,6 +721,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/1compact.h scummvm-0.5.1/sky/compacts/1compact.h --- scummvm-0.5.1.org/sky/compacts/1compact.h 2004-04-28 18:55:02.383055984 +0200 +++ scummvm-0.5.1/sky/compacts/1compact.h 2004-04-28 18:59:06.480947464 +0200 @@ -1972,6 +1972,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/20comp.h scummvm-0.5.1/sky/compacts/20comp.h --- scummvm-0.5.1.org/sky/compacts/20comp.h 2004-04-28 18:55:02.382056136 +0200 +++ scummvm-0.5.1/sky/compacts/20comp.h 2004-04-28 19:05:55.575755600 +0200 @@ -1221,6 +1221,6 @@ ID_TEXT_MOUSE }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/21comp.h scummvm-0.5.1/sky/compacts/21comp.h --- scummvm-0.5.1.org/sky/compacts/21comp.h 2004-04-28 18:55:02.385055680 +0200 +++ scummvm-0.5.1/sky/compacts/21comp.h 2004-04-28 19:02:58.537669480 +0200 @@ -2142,6 +2142,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/22comp.h scummvm-0.5.1/sky/compacts/22comp.h --- scummvm-0.5.1.org/sky/compacts/22comp.h 2004-04-28 18:55:02.390054920 +0200 +++ scummvm-0.5.1/sky/compacts/22comp.h 2004-04-28 19:03:06.679431744 +0200 @@ -1581,6 +1581,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/23comp.h scummvm-0.5.1/sky/compacts/23comp.h --- scummvm-0.5.1.org/sky/compacts/23comp.h 2004-04-28 18:55:02.375057200 +0200 +++ scummvm-0.5.1/sky/compacts/23comp.h 2004-04-28 19:02:43.883897192 +0200 @@ -795,6 +795,6 @@ 65535 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/24comp.h scummvm-0.5.1/sky/compacts/24comp.h --- scummvm-0.5.1.org/sky/compacts/24comp.h 2004-04-28 18:55:02.377056896 +0200 +++ scummvm-0.5.1/sky/compacts/24comp.h 2004-04-28 19:03:14.085305880 +0200 @@ -1311,6 +1311,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/25comp.h scummvm-0.5.1/sky/compacts/25comp.h --- scummvm-0.5.1.org/sky/compacts/25comp.h 2004-04-28 18:55:02.378056744 +0200 +++ scummvm-0.5.1/sky/compacts/25comp.h 2004-04-28 19:03:21.414191720 +0200 @@ -1117,6 +1117,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/26comp.h scummvm-0.5.1/sky/compacts/26comp.h --- scummvm-0.5.1.org/sky/compacts/26comp.h 2004-04-28 18:55:02.381056288 +0200 +++ scummvm-0.5.1/sky/compacts/26comp.h 2004-04-28 19:03:28.683086680 +0200 @@ -1303,6 +1303,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/27comp.h scummvm-0.5.1/sky/compacts/27comp.h --- scummvm-0.5.1.org/sky/compacts/27comp.h 2004-04-28 18:55:02.383055984 +0200 +++ scummvm-0.5.1/sky/compacts/27comp.h 2004-04-28 19:03:38.000670192 +0200 @@ -3274,6 +3274,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/28comp.h scummvm-0.5.1/sky/compacts/28comp.h --- scummvm-0.5.1.org/sky/compacts/28comp.h 2004-04-28 18:55:02.385055680 +0200 +++ scummvm-0.5.1/sky/compacts/28comp.h 2004-04-28 19:03:47.049294592 +0200 @@ -989,6 +989,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/29comp.h scummvm-0.5.1/sky/compacts/29comp.h --- scummvm-0.5.1.org/sky/compacts/29comp.h 2004-04-28 18:55:02.390054920 +0200 +++ scummvm-0.5.1/sky/compacts/29comp.h 2004-04-28 19:03:55.499010040 +0200 @@ -1590,6 +1590,6 @@ rs_31_28 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/2compact.h scummvm-0.5.1/sky/compacts/2compact.h --- scummvm-0.5.1.org/sky/compacts/2compact.h 2004-04-28 18:55:02.389055072 +0200 +++ scummvm-0.5.1/sky/compacts/2compact.h 2004-04-28 18:59:21.259700752 +0200 @@ -1820,6 +1820,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/30comp.h scummvm-0.5.1/sky/compacts/30comp.h --- scummvm-0.5.1.org/sky/compacts/30comp.h 2004-04-28 18:55:02.377056896 +0200 +++ scummvm-0.5.1/sky/compacts/30comp.h 2004-04-28 19:04:09.787837808 +0200 @@ -6615,6 +6615,6 @@ &sc31_at_watcher }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/31comp.h scummvm-0.5.1/sky/compacts/31comp.h --- scummvm-0.5.1.org/sky/compacts/31comp.h 2004-04-28 18:55:02.379056592 +0200 +++ scummvm-0.5.1/sky/compacts/31comp.h 2004-04-28 19:04:26.819248640 +0200 @@ -2850,6 +2850,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/32comp.h scummvm-0.5.1/sky/compacts/32comp.h --- scummvm-0.5.1.org/sky/compacts/32comp.h 2004-04-28 18:55:02.381056288 +0200 +++ scummvm-0.5.1/sky/compacts/32comp.h 2004-04-28 19:04:33.908170960 +0200 @@ -1836,6 +1836,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/33comp.h scummvm-0.5.1/sky/compacts/33comp.h --- scummvm-0.5.1.org/sky/compacts/33comp.h 2004-04-28 18:55:02.383055984 +0200 +++ scummvm-0.5.1/sky/compacts/33comp.h 2004-04-28 19:04:40.504168216 +0200 @@ -824,6 +824,6 @@ 65535 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/34comp.h scummvm-0.5.1/sky/compacts/34comp.h --- scummvm-0.5.1.org/sky/compacts/34comp.h 2004-04-28 18:55:02.385055680 +0200 +++ scummvm-0.5.1/sky/compacts/34comp.h 2004-04-28 19:04:47.112163648 +0200 @@ -954,6 +954,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/36comp.h scummvm-0.5.1/sky/compacts/36comp.h --- scummvm-0.5.1.org/sky/compacts/36comp.h 2004-04-28 18:55:02.375057200 +0200 +++ scummvm-0.5.1/sky/compacts/36comp.h 2004-04-28 19:05:05.212411992 +0200 @@ -4269,6 +4269,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/37comp.h scummvm-0.5.1/sky/compacts/37comp.h --- scummvm-0.5.1.org/sky/compacts/37comp.h 2004-04-28 18:55:02.377056896 +0200 +++ scummvm-0.5.1/sky/compacts/37comp.h 2004-04-28 19:05:13.136207392 +0200 @@ -1904,6 +1904,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/38comp.h scummvm-0.5.1/sky/compacts/38comp.h --- scummvm-0.5.1.org/sky/compacts/38comp.h 2004-04-28 18:55:02.379056592 +0200 +++ scummvm-0.5.1/sky/compacts/38comp.h 2004-04-28 19:05:24.862424736 +0200 @@ -3828,6 +3828,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/39comp.h scummvm-0.5.1/sky/compacts/39comp.h --- scummvm-0.5.1.org/sky/compacts/39comp.h 2004-04-28 18:55:02.381056288 +0200 +++ scummvm-0.5.1/sky/compacts/39comp.h 2004-04-28 19:05:32.502263304 +0200 @@ -774,6 +774,6 @@ 16191 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/3compact.h scummvm-0.5.1/sky/compacts/3compact.h --- scummvm-0.5.1.org/sky/compacts/3compact.h 2004-04-28 18:55:02.375057200 +0200 +++ scummvm-0.5.1/sky/compacts/3compact.h 2004-04-28 18:59:31.450151568 +0200 @@ -1843,6 +1843,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/40comp.h scummvm-0.5.1/sky/compacts/40comp.h --- scummvm-0.5.1.org/sky/compacts/40comp.h 2004-04-28 18:55:02.386055528 +0200 +++ scummvm-0.5.1/sky/compacts/40comp.h 2004-04-28 19:06:20.599951344 +0200 @@ -1220,6 +1220,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/41comp.h scummvm-0.5.1/sky/compacts/41comp.h --- scummvm-0.5.1.org/sky/compacts/41comp.h 2004-04-28 18:55:02.391054768 +0200 +++ scummvm-0.5.1/sky/compacts/41comp.h 2004-04-28 19:06:29.277632136 +0200 @@ -744,6 +744,6 @@ 16191 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/42comp.h scummvm-0.5.1/sky/compacts/42comp.h --- scummvm-0.5.1.org/sky/compacts/42comp.h 2004-04-28 18:55:02.375057200 +0200 +++ scummvm-0.5.1/sky/compacts/42comp.h 2004-04-28 19:06:36.273568592 +0200 @@ -1708,6 +1708,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/44comp.h scummvm-0.5.1/sky/compacts/44comp.h --- scummvm-0.5.1.org/sky/compacts/44comp.h 2004-04-28 18:55:02.380056440 +0200 +++ scummvm-0.5.1/sky/compacts/44comp.h 2004-04-28 19:06:44.530313376 +0200 @@ -649,6 +649,6 @@ 65535 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/45comp.h scummvm-0.5.1/sky/compacts/45comp.h --- scummvm-0.5.1.org/sky/compacts/45comp.h 2004-04-28 18:55:02.382056136 +0200 +++ scummvm-0.5.1/sky/compacts/45comp.h 2004-04-28 19:06:54.786754160 +0200 @@ -629,6 +629,6 @@ ID_TEXT_MOUSE }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/46comp.h scummvm-0.5.1/sky/compacts/46comp.h --- scummvm-0.5.1.org/sky/compacts/46comp.h 2004-04-28 18:55:02.384055832 +0200 +++ scummvm-0.5.1/sky/compacts/46comp.h 2004-04-28 19:07:01.159785312 +0200 @@ -564,6 +564,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/47comp.h scummvm-0.5.1/sky/compacts/47comp.h --- scummvm-0.5.1.org/sky/compacts/47comp.h 2004-04-28 18:55:02.386055528 +0200 +++ scummvm-0.5.1/sky/compacts/47comp.h 2004-04-28 19:07:08.609652760 +0200 @@ -578,6 +578,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/48comp.h scummvm-0.5.1/sky/compacts/48comp.h --- scummvm-0.5.1.org/sky/compacts/48comp.h 2004-04-28 18:55:02.391054768 +0200 +++ scummvm-0.5.1/sky/compacts/48comp.h 2004-04-28 19:07:15.529600768 +0200 @@ -1162,6 +1162,6 @@ 16191 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/4compact.h scummvm-0.5.1/sky/compacts/4compact.h --- scummvm-0.5.1.org/sky/compacts/4compact.h 2004-04-28 18:55:02.379056592 +0200 +++ scummvm-0.5.1/sky/compacts/4compact.h 2004-04-28 18:59:41.477627160 +0200 @@ -1346,6 +1346,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/5compact.h scummvm-0.5.1/sky/compacts/5compact.h --- scummvm-0.5.1.org/sky/compacts/5compact.h 2004-04-28 18:55:02.383055984 +0200 +++ scummvm-0.5.1/sky/compacts/5compact.h 2004-04-28 18:59:52.876894208 +0200 @@ -4923,6 +4923,6 @@ uint32 *table2 = (uint32*)data_2; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/65comp.h scummvm-0.5.1/sky/compacts/65comp.h --- scummvm-0.5.1.org/sky/compacts/65comp.h 2004-04-28 18:55:02.384055832 +0200 +++ scummvm-0.5.1/sky/compacts/65comp.h 2004-04-28 19:08:17.854126000 +0200 @@ -671,6 +671,6 @@ 16191 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/66comp.h scummvm-0.5.1/sky/compacts/66comp.h --- scummvm-0.5.1.org/sky/compacts/66comp.h 2004-04-28 18:55:02.388055224 +0200 +++ scummvm-0.5.1/sky/compacts/66comp.h 2004-04-28 19:08:29.842303520 +0200 @@ -6689,6 +6689,6 @@ reset_dad_spec }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/67comp.h scummvm-0.5.1/sky/compacts/67comp.h --- scummvm-0.5.1.org/sky/compacts/67comp.h 2004-04-28 18:55:02.374057352 +0200 +++ scummvm-0.5.1/sky/compacts/67comp.h 2004-04-28 19:08:39.594820912 +0200 @@ -2089,6 +2089,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/68comp.h scummvm-0.5.1/sky/compacts/68comp.h --- scummvm-0.5.1.org/sky/compacts/68comp.h 2004-04-28 18:55:02.376057048 +0200 +++ scummvm-0.5.1/sky/compacts/68comp.h 2004-04-28 19:08:48.125524048 +0200 @@ -1409,6 +1409,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/69comp.h scummvm-0.5.1/sky/compacts/69comp.h --- scummvm-0.5.1.org/sky/compacts/69comp.h 2004-04-28 18:55:02.378056744 +0200 +++ scummvm-0.5.1/sky/compacts/69comp.h 2004-04-28 19:08:55.755364136 +0200 @@ -1191,6 +1191,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/70comp.h scummvm-0.5.1/sky/compacts/70comp.h --- scummvm-0.5.1.org/sky/compacts/70comp.h 2004-04-28 18:55:02.382056136 +0200 +++ scummvm-0.5.1/sky/compacts/70comp.h 2004-04-28 19:09:15.317390256 +0200 @@ -1260,6 +1260,6 @@ ID_TEXT_MOUSE }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/71comp.h scummvm-0.5.1/sky/compacts/71comp.h --- scummvm-0.5.1.org/sky/compacts/71comp.h 2004-04-28 18:55:02.384055832 +0200 +++ scummvm-0.5.1/sky/compacts/71comp.h 2004-04-28 19:09:21.909388120 +0200 @@ -1700,6 +1700,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/72comp.h scummvm-0.5.1/sky/compacts/72comp.h --- scummvm-0.5.1.org/sky/compacts/72comp.h 2004-04-28 18:55:02.390054920 +0200 +++ scummvm-0.5.1/sky/compacts/72comp.h 2004-04-28 19:09:28.916322904 +0200 @@ -2414,6 +2414,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/73comp.h scummvm-0.5.1/sky/compacts/73comp.h --- scummvm-0.5.1.org/sky/compacts/73comp.h 2004-04-28 18:55:02.375057200 +0200 +++ scummvm-0.5.1/sky/compacts/73comp.h 2004-04-28 19:09:37.108077568 +0200 @@ -2546,6 +2546,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/74comp.h scummvm-0.5.1/sky/compacts/74comp.h --- scummvm-0.5.1.org/sky/compacts/74comp.h 2004-04-28 18:55:02.376057048 +0200 +++ scummvm-0.5.1/sky/compacts/74comp.h 2004-04-28 19:09:49.140248400 +0200 @@ -6681,6 +6681,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/75comp.h scummvm-0.5.1/sky/compacts/75comp.h --- scummvm-0.5.1.org/sky/compacts/75comp.h 2004-04-28 18:55:02.378056744 +0200 +++ scummvm-0.5.1/sky/compacts/75comp.h 2004-04-28 19:09:58.084888608 +0200 @@ -1910,6 +1910,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/76comp.h scummvm-0.5.1/sky/compacts/76comp.h --- scummvm-0.5.1.org/sky/compacts/76comp.h 2004-04-28 18:55:02.381056288 +0200 +++ scummvm-0.5.1/sky/compacts/76comp.h 2004-04-28 19:10:07.145511184 +0200 @@ -2814,6 +2814,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/77comp.h scummvm-0.5.1/sky/compacts/77comp.h --- scummvm-0.5.1.org/sky/compacts/77comp.h 2004-04-28 18:55:02.382056136 +0200 +++ scummvm-0.5.1/sky/compacts/77comp.h 2004-04-28 19:10:15.304270864 +0200 @@ -1092,6 +1092,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/78comp.h scummvm-0.5.1/sky/compacts/78comp.h --- scummvm-0.5.1.org/sky/compacts/78comp.h 2004-04-28 18:55:02.385055680 +0200 +++ scummvm-0.5.1/sky/compacts/78comp.h 2004-04-28 19:10:23.081088608 +0200 @@ -1204,6 +1204,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/79comp.h scummvm-0.5.1/sky/compacts/79comp.h --- scummvm-0.5.1.org/sky/compacts/79comp.h 2004-04-28 18:55:02.390054920 +0200 +++ scummvm-0.5.1/sky/compacts/79comp.h 2004-04-28 19:10:30.208005152 +0200 @@ -1655,6 +1655,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/80comp.h scummvm-0.5.1/sky/compacts/80comp.h --- scummvm-0.5.1.org/sky/compacts/80comp.h 2004-04-28 18:55:02.377056896 +0200 +++ scummvm-0.5.1/sky/compacts/80comp.h 2004-04-28 19:10:47.411389840 +0200 @@ -3565,6 +3565,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/81comp.h scummvm-0.5.1/sky/compacts/81comp.h --- scummvm-0.5.1.org/sky/compacts/81comp.h 2004-04-28 18:55:02.379056592 +0200 +++ scummvm-0.5.1/sky/compacts/81comp.h 2004-04-28 19:10:54.969240872 +0200 @@ -2762,6 +2762,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/82comp.h scummvm-0.5.1/sky/compacts/82comp.h --- scummvm-0.5.1.org/sky/compacts/82comp.h 2004-04-28 18:55:02.381056288 +0200 +++ scummvm-0.5.1/sky/compacts/82comp.h 2004-04-28 19:11:02.418108472 +0200 @@ -712,6 +712,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/85comp.h scummvm-0.5.1/sky/compacts/85comp.h --- scummvm-0.5.1.org/sky/compacts/85comp.h 2004-04-28 18:55:02.390054920 +0200 +++ scummvm-0.5.1/sky/compacts/85comp.h 2004-04-28 19:11:13.925359104 +0200 @@ -434,6 +434,6 @@ ID_STD_MENU_LOGIC }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/90comp.h scummvm-0.5.1/sky/compacts/90comp.h --- scummvm-0.5.1.org/sky/compacts/90comp.h 2004-04-28 18:55:02.386055528 +0200 +++ scummvm-0.5.1/sky/compacts/90comp.h 2004-04-28 19:11:31.057754584 +0200 @@ -1857,6 +1857,6 @@ uint32 *sec6_compacts = (uint32*)data_6; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/91comp.h scummvm-0.5.1/sky/compacts/91comp.h --- scummvm-0.5.1.org/sky/compacts/91comp.h 2004-04-28 18:55:02.390054920 +0200 +++ scummvm-0.5.1/sky/compacts/91comp.h 2004-04-28 19:11:23.128959944 +0200 @@ -1518,6 +1518,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/92comp.h scummvm-0.5.1/sky/compacts/92comp.h --- scummvm-0.5.1.org/sky/compacts/92comp.h 2004-04-28 18:55:02.375057200 +0200 +++ scummvm-0.5.1/sky/compacts/92comp.h 2004-04-28 19:11:38.971551504 +0200 @@ -1682,6 +1682,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/93comp.h scummvm-0.5.1/sky/compacts/93comp.h --- scummvm-0.5.1.org/sky/compacts/93comp.h 2004-04-28 18:55:02.378056744 +0200 +++ scummvm-0.5.1/sky/compacts/93comp.h 2004-04-28 19:11:46.480409984 +0200 @@ -834,6 +834,6 @@ 16191 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/94comp.h scummvm-0.5.1/sky/compacts/94comp.h --- scummvm-0.5.1.org/sky/compacts/94comp.h 2004-04-28 18:55:02.379056592 +0200 +++ scummvm-0.5.1/sky/compacts/94comp.h 2004-04-28 19:11:55.420050952 +0200 @@ -1377,6 +1377,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/95comp.h scummvm-0.5.1/sky/compacts/95comp.h --- scummvm-0.5.1.org/sky/compacts/95comp.h 2004-04-28 18:55:02.381056288 +0200 +++ scummvm-0.5.1/sky/compacts/95comp.h 2004-04-28 19:12:02.535969168 +0200 @@ -1357,6 +1357,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/96comp.h scummvm-0.5.1/sky/compacts/96comp.h --- scummvm-0.5.1.org/sky/compacts/96comp.h 2004-04-28 18:55:02.383055984 +0200 +++ scummvm-0.5.1/sky/compacts/96comp.h 2004-04-28 19:12:09.291942104 +0200 @@ -924,6 +924,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/9compact.h scummvm-0.5.1/sky/compacts/9compact.h --- scummvm-0.5.1.org/sky/compacts/9compact.h 2004-04-28 18:55:02.382056136 +0200 +++ scummvm-0.5.1/sky/compacts/9compact.h 2004-04-28 19:08:06.963781584 +0200 @@ -1689,6 +1689,6 @@ 16191 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/linc_gen.h scummvm-0.5.1/sky/compacts/linc_gen.h --- scummvm-0.5.1.org/sky/compacts/linc_gen.h 2004-04-28 18:55:02.384055832 +0200 +++ scummvm-0.5.1/sky/compacts/linc_gen.h 2004-04-28 19:12:45.527433472 +0200 @@ -571,6 +571,6 @@ uint32 *grid93 = 0; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/lincmenu.h scummvm-0.5.1/sky/compacts/lincmenu.h --- scummvm-0.5.1.org/sky/compacts/lincmenu.h 2004-04-28 18:55:02.389055072 +0200 +++ scummvm-0.5.1/sky/compacts/lincmenu.h 2004-04-28 19:12:52.478376768 +0200 @@ -798,6 +798,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/objects.h scummvm-0.5.1/sky/compacts/objects.h --- scummvm-0.5.1.org/sky/compacts/objects.h 2004-04-28 18:55:02.384055832 +0200 +++ scummvm-0.5.1/sky/compacts/objects.h 2004-04-28 19:12:59.650286472 +0200 @@ -1258,6 +1258,6 @@ 0 }; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/compacts/z_compac.h scummvm-0.5.1/sky/compacts/z_compac.h --- scummvm-0.5.1.org/sky/compacts/z_compac.h 2004-04-28 18:55:02.387055376 +0200 +++ scummvm-0.5.1/sky/compacts/z_compac.h 2004-04-28 19:13:17.794528128 +0200 @@ -5969,6 +5969,6 @@ uint32 *z_compact_table = (uint32*)data_0; -}; // namespace SkyCompact +} // namespace SkyCompact #endif diff -Naur scummvm-0.5.1.org/sky/debug.cpp scummvm-0.5.1/sky/debug.cpp --- scummvm-0.5.1.org/sky/debug.cpp 2004-04-28 18:55:02.371057808 +0200 +++ scummvm-0.5.1/sky/debug.cpp 2004-04-28 19:14:52.038200912 +0200 @@ -1260,5 +1260,5 @@ void SkyDebug::mcode(uint32 mcode, uint32 a, uint32 b, uint32 c) { debug(6, "MCODE: %s(%d, %d, %d)", mcodes[mcode], a, b, c); -}; +} diff -Naur scummvm-0.5.1.org/sky/logic.cpp scummvm-0.5.1/sky/logic.cpp --- scummvm-0.5.1.org/sky/logic.cpp 2004-04-28 18:55:02.372057656 +0200 +++ scummvm-0.5.1/sky/logic.cpp 2004-04-28 19:15:10.821345440 +0200 @@ -1148,7 +1148,7 @@ 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