diff options
Diffstat (limited to 'engines/sky')
44 files changed, 7 insertions, 140 deletions
diff --git a/engines/sky/autoroute.cpp b/engines/sky/autoroute.cpp index d6974837c6..5273b21807 100644 --- a/engines/sky/autoroute.cpp +++ b/engines/sky/autoroute.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ diff --git a/engines/sky/autoroute.h b/engines/sky/autoroute.h index c40cf647d5..2d01be01ec 100644 --- a/engines/sky/autoroute.h +++ b/engines/sky/autoroute.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_AUTOROUTE_H diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp index 672fb38ca9..66ce92f8fc 100644 --- a/engines/sky/compact.cpp +++ b/engines/sky/compact.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ diff --git a/engines/sky/compact.h b/engines/sky/compact.h index 4861273146..a7b8520539 100644 --- a/engines/sky/compact.h +++ b/engines/sky/compact.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_COMPACT_H diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp index f31f0f6ba9..9efa6ce769 100644 --- a/engines/sky/control.cpp +++ b/engines/sky/control.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ diff --git a/engines/sky/control.h b/engines/sky/control.h index e4428c1876..6aa7a41c62 100644 --- a/engines/sky/control.h +++ b/engines/sky/control.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_CONTROL_H diff --git a/engines/sky/debug.cpp b/engines/sky/debug.cpp index df55966a9a..ebc1ee377d 100644 --- a/engines/sky/debug.cpp +++ b/engines/sky/debug.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ diff --git a/engines/sky/debug.h b/engines/sky/debug.h index ff94cbc8ad..71b2083385 100644 --- a/engines/sky/debug.h +++ b/engines/sky/debug.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_DEBUG_H diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp index 6871fc9604..6844d2eacb 100644 --- a/engines/sky/detection.cpp +++ b/engines/sky/detection.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "sky/control.h" @@ -82,7 +79,7 @@ public: }; const char *SkyMetaEngine::getName() const { - return "Beneath a Steel Sky"; + return "Sky"; } const char *SkyMetaEngine::getOriginalCopyright() const { diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp index 3795c4166d..a06c5c9be8 100644 --- a/engines/sky/disk.cpp +++ b/engines/sky/disk.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ diff --git a/engines/sky/disk.h b/engines/sky/disk.h index 0cdcbb4d0f..320c38eebd 100644 --- a/engines/sky/disk.h +++ b/engines/sky/disk.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_DISK_H diff --git a/engines/sky/grid.cpp b/engines/sky/grid.cpp index e2a96ebf1e..6a9dc502a7 100644 --- a/engines/sky/grid.cpp +++ b/engines/sky/grid.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "sky/compact.h" diff --git a/engines/sky/grid.h b/engines/sky/grid.h index 823462f8dd..6e0e9aabaa 100644 --- a/engines/sky/grid.h +++ b/engines/sky/grid.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_GRID_H diff --git a/engines/sky/hufftext.cpp b/engines/sky/hufftext.cpp index 677ea4817e..0592f094d9 100644 --- a/engines/sky/hufftext.cpp +++ b/engines/sky/hufftext.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "sky/text.h" diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp index 506a6699c1..f1ea4d2df2 100644 --- a/engines/sky/intro.cpp +++ b/engines/sky/intro.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ diff --git a/engines/sky/intro.h b/engines/sky/intro.h index d7a55b95bb..98af6e3664 100644 --- a/engines/sky/intro.h +++ b/engines/sky/intro.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_INTRO_H diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp index f9ebd0fb64..616670b0fd 100644 --- a/engines/sky/logic.cpp +++ b/engines/sky/logic.cpp @@ -18,14 +18,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "common/endian.h" #include "common/rect.h" -#include "common/EventRecorder.h" #include "common/textconsole.h" #include "sky/autoroute.h" @@ -71,8 +67,8 @@ void Logic::setupLogicTable() { _logicTable = logicTable; } -Logic::Logic(SkyCompact *skyCompact, Screen *skyScreen, Disk *skyDisk, Text *skyText, MusicBase *skyMusic, Mouse *skyMouse, Sound *skySound) { - g_eventRec.registerRandomSource(_rnd, "sky"); +Logic::Logic(SkyCompact *skyCompact, Screen *skyScreen, Disk *skyDisk, Text *skyText, MusicBase *skyMusic, Mouse *skyMouse, Sound *skySound) + : _rnd("sky") { _skyCompact = skyCompact; _skyScreen = skyScreen; @@ -1894,7 +1890,7 @@ bool Logic::fnCheckRequest(uint32 a, uint32 b, uint32 c) { } bool Logic::fnStartMenu(uint32 firstObject, uint32 b, uint32 c) { - /// initialise the top menu bar + /// initialize the top menu bar // firstObject is o0 for game menu, k0 for linc uint i; @@ -1943,7 +1939,7 @@ bool Logic::fnStartMenu(uint32 firstObject, uint32 b, uint32 c) { else if (menuLength < _scriptVariables[SCROLL_OFFSET] + 11) _scriptVariables[SCROLL_OFFSET] = menuLength - 11; - // (6) AND FINALLY, INITIALISE THE 11 OBJECTS SO THEY APPEAR ON SCREEEN + // (6) AND FINALLY, INITIALIZE THE 11 OBJECTS SO THEY APPEAR ON SCREEEN uint16 rollingX = TOP_LEFT_X + 28; for (i = 0; i < 11; i++) { diff --git a/engines/sky/logic.h b/engines/sky/logic.h index da1d9ed997..9f8df25870 100644 --- a/engines/sky/logic.h +++ b/engines/sky/logic.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_LOGIC_H diff --git a/engines/sky/mouse.cpp b/engines/sky/mouse.cpp index 611010fa46..98f942889e 100644 --- a/engines/sky/mouse.cpp +++ b/engines/sky/mouse.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ diff --git a/engines/sky/mouse.h b/engines/sky/mouse.h index 6237b9fd29..1ba0167fb5 100644 --- a/engines/sky/mouse.h +++ b/engines/sky/mouse.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_MOUSE_H diff --git a/engines/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp index 9b3c4338ab..896b58aa22 100644 --- a/engines/sky/music/adlibchannel.cpp +++ b/engines/sky/music/adlibchannel.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ diff --git a/engines/sky/music/adlibchannel.h b/engines/sky/music/adlibchannel.h index cbcf722e4e..44ac0d79d0 100644 --- a/engines/sky/music/adlibchannel.h +++ b/engines/sky/music/adlibchannel.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_MUSIC_ADLIBCHANNEL_H diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp index da46964ef9..1b5518fcb1 100644 --- a/engines/sky/music/adlibmusic.cpp +++ b/engines/sky/music/adlibmusic.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ diff --git a/engines/sky/music/adlibmusic.h b/engines/sky/music/adlibmusic.h index 848c8eaf29..2782a07be6 100644 --- a/engines/sky/music/adlibmusic.h +++ b/engines/sky/music/adlibmusic.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_MUSIC_ADLIBMUSIC_H diff --git a/engines/sky/music/gmchannel.cpp b/engines/sky/music/gmchannel.cpp index be0afa8894..215d6490b9 100644 --- a/engines/sky/music/gmchannel.cpp +++ b/engines/sky/music/gmchannel.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "gmchannel.h" diff --git a/engines/sky/music/gmchannel.h b/engines/sky/music/gmchannel.h index e831b03424..f16de401db 100644 --- a/engines/sky/music/gmchannel.h +++ b/engines/sky/music/gmchannel.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_MUSIC_GMCHANNEL_H diff --git a/engines/sky/music/gmmusic.cpp b/engines/sky/music/gmmusic.cpp index 6a8529f287..d0ba1505cb 100644 --- a/engines/sky/music/gmmusic.cpp +++ b/engines/sky/music/gmmusic.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "sky/music/gmmusic.h" diff --git a/engines/sky/music/gmmusic.h b/engines/sky/music/gmmusic.h index baabf2c9ea..0f54a930e4 100644 --- a/engines/sky/music/gmmusic.h +++ b/engines/sky/music/gmmusic.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_MUSIC_GMMUSIC_H diff --git a/engines/sky/music/mt32music.cpp b/engines/sky/music/mt32music.cpp index 4f47e511c7..d068a221b2 100644 --- a/engines/sky/music/mt32music.cpp +++ b/engines/sky/music/mt32music.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "sky/music/mt32music.h" diff --git a/engines/sky/music/mt32music.h b/engines/sky/music/mt32music.h index 0b5573ffff..74962daac3 100644 --- a/engines/sky/music/mt32music.h +++ b/engines/sky/music/mt32music.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_MUSIC_MT32MUSIC_H diff --git a/engines/sky/music/musicbase.cpp b/engines/sky/music/musicbase.cpp index 748637f9d0..60d0f352e7 100644 --- a/engines/sky/music/musicbase.cpp +++ b/engines/sky/music/musicbase.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "sky/music/musicbase.h" diff --git a/engines/sky/music/musicbase.h b/engines/sky/music/musicbase.h index 1ad78b2cf7..c175876380 100644 --- a/engines/sky/music/musicbase.h +++ b/engines/sky/music/musicbase.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_MUSIC_MUSICBASE_H diff --git a/engines/sky/rnc_deco.cpp b/engines/sky/rnc_deco.cpp index eb8307764d..27fae03514 100644 --- a/engines/sky/rnc_deco.cpp +++ b/engines/sky/rnc_deco.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ diff --git a/engines/sky/rnc_deco.h b/engines/sky/rnc_deco.h index 38429383a3..96a75a9750 100644 --- a/engines/sky/rnc_deco.h +++ b/engines/sky/rnc_deco.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_RNC_DECO_H diff --git a/engines/sky/screen.cpp b/engines/sky/screen.cpp index a209571b37..2797ed2fea 100644 --- a/engines/sky/screen.cpp +++ b/engines/sky/screen.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ diff --git a/engines/sky/screen.h b/engines/sky/screen.h index 5e226c49ed..bf8b69a95a 100644 --- a/engines/sky/screen.h +++ b/engines/sky/screen.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_SCREEN_H diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index f10ec1083a..72abc26f32 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "common/config-manager.h" diff --git a/engines/sky/sky.h b/engines/sky/sky.h index 58ac3ed26e..0b5f4c5c1c 100644 --- a/engines/sky/sky.h +++ b/engines/sky/sky.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_H diff --git a/engines/sky/skydefs.h b/engines/sky/skydefs.h index e3f3f3101f..070e185d55 100644 --- a/engines/sky/skydefs.h +++ b/engines/sky/skydefs.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_DEFS_H diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index 7191f6cd00..e94a2a61d9 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ @@ -316,7 +313,7 @@ static const Sfx fx_hello_helga = { } }; -static const Sfx fx_statue_on_armour = { +static const Sfx fx_statue_on_armor = { 8, 0, { @@ -988,7 +985,7 @@ static const Sfx *musicList[] = { &fx_null, // 365 &fx_break_crystals, // 366 &fx_disintegrate, // 367 - &fx_statue_on_armour, // 368 + &fx_statue_on_armor, // 368 &fx_null, // 369 &fx_null, // 360 &fx_ping, // 371 diff --git a/engines/sky/sound.h b/engines/sky/sound.h index ce060ce689..da0d91911b 100644 --- a/engines/sky/sound.h +++ b/engines/sky/sound.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_SOUND_H diff --git a/engines/sky/struc.h b/engines/sky/struc.h index 987f074ed1..c2ebf1bad0 100644 --- a/engines/sky/struc.h +++ b/engines/sky/struc.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_STRUC_H diff --git a/engines/sky/text.cpp b/engines/sky/text.cpp index 2464d93581..3e119b3b20 100644 --- a/engines/sky/text.cpp +++ b/engines/sky/text.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ diff --git a/engines/sky/text.h b/engines/sky/text.h index 06aabf5094..cf0d707ce9 100644 --- a/engines/sky/text.h +++ b/engines/sky/text.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKY_TEXT_H |