diff options
| author | David Corrales | 2007-05-31 23:44:43 +0000 |
|---|---|---|
| committer | David Corrales | 2007-05-31 23:44:43 +0000 |
| commit | 0cab5b7791e56b32455748bf20c21f0d6b42f654 (patch) | |
| tree | 9e6580328542f1db230e019ba77e3db1be8fa50b | |
| parent | 6c69d531d262e14fa02b6e1adb42baaa5c74dbe6 (diff) | |
| parent | 22c0403e0dfec16badf156afa842c6c37e850263 (diff) | |
| download | scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.tar.gz scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.tar.bz2 scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.zip | |
Merged the fs branch with trunk. r26949:27031
svn-id: r27032
1287 files changed, 8737 insertions, 4297 deletions
diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 0000000000..f187055994 --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,71 @@ +ScummVM +Copyright (C) 2001-2007 by the following: + +If you have contributed to this project then you deserve to be on this +list. Contact us (see: AUTHORS) and we'll add you. + +Tore Anderson +Torbjorn Andersson +Chris Apers +Ori Avtalion +Nicolas Bacca +Jurgen Braam +Ralph Brorsen +James Brown +Stuart Caie +Jamieson Christian +Marcus Comstedt +Paolo Costabel +Thierry Crozat +Ivan Dubrov +Oystein Eftevaag +Kovacs Endre Janos +David Eriksson +Thomas Fach-Pedersen +Jerome Fisher +Stuart George +Paul Gilbert +Robert Goeffringmann +Jonathan Gray +Benjamin Haisch +Vincent Hamm +Sven Hesse +Jochen Hoenicke +Max Horn +Travis Howell +Janne Huttunen +Felix Jakschitsch +Jeroen Janssen +Willem Jan Palenstijn +Florian Kagerer +Filippos Karapetis +Andreas Karlsson +Oliver Kiehl +Pawel Kolodziejski +Mutwin Kraus +Andrew Kurushin +Claudio Matsuoka +Thomas Mayer +Neil Millstone +Gregory Montoir +Kostas Nakos +Mikesch Nepomuk +Nicolas Noble +Lars Persson +Joost Peters +Tim Phillips +Andreas Roever +Edward Rudd +Eugene Sandulenko +Daniel Schepler +Johannes Schickel +Andre Souza +Won Star +Ludvig Strigeus +David Symonds +Robin Watts +John Willis +Jezar +n0p +peres +Quietust @@ -57,12 +57,15 @@ install: all $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm" $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/doc/scummvm/" $(INSTALL) -c -m 644 "$(srcdir)/AUTHORS" "$(srcdir)/COPYING" "$(srcdir)/NEWS" "$(srcdir)/README" "$(DESTDIR)$(PREFIX)/share/doc/scummvm/" + $(INSTALL) -d "$(DESTDIR)$(DATADIR)/scummvm/" + $(INSTALL) -c -m 644 "$(srcdir)/gui/themes/modern.ini" "$(srcdir)/gui/themes/modern.zip" "$(srcdir)/gui/themes/classic080.ini" "$(DESTDIR)$(DATADIR)/scummvm/" uninstall: rm -f "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" rm -f "$(DESTDIR)$(MANDIR)/man6/scummvm.6" rm -f "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm" rm -rf "$(DESTDIR)$(PREFIX)/share/doc/scummvm/" + rm -rf "$(DESTDIR)$(DATADIR)/scummvm/" scummvmico.o: icons/scummvm.ico $(WINDRES) dists/scummvm.rc scummvmico.o @@ -65,6 +65,10 @@ For a more comprehensive changelog for the latest experimental SVN code, see: - Switched to using a GCC toolchain for building. - Major update to the SDL lib. Better, faster, more compatible :-) + Windows Port: + - The default location of the config file changed, to support multi-user + systems. + PalmOS Port: - Now using PalmOS Porting SDK which enables use of the C standard library @@ -465,7 +469,7 @@ For a more comprehensive changelog for the latest experimental SVN code, see: - Default Makefile now uses configure script - Greatly improved the launcher and options dialogs (work-in-progress) - Many other "under the hood" improvements, like a new config managment - and plugin capabilities + and plugin capabilities Simon: - Added data files decoder for Amiga disk versions @@ -4,8 +4,6 @@ Last updated: $Date$ TODO: Resolve all the TODOs scattered through this file before release. -TODO: Document the mass-add feature of the launcher (shift+"Add Game...") - For more information, compatibility lists, details on donating, the latest release, progress reports and more, please visit the ScummVM home page at: http://www.scummvm.org/ @@ -650,7 +648,11 @@ directory to avoid this issue, are in section 6.0. ScummVM can be launched directly by running the executable. In this case, the built-in launcher will activate. From this, you can add games (click -'Add Game'), or launch games which have already been configured. +'Add Game'), or launch games which have already been configured. Games can +also be added in mass quantities. By pressing shift + 'Add Game' (Note that +the image turns to 'Mass Add'), you can then specify a directory to start in, +and ScummVM will attempt to detect games in all subdirectories of that +directory. ScummVM can also be launched into a game directly using Command Line arguments -- see the next section. @@ -748,10 +750,11 @@ ScummVM includes a language option for Maniac Mansion, Zak McKracken, The Dig, The Curse of Monkey Island, Beneath a Steel Sky, Broken Sword 1 and Simon the Sorcerer 1 and 2. -Note that with the exception of Beneath a Steel Sky, Broken Sword 1, TODO, -using this option does *not* change the language of the game (which usually -is hardcoded), but rather is only used to select the appropriate font (e.g. -for a German version of a game, one containing umlauts). +Note that with the exception of Beneath a Steel Sky, Broken Sword 1, +multilanguage versions of Goblins games and Nippon Safes Inc., using this +option does *not* change the language of the game (which usually is hardcoded), +but rather is only used to select the appropriate font (e.g. for a German +version of a game, one containing umlauts). Maniac Mansion and Zak McKracken en - English (default) @@ -891,11 +894,13 @@ other games. - and + - Text speed, slower/faster F5 - Displays a save/load box Alt-F5 - Displays the original save/load box, if the - game has one. This is not intended for saving - or loading a game, and may even crash ScummVM - in some games, but it is currently the only - way to see your IQ points in Indiana Jones and - the Last Crusade without dying. + game has one. You can save and load games using + using this, however it is not intended for this + purpose, and may even crash ScummVM in some + games. + i - Displays IQ points (Indiana Jones and the Last + Crusade, and Indiana Jones and the Fate of + Atlantis) Space - Pauses Period (.) - Skips current line of text in some games Enter - Simulate left mouse button press @@ -961,6 +966,10 @@ being run faster than their normal speed, as scripts will lose synchronisation. Ctrl-f is not supported by the Broken Sword games. +Note for WinCE users: Due to the limited keyboard input in most devices, a +small subset of these hot keys are supported via key remapping and/or panel +actions. Please consult the README-WinCE.txt file. + 6.0) Savegames: ---- ---------- @@ -1357,10 +1366,29 @@ output frequency is a multiple of the original frequency. ---- ------------------- By default, the configuration file is saved in, and loaded from: - Windows: <windir>\scummvm.ini, - Unix: ~/.scummvmrc - Mac OS X: ~/Library/Preferences/ScummVM Preferences - Others: scummvm.ini in the current directory + Windows Vista: + \Users\username\AppData\Roaming\ScummVM\scummvm.ini, + + Windows 2000/XP: + \Documents and Settings\username\Application Data\ScummVM\scummvm.ini, + + Windows NT4: + <windir>\Profiles\username\Application Data\ScummVM\scummvm.ini, + + Windows 95/98/ME: + <windir>\scummvm.ini, + + If an earlier version of ScummVM was installed under Windows, the + previous default location of '<windir>\scummvm.ini' will be kept. + + Unix: + ~/.scummvmrc + + Mac OS X: + ~/Library/Preferences/ScummVM Preferences + + Others: + scummvm.ini in the current directory An example config file looks as follows: diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index 8066ea5a38..18b72399d2 100644 --- a/backends/events/default/default-events.cpp +++ b/backends/events/default/default-events.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/events/default/default-events.h b/backends/events/default/default-events.h index be644cfdc8..6e8ce6b77c 100644 --- a/backends/events/default/default-events.h +++ b/backends/events/default/default-events.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/fs/abstract-fs.h b/backends/fs/abstract-fs.h index 8297bf69e2..19d8aaa37d 100644 --- a/backends/fs/abstract-fs.h +++ b/backends/fs/abstract-fs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/fs/amigaos4/amigaos4-fs-factory.cpp b/backends/fs/amigaos4/amigaos4-fs-factory.cpp index 9fe081e7e5..becbd49003 100644 --- a/backends/fs/amigaos4/amigaos4-fs-factory.cpp +++ b/backends/fs/amigaos4/amigaos4-fs-factory.cpp @@ -1,6 +1,8 @@ #include "backends/fs/amigaos4/amigaos4-fs-factory.h" #include "backends/fs/amigaos4/amigaos4-fs.cpp" +DECLARE_SINGLETON(AmigaOSFilesystemFactory); + AbstractFilesystemNode *AmigaOSFilesystemFactory::makeRootFileNode() const { return new AmigaOSFilesystemNode(); } diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp index 8768519a76..d28604ab18 100644 --- a/backends/fs/amigaos4/amigaos4-fs.cpp +++ b/backends/fs/amigaos4/amigaos4-fs.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project, contribution by Hans-J�rg Frieden and Juha Niemim�ki +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/fs/dc/dc-fs.cpp b/backends/fs/dc/dc-fs.cpp index bdaaeaf611..1b2d123c24 100644 --- a/backends/fs/dc/dc-fs.cpp +++ b/backends/fs/dc/dc-fs.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/fs/dc/ronincd-fs-factory.cpp b/backends/fs/dc/ronincd-fs-factory.cpp index 43fbdd1e39..0229a44c45 100644 --- a/backends/fs/dc/ronincd-fs-factory.cpp +++ b/backends/fs/dc/ronincd-fs-factory.cpp @@ -1,6 +1,8 @@ #include "backends/fs/dc/ronincd-fs-factory.h" #include "backends/fs/dc/dc-fs.cpp" +DECLARE_SINGLETON(RoninCDFilesystemFactory); + AbstractFilesystemNode *RoninCDFilesystemFactory::makeRootFileNode() const { return new RoninCDFilesystemNode(); } diff --git a/backends/fs/ds/ds-fs-factory.cpp b/backends/fs/ds/ds-fs-factory.cpp index 830d4d2359..7e64b37411 100644 --- a/backends/fs/ds/ds-fs-factory.cpp +++ b/backends/fs/ds/ds-fs-factory.cpp @@ -2,6 +2,8 @@ #include "backends/fs/ds/ds-fs.cpp" #include "dsmain.h" //for the isGBAMPAvailable() function +DECLARE_SINGLETON(DSFilesystemFactory); + AbstractFilesystemNode *DSFilesystemFactory::makeRootFileNode() const { if (DS::isGBAMPAvailable()) { return new DS::GBAMPFileSystemNode(); diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp index 572f796f76..c0138459a9 100644 --- a/backends/fs/ds/ds-fs.cpp +++ b/backends/fs/ds/ds-fs.cpp @@ -1,5 +1,8 @@ -/* ScummVMDS - Scumm Interpreter DS Port - * Copyright (C) 2002-2004 The ScummVM project and Neil Millstone +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/fs/ds/ds-fs.h b/backends/fs/ds/ds-fs.h index 8b5cc5bdd0..eeee18f322 100644 --- a/backends/fs/ds/ds-fs.h +++ b/backends/fs/ds/ds-fs.h @@ -1,5 +1,8 @@ -/* ScummVMDS - Scumm Interpreter DS Port - * Copyright (C) 2002-2004 The ScummVM project and Neil Millstone +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/fs/gp32/gp32-fs-factory.cpp b/backends/fs/gp32/gp32-fs-factory.cpp index 6c8e940ce1..6328836c0e 100644 --- a/backends/fs/gp32/gp32-fs-factory.cpp +++ b/backends/fs/gp32/gp32-fs-factory.cpp @@ -1,6 +1,8 @@ #include "backends/fs/gp32/gp32-fs-factory.h" #include "backends/fs/gp32/gp32-fs.cpp" +DECLARE_SINGLETON(GP32FilesystemFactory); + AbstractFilesystemNode *GP32FilesystemFactory::makeRootFileNode() const { return new GP32FilesystemNode(); } diff --git a/backends/fs/gp32/gp32-fs.cpp b/backends/fs/gp32/gp32-fs.cpp index 4fe6cfabde..ad92365a83 100644 --- a/backends/fs/gp32/gp32-fs.cpp +++ b/backends/fs/gp32/gp32-fs.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003-2004 DJWillis - GP32 Backend - * Copyright (C) 2005-2006 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/fs/morphos/abox-fs-factory.cpp b/backends/fs/morphos/abox-fs-factory.cpp index cfa165a861..9de810c361 100644 --- a/backends/fs/morphos/abox-fs-factory.cpp +++ b/backends/fs/morphos/abox-fs-factory.cpp @@ -1,6 +1,8 @@ #include "backends/fs/morphos/abox-fs-factory.h" #include "backends/fs/morphos/abox-fs.cpp" +DECLARE_SINGLETON(ABoxFilesystemFactory); + AbstractFilesystemNode *ABoxFilesystemFactory::makeRootFileNode() const { return new ABoxFilesystemNode(); } diff --git a/backends/fs/morphos/abox-fs.cpp b/backends/fs/morphos/abox-fs.cpp index d4cc303219..2480354414 100644 --- a/backends/fs/morphos/abox-fs.cpp +++ b/backends/fs/morphos/abox-fs.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/fs/palmos/palmos-fs-factory.cpp b/backends/fs/palmos/palmos-fs-factory.cpp index c54f2dd655..1b0db0f042 100644 --- a/backends/fs/palmos/palmos-fs-factory.cpp +++ b/backends/fs/palmos/palmos-fs-factory.cpp @@ -1,6 +1,8 @@ #include "backends/fs/palmos/palmos-fs-factory.h" #include "backends/fs/palmos/palmos-fs.cpp" +DECLARE_SINGLETON(PalmOSFilesystemFactory); + AbstractFilesystemNode *PalmOSFilesystemFactory::makeRootFileNode() const { return new PalmOSFilesystemNode(); } diff --git a/backends/fs/palmos/palmos-fs.cpp b/backends/fs/palmos/palmos-fs.cpp index af09d79a12..7abc28bf33 100644 --- a/backends/fs/palmos/palmos-fs.cpp +++ b/backends/fs/palmos/palmos-fs.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM Team +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/fs/posix/posix-fs-factory.cpp b/backends/fs/posix/posix-fs-factory.cpp index 2ec3c84ec4..bed3dc5f8f 100644 --- a/backends/fs/posix/posix-fs-factory.cpp +++ b/backends/fs/posix/posix-fs-factory.cpp @@ -1,6 +1,8 @@ #include "backends/fs/posix/posix-fs-factory.h" #include "backends/fs/posix/posix-fs.cpp" +DECLARE_SINGLETON(POSIXFilesystemFactory); + AbstractFilesystemNode *POSIXFilesystemFactory::makeRootFileNode() const { return new POSIXFilesystemNode(); } diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp index 4ab0c4f207..966bfe34e6 100644 --- a/backends/fs/posix/posix-fs.cpp +++ b/backends/fs/posix/posix-fs.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/fs/ps2/ps2-fs-factory.cpp b/backends/fs/ps2/ps2-fs-factory.cpp index 8278d103af..5f10974501 100644 --- a/backends/fs/ps2/ps2-fs-factory.cpp +++ b/backends/fs/ps2/ps2-fs-factory.cpp @@ -1,6 +1,8 @@ #include "backends/fs/ps2/ps2-fs-factory.h" #include "backends/fs/ps2/ps2-fs.cpp" +DECLARE_SINGLETON(Ps2FilesystemFactory); + AbstractFilesystemNode *Ps2FilesystemFactory::makeRootFileNode() const { return new Ps2FilesystemNode(); } diff --git a/backends/fs/ps2/ps2-fs.cpp b/backends/fs/ps2/ps2-fs.cpp index 0661175c57..237f8a9efe 100644 --- a/backends/fs/ps2/ps2-fs.cpp +++ b/backends/fs/ps2/ps2-fs.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/fs/psp/psp-fs-factory.cpp b/backends/fs/psp/psp-fs-factory.cpp index 58b0877f8f..6fc829baf1 100644 --- a/backends/fs/psp/psp-fs-factory.cpp +++ b/backends/fs/psp/psp-fs-factory.cpp @@ -1,6 +1,8 @@ #include "backends/fs/psp/psp-fs-factory.h" #include "backends/fs/psp/psp_fs.cpp" +DECLARE_SINGLETON(PSPFilesystemFactory); + AbstractFilesystemNode *PSPFilesystemFactory::makeRootFileNode() const { return new PSPFilesystemNode(); } diff --git a/backends/fs/psp/psp_fs.cpp b/backends/fs/psp/psp_fs.cpp index a695eb66dc..079df64dcb 100644 --- a/backends/fs/psp/psp_fs.cpp +++ b/backends/fs/psp/psp_fs.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project - * Copyright (C) 2005 Joost Peters PSP Backend - * Copyright (C) 2005 Thomas Mayer PSP Backend - * Copyright (C) 2005 Paolo Costabel PSP Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/fs/symbian/symbian-fs-factory.cpp b/backends/fs/symbian/symbian-fs-factory.cpp index b715d0e3ad..87b1f0f05d 100644 --- a/backends/fs/symbian/symbian-fs-factory.cpp +++ b/backends/fs/symbian/symbian-fs-factory.cpp @@ -1,6 +1,8 @@ #include "backends/fs/symbian/symbian-fs-factory.h" #include "backends/fs/symbian/symbian-fs.cpp" +DECLARE_SINGLETON(SymbianFilesystemFactory); + AbstractFilesystemNode *SymbianFilesystemFactory::makeRootFileNode() const { return new SymbianFilesystemNode(true); } diff --git a/backends/fs/symbian/symbian-fs.cpp b/backends/fs/symbian/symbian-fs.cpp index e243872c8d..a235933947 100644 --- a/backends/fs/symbian/symbian-fs.cpp +++ b/backends/fs/symbian/symbian-fs.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL - * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System - * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/fs/windows/windows-fs-factory.cpp b/backends/fs/windows/windows-fs-factory.cpp index 6025264209..76b62e5deb 100644 --- a/backends/fs/windows/windows-fs-factory.cpp +++ b/backends/fs/windows/windows-fs-factory.cpp @@ -1,6 +1,8 @@ #include "backends/fs/windows/windows-fs-factory.h" #include "backends/fs/windows/windows-fs.cpp" +DECLARE_SINGLETON(WindowsFilesystemFactory); + AbstractFilesystemNode *WindowsFilesystemFactory::makeRootFileNode() const { return new WindowsFilesystemNode(); } diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp index af19384e39..88d04e1643 100644 --- a/backends/fs/windows/windows-fs.cpp +++ b/backends/fs/windows/windows-fs.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/intern.h b/backends/intern.h index 8a20e45702..5f997df5a0 100644 --- a/backends/intern.h +++ b/backends/intern.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp index 1a4049faa3..b077f333f1 100644 --- a/backends/midi/alsa.cpp +++ b/backends/midi/alsa.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp index e058e96f6f..e14ab24e79 100644 --- a/backends/midi/coreaudio.cpp +++ b/backends/midi/coreaudio.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp index 0aac75e2c2..aa8790a83e 100644 --- a/backends/midi/coremidi.cpp +++ b/backends/midi/coremidi.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/midi/morphos.cpp b/backends/midi/morphos.cpp index 9a0d20a762..530967c331 100644 --- a/backends/midi/morphos.cpp +++ b/backends/midi/morphos.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM Team +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/midi/quicktime.cpp b/backends/midi/quicktime.cpp index b7e973dd0b..2abbad757a 100644 --- a/backends/midi/quicktime.cpp +++ b/backends/midi/quicktime.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp index 9dae348dad..cb5aafd170 100644 --- a/backends/midi/seq.cpp +++ b/backends/midi/seq.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp index 3aed1a8b37..5f53c59173 100644 --- a/backends/midi/windows.cpp +++ b/backends/midi/windows.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/midi/ypa1.cpp b/backends/midi/ypa1.cpp index d23818cd97..da84211753 100644 --- a/backends/midi/ypa1.cpp +++ b/backends/midi/ypa1.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/midi/zodiac.cpp b/backends/midi/zodiac.cpp index fe6cf0f7e9..349635f8b2 100644 --- a/backends/midi/zodiac.cpp +++ b/backends/midi/zodiac.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/args.h b/backends/platform/PalmOS/Src/args.h index f8b5cb9aa0..fa988fe35f 100644 --- a/backends/platform/PalmOS/Src/args.h +++ b/backends/platform/PalmOS/Src/args.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/base_event.cpp b/backends/platform/PalmOS/Src/base_event.cpp index 1f7d07f4ae..d28fd913c0 100644 --- a/backends/platform/PalmOS/Src/base_event.cpp +++ b/backends/platform/PalmOS/Src/base_event.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/base_gfx.cpp b/backends/platform/PalmOS/Src/base_gfx.cpp index f9d3db5d4a..d45ade4e73 100644 --- a/backends/platform/PalmOS/Src/base_gfx.cpp +++ b/backends/platform/PalmOS/Src/base_gfx.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/base_mouse.cpp b/backends/platform/PalmOS/Src/base_mouse.cpp index 99b89b7f8c..7af080e09d 100644 --- a/backends/platform/PalmOS/Src/base_mouse.cpp +++ b/backends/platform/PalmOS/Src/base_mouse.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/be_68k.cpp b/backends/platform/PalmOS/Src/be_68k.cpp index 102f8da397..77b1e22615 100644 --- a/backends/platform/PalmOS/Src/be_68k.cpp +++ b/backends/platform/PalmOS/Src/be_68k.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2005 The ScummVM project - * Copyright (C) 2002-2005 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/be_68k.h b/backends/platform/PalmOS/Src/be_68k.h index 102f8da397..77b1e22615 100644 --- a/backends/platform/PalmOS/Src/be_68k.h +++ b/backends/platform/PalmOS/Src/be_68k.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2005 The ScummVM project - * Copyright (C) 2002-2005 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/be_base.cpp b/backends/platform/PalmOS/Src/be_base.cpp index 705a2597fd..e85ba03ef1 100644 --- a/backends/platform/PalmOS/Src/be_base.cpp +++ b/backends/platform/PalmOS/Src/be_base.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2007 The ScummVM project - * Copyright (C) 2002-2007 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/be_base.h b/backends/platform/PalmOS/Src/be_base.h index 65ed93d9a5..a5891b99c8 100644 --- a/backends/platform/PalmOS/Src/be_base.h +++ b/backends/platform/PalmOS/Src/be_base.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/be_os5.cpp b/backends/platform/PalmOS/Src/be_os5.cpp index d3e1d3578f..f5744d6d0e 100644 --- a/backends/platform/PalmOS/Src/be_os5.cpp +++ b/backends/platform/PalmOS/Src/be_os5.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/be_os5.h b/backends/platform/PalmOS/Src/be_os5.h index b4b68bc920..fc5f9e667f 100644 --- a/backends/platform/PalmOS/Src/be_os5.h +++ b/backends/platform/PalmOS/Src/be_os5.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/be_os5ex.cpp b/backends/platform/PalmOS/Src/be_os5ex.cpp index c498568ab3..1a5ea2bf78 100644 --- a/backends/platform/PalmOS/Src/be_os5ex.cpp +++ b/backends/platform/PalmOS/Src/be_os5ex.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/be_os5ex.h b/backends/platform/PalmOS/Src/be_os5ex.h index 7d8cf4b607..f9842d82ac 100644 --- a/backends/platform/PalmOS/Src/be_os5ex.h +++ b/backends/platform/PalmOS/Src/be_os5ex.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/be_save.cpp b/backends/platform/PalmOS/Src/be_save.cpp index dcad1c7a6c..81817b77c2 100644 --- a/backends/platform/PalmOS/Src/be_save.cpp +++ b/backends/platform/PalmOS/Src/be_save.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/be_save.h b/backends/platform/PalmOS/Src/be_save.h index 8a11389e8b..56b1b5e7a0 100755 --- a/backends/platform/PalmOS/Src/be_save.h +++ b/backends/platform/PalmOS/Src/be_save.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/be_zodiac.cpp b/backends/platform/PalmOS/Src/be_zodiac.cpp index 76e3ed8562..1990d3ddaa 100644 --- a/backends/platform/PalmOS/Src/be_zodiac.cpp +++ b/backends/platform/PalmOS/Src/be_zodiac.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/be_zodiac.h b/backends/platform/PalmOS/Src/be_zodiac.h index c93004c89a..1adb06d049 100644 --- a/backends/platform/PalmOS/Src/be_zodiac.h +++ b/backends/platform/PalmOS/Src/be_zodiac.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/cd_aeroplayer.cpp b/backends/platform/PalmOS/Src/cd_aeroplayer.cpp index d70bf572c9..7e9ae5d1bd 100644 --- a/backends/platform/PalmOS/Src/cd_aeroplayer.cpp +++ b/backends/platform/PalmOS/Src/cd_aeroplayer.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/cd_aeroplayer.h b/backends/platform/PalmOS/Src/cd_aeroplayer.h index 1ea48a4c9b..2f39d45a6d 100644 --- a/backends/platform/PalmOS/Src/cd_aeroplayer.h +++ b/backends/platform/PalmOS/Src/cd_aeroplayer.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/cd_default.cpp b/backends/platform/PalmOS/Src/cd_default.cpp index 4862600b0c..e103df6931 100644 --- a/backends/platform/PalmOS/Src/cd_default.cpp +++ b/backends/platform/PalmOS/Src/cd_default.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/cd_default.h b/backends/platform/PalmOS/Src/cd_default.h index 9dac0d7c16..491937f38d 100644 --- a/backends/platform/PalmOS/Src/cd_default.h +++ b/backends/platform/PalmOS/Src/cd_default.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/cd_msa.cpp b/backends/platform/PalmOS/Src/cd_msa.cpp index 553551ce7f..5fb1a0c12f 100644 --- a/backends/platform/PalmOS/Src/cd_msa.cpp +++ b/backends/platform/PalmOS/Src/cd_msa.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/cd_msa.h b/backends/platform/PalmOS/Src/cd_msa.h index 44dbc6672b..8844e5b8c6 100644 --- a/backends/platform/PalmOS/Src/cd_msa.h +++ b/backends/platform/PalmOS/Src/cd_msa.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/cd_pockettunes.cpp b/backends/platform/PalmOS/Src/cd_pockettunes.cpp index 75574b9802..66483a6e87 100644 --- a/backends/platform/PalmOS/Src/cd_pockettunes.cpp +++ b/backends/platform/PalmOS/Src/cd_pockettunes.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/cd_pockettunes.h b/backends/platform/PalmOS/Src/cd_pockettunes.h index 81493d87ad..4decca44a8 100644 --- a/backends/platform/PalmOS/Src/cd_pockettunes.h +++ b/backends/platform/PalmOS/Src/cd_pockettunes.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/cdaudio.h b/backends/platform/PalmOS/Src/cdaudio.h index 206f6087c5..2c32c669e6 100644 --- a/backends/platform/PalmOS/Src/cdaudio.h +++ b/backends/platform/PalmOS/Src/cdaudio.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/extend.cpp b/backends/platform/PalmOS/Src/extend.cpp index 0d7f19d582..3223d86362 100644 --- a/backends/platform/PalmOS/Src/extend.cpp +++ b/backends/platform/PalmOS/Src/extend.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/globals.h b/backends/platform/PalmOS/Src/globals.h index 07034aeb02..e02f77cf28 100644 --- a/backends/platform/PalmOS/Src/globals.h +++ b/backends/platform/PalmOS/Src/globals.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/init_palmos.cpp b/backends/platform/PalmOS/Src/init_palmos.cpp index d789580e7a..7cee8f2935 100644 --- a/backends/platform/PalmOS/Src/init_palmos.cpp +++ b/backends/platform/PalmOS/Src/init_palmos.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/init_palmos.h b/backends/platform/PalmOS/Src/init_palmos.h index a979f02cd3..34b8ca1451 100644 --- a/backends/platform/PalmOS/Src/init_palmos.h +++ b/backends/platform/PalmOS/Src/init_palmos.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/init_sony.cpp b/backends/platform/PalmOS/Src/init_sony.cpp index 3ba4e8b8d0..8840f1a073 100644 --- a/backends/platform/PalmOS/Src/init_sony.cpp +++ b/backends/platform/PalmOS/Src/init_sony.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/init_sony.h b/backends/platform/PalmOS/Src/init_sony.h index ed783cc9ff..0316a012d7 100644 --- a/backends/platform/PalmOS/Src/init_sony.h +++ b/backends/platform/PalmOS/Src/init_sony.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/app.cpp b/backends/platform/PalmOS/Src/launcher/app.cpp index 3f57f77125..211cbf623d 100644 --- a/backends/platform/PalmOS/Src/launcher/app.cpp +++ b/backends/platform/PalmOS/Src/launcher/app.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2007 The ScummVM project - * Copyright (C) 2002-2007 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp b/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp index 15772c6aab..7a6e35b1f9 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/forms/formCards.h b/backends/platform/PalmOS/Src/launcher/forms/formCards.h index 956ef86340..766c4793b9 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formCards.h +++ b/backends/platform/PalmOS/Src/launcher/forms/formCards.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp b/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp index 42953ad15e..ceb4886dcf 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/forms/formEditGame.h b/backends/platform/PalmOS/Src/launcher/forms/formEditGame.h index 2e76e7ebb5..90d271e115 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formEditGame.h +++ b/backends/platform/PalmOS/Src/launcher/forms/formEditGame.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp b/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp index 28ff9c6747..509adfa735 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp b/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp index 179723f18a..5f61c85cae 100755 --- a/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2007 The ScummVM project - * Copyright (C) 2002-2007 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp $ + * $Id:formSelect.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp index bd3263350d..78b9ac3256 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp b/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp index 9b4b5355a7..8413216bb1 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/games.cpp b/backends/platform/PalmOS/Src/launcher/games.cpp index c9fd0a661b..2300a36f09 100644 --- a/backends/platform/PalmOS/Src/launcher/games.cpp +++ b/backends/platform/PalmOS/Src/launcher/games.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/games.h b/backends/platform/PalmOS/Src/launcher/games.h index 235aca38de..c277bec4cc 100644 --- a/backends/platform/PalmOS/Src/launcher/games.h +++ b/backends/platform/PalmOS/Src/launcher/games.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/launch.cpp b/backends/platform/PalmOS/Src/launcher/launch.cpp index 8e5de05c8d..7bc07c4fdf 100644 --- a/backends/platform/PalmOS/Src/launcher/launch.cpp +++ b/backends/platform/PalmOS/Src/launcher/launch.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/skin.cpp b/backends/platform/PalmOS/Src/launcher/skin.cpp index f38fe88d46..ae042bcb39 100644 --- a/backends/platform/PalmOS/Src/launcher/skin.cpp +++ b/backends/platform/PalmOS/Src/launcher/skin.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/skin.h b/backends/platform/PalmOS/Src/launcher/skin.h index 2047532fd8..e8a81e7e2d 100644 --- a/backends/platform/PalmOS/Src/launcher/skin.h +++ b/backends/platform/PalmOS/Src/launcher/skin.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/start.cpp b/backends/platform/PalmOS/Src/launcher/start.cpp index e68228cc77..f492655cf8 100644 --- a/backends/platform/PalmOS/Src/launcher/start.cpp +++ b/backends/platform/PalmOS/Src/launcher/start.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/launcher/start.h b/backends/platform/PalmOS/Src/launcher/start.h index acf9081a83..bccbc53f86 100644 --- a/backends/platform/PalmOS/Src/launcher/start.h +++ b/backends/platform/PalmOS/Src/launcher/start.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/native/oscalls.cpp b/backends/platform/PalmOS/Src/native/oscalls.cpp index 403eec40ab..f15a1ef781 100644 --- a/backends/platform/PalmOS/Src/native/oscalls.cpp +++ b/backends/platform/PalmOS/Src/native/oscalls.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/native/oscalls.h b/backends/platform/PalmOS/Src/native/oscalls.h index 0fb030b64a..cc35eeaf28 100644 --- a/backends/platform/PalmOS/Src/native/oscalls.h +++ b/backends/platform/PalmOS/Src/native/oscalls.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/native/pace.h b/backends/platform/PalmOS/Src/native/pace.h index a617e8a274..dac855c3ba 100644 --- a/backends/platform/PalmOS/Src/native/pace.h +++ b/backends/platform/PalmOS/Src/native/pace.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/native/pnoARM.c b/backends/platform/PalmOS/Src/native/pnoARM.c index e80e651462..48c4fee972 100644 --- a/backends/platform/PalmOS/Src/native/pnoARM.c +++ b/backends/platform/PalmOS/Src/native/pnoARM.c @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/native/pnoStartup.c b/backends/platform/PalmOS/Src/native/pnoStartup.c index dcfb56d002..b76cac3024 100644 --- a/backends/platform/PalmOS/Src/native/pnoStartup.c +++ b/backends/platform/PalmOS/Src/native/pnoStartup.c @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/native/zodiacARM.cpp b/backends/platform/PalmOS/Src/native/zodiacARM.cpp index d98ed9bed9..ad2f94605f 100644 --- a/backends/platform/PalmOS/Src/native/zodiacARM.cpp +++ b/backends/platform/PalmOS/Src/native/zodiacARM.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/native/zodiacStartup.cpp b/backends/platform/PalmOS/Src/native/zodiacStartup.cpp index 5e018286b7..7f6264c1ac 100644 --- a/backends/platform/PalmOS/Src/native/zodiacStartup.cpp +++ b/backends/platform/PalmOS/Src/native/zodiacStartup.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/os5_event.cpp b/backends/platform/PalmOS/Src/os5_event.cpp index 85a3b49426..534c2eb4f9 100644 --- a/backends/platform/PalmOS/Src/os5_event.cpp +++ b/backends/platform/PalmOS/Src/os5_event.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/os5_gfx.cpp b/backends/platform/PalmOS/Src/os5_gfx.cpp index c68e5ea8c7..247acf6f46 100644 --- a/backends/platform/PalmOS/Src/os5_gfx.cpp +++ b/backends/platform/PalmOS/Src/os5_gfx.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/os5_mouse.cpp b/backends/platform/PalmOS/Src/os5_mouse.cpp index a0b372bfad..fa6a14c5a0 100644 --- a/backends/platform/PalmOS/Src/os5_mouse.cpp +++ b/backends/platform/PalmOS/Src/os5_mouse.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/os5_overlay.cpp b/backends/platform/PalmOS/Src/os5_overlay.cpp index 0eee6d167b..b5225cf573 100644 --- a/backends/platform/PalmOS/Src/os5_overlay.cpp +++ b/backends/platform/PalmOS/Src/os5_overlay.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/os5_renderer.cpp b/backends/platform/PalmOS/Src/os5_renderer.cpp index 066e0f1523..fdae35acd5 100644 --- a/backends/platform/PalmOS/Src/os5_renderer.cpp +++ b/backends/platform/PalmOS/Src/os5_renderer.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/os5_sound.cpp b/backends/platform/PalmOS/Src/os5_sound.cpp index 7af173036f..c0421b5541 100644 --- a/backends/platform/PalmOS/Src/os5_sound.cpp +++ b/backends/platform/PalmOS/Src/os5_sound.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/os5ex_sound.cpp b/backends/platform/PalmOS/Src/os5ex_sound.cpp index 797f5d5e24..77569e2548 100644 --- a/backends/platform/PalmOS/Src/os5ex_sound.cpp +++ b/backends/platform/PalmOS/Src/os5ex_sound.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/prefixes/compile.h b/backends/platform/PalmOS/Src/prefixes/compile.h index f8c5ca1cbf..28c6cc519f 100644 --- a/backends/platform/PalmOS/Src/prefixes/compile.h +++ b/backends/platform/PalmOS/Src/prefixes/compile.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/rumble.cpp b/backends/platform/PalmOS/Src/rumble.cpp index e868f25a04..6546aa9e90 100644 --- a/backends/platform/PalmOS/Src/rumble.cpp +++ b/backends/platform/PalmOS/Src/rumble.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/rumble.h b/backends/platform/PalmOS/Src/rumble.h index d9e8e5b951..b95fa5f666 100644 --- a/backends/platform/PalmOS/Src/rumble.h +++ b/backends/platform/PalmOS/Src/rumble.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/scumm_globals.cpp b/backends/platform/PalmOS/Src/scumm_globals.cpp index b394fb0e86..9dd706ec58 100644 --- a/backends/platform/PalmOS/Src/scumm_globals.cpp +++ b/backends/platform/PalmOS/Src/scumm_globals.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/scumm_globals.h b/backends/platform/PalmOS/Src/scumm_globals.h index 0051e4dddf..f1837e54d1 100644 --- a/backends/platform/PalmOS/Src/scumm_globals.h +++ b/backends/platform/PalmOS/Src/scumm_globals.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/zodiac_event.cpp b/backends/platform/PalmOS/Src/zodiac_event.cpp index a0e62bda43..4962ad2b72 100644 --- a/backends/platform/PalmOS/Src/zodiac_event.cpp +++ b/backends/platform/PalmOS/Src/zodiac_event.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2005 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/zodiac_gfx.cpp b/backends/platform/PalmOS/Src/zodiac_gfx.cpp index c84a6af056..23568ba5aa 100644 --- a/backends/platform/PalmOS/Src/zodiac_gfx.cpp +++ b/backends/platform/PalmOS/Src/zodiac_gfx.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/zodiac_mouse.cpp b/backends/platform/PalmOS/Src/zodiac_mouse.cpp index 52e2261e44..80acdae5ea 100644 --- a/backends/platform/PalmOS/Src/zodiac_mouse.cpp +++ b/backends/platform/PalmOS/Src/zodiac_mouse.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/PalmOS/Src/zodiac_overlay.cpp b/backends/platform/PalmOS/Src/zodiac_overlay.cpp index 09385c110a..3340abe582 100644 --- a/backends/platform/PalmOS/Src/zodiac_overlay.cpp +++ b/backends/platform/PalmOS/Src/zodiac_overlay.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/DCLauncherDialog.h b/backends/platform/dc/DCLauncherDialog.h index 7dffcaa576..0ac7971847 100644 --- a/backends/platform/dc/DCLauncherDialog.h +++ b/backends/platform/dc/DCLauncherDialog.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/audio.cpp b/backends/platform/dc/audio.cpp index ce82d36b11..42201d2dd3 100644 --- a/backends/platform/dc/audio.cpp +++ b/backends/platform/dc/audio.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h index 0b723992f3..01e86a561b 100644 --- a/backends/platform/dc/dc.h +++ b/backends/platform/dc/dc.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/dcloader.cpp b/backends/platform/dc/dcloader.cpp index 2ce853c061..7254d48415 100644 --- a/backends/platform/dc/dcloader.cpp +++ b/backends/platform/dc/dcloader.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/dcloader.h b/backends/platform/dc/dcloader.h index 2c7010d7dc..96b54be3a9 100644 --- a/backends/platform/dc/dcloader.h +++ b/backends/platform/dc/dcloader.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp index 96ec3aa6aa..df729f85f8 100644 --- a/backends/platform/dc/dcmain.cpp +++ b/backends/platform/dc/dcmain.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp index 7efe0fde93..73312cafed 100644 --- a/backends/platform/dc/display.cpp +++ b/backends/platform/dc/display.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2005 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/icon.cpp b/backends/platform/dc/icon.cpp index 66d3d6f696..38c68c880c 100644 --- a/backends/platform/dc/icon.cpp +++ b/backends/platform/dc/icon.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/icon.h b/backends/platform/dc/icon.h index 3c38a44d69..eeddd8a069 100644 --- a/backends/platform/dc/icon.h +++ b/backends/platform/dc/icon.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/input.cpp b/backends/platform/dc/input.cpp index 76ef8e175a..7a5e5911d8 100644 --- a/backends/platform/dc/input.cpp +++ b/backends/platform/dc/input.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/label.cpp b/backends/platform/dc/label.cpp index 1603e5c6c9..cba5553dd3 100644 --- a/backends/platform/dc/label.cpp +++ b/backends/platform/dc/label.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/label.h b/backends/platform/dc/label.h index 910d0438af..776a660a84 100644 --- a/backends/platform/dc/label.h +++ b/backends/platform/dc/label.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/portdefs.h b/backends/platform/dc/portdefs.h index 08bc900e6e..eaebc0f7da 100644 --- a/backends/platform/dc/portdefs.h +++ b/backends/platform/dc/portdefs.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/selector.cpp b/backends/platform/dc/selector.cpp index 55918221e7..a4fec642fe 100644 --- a/backends/platform/dc/selector.cpp +++ b/backends/platform/dc/selector.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/softkbd.cpp b/backends/platform/dc/softkbd.cpp index 3a842e8b1b..e8436fc30a 100644 --- a/backends/platform/dc/softkbd.cpp +++ b/backends/platform/dc/softkbd.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/softkbd.h b/backends/platform/dc/softkbd.h index b079ab4011..bedb9baaca 100644 --- a/backends/platform/dc/softkbd.h +++ b/backends/platform/dc/softkbd.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/time.cpp b/backends/platform/dc/time.cpp index c3e664a1e3..06bb931717 100644 --- a/backends/platform/dc/time.cpp +++ b/backends/platform/dc/time.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp index 7ee433d2ba..7b3ca835d2 100644 --- a/backends/platform/dc/vmsave.cpp +++ b/backends/platform/dc/vmsave.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Dreamcast port - * Copyright (C) 2002-2004 Marcus Comstedt +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm7/source/main.cpp b/backends/platform/ds/arm7/source/main.cpp index e3ecd30fe4..f32baa5ab6 100644 --- a/backends/platform/ds/arm7/source/main.cpp +++ b/backends/platform/ds/arm7/source/main.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/blitters.cpp b/backends/platform/ds/arm9/source/blitters.cpp index ec33a5aab4..9af3c5d611 100644 --- a/backends/platform/ds/arm9/source/blitters.cpp +++ b/backends/platform/ds/arm9/source/blitters.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/blitters.h b/backends/platform/ds/arm9/source/blitters.h index a365420182..9fb50cdf0d 100644 --- a/backends/platform/ds/arm9/source/blitters.h +++ b/backends/platform/ds/arm9/source/blitters.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/cdaudio.cpp b/backends/platform/ds/arm9/source/cdaudio.cpp index e5011688b9..3a012fc01a 100644 --- a/backends/platform/ds/arm9/source/cdaudio.cpp +++ b/backends/platform/ds/arm9/source/cdaudio.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/cdaudio.h b/backends/platform/ds/arm9/source/cdaudio.h index 1728c51039..d237569bb7 100644 --- a/backends/platform/ds/arm9/source/cdaudio.h +++ b/backends/platform/ds/arm9/source/cdaudio.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index f4927743cd..153ecfab87 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/dsmain.h b/backends/platform/ds/arm9/source/dsmain.h index 40ac33528b..58a5be9240 100644 --- a/backends/platform/ds/arm9/source/dsmain.h +++ b/backends/platform/ds/arm9/source/dsmain.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/dsoptions.cpp b/backends/platform/ds/arm9/source/dsoptions.cpp index b05f50783e..58df3dc863 100644 --- a/backends/platform/ds/arm9/source/dsoptions.cpp +++ b/backends/platform/ds/arm9/source/dsoptions.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/dsoptions.h b/backends/platform/ds/arm9/source/dsoptions.h index 9acb0d1da0..8dde086f57 100644 --- a/backends/platform/ds/arm9/source/dsoptions.h +++ b/backends/platform/ds/arm9/source/dsoptions.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/gbampsave.cpp b/backends/platform/ds/arm9/source/gbampsave.cpp index 5bf0e4892b..7f7bf958df 100644 --- a/backends/platform/ds/arm9/source/gbampsave.cpp +++ b/backends/platform/ds/arm9/source/gbampsave.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/gbampsave.h b/backends/platform/ds/arm9/source/gbampsave.h index b11e2aa13a..1580533f66 100644 --- a/backends/platform/ds/arm9/source/gbampsave.h +++ b/backends/platform/ds/arm9/source/gbampsave.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp index 36d1e8e032..9ff2c5ba63 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.cpp +++ b/backends/platform/ds/arm9/source/osystem_ds.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h index 583ab9a2ba..b6d6f5b7bc 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.h +++ b/backends/platform/ds/arm9/source/osystem_ds.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/portdefs.cpp b/backends/platform/ds/arm9/source/portdefs.cpp index 6ef1d575f2..28120e07b8 100644 --- a/backends/platform/ds/arm9/source/portdefs.cpp +++ b/backends/platform/ds/arm9/source/portdefs.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/portdefs.h b/backends/platform/ds/arm9/source/portdefs.h index 2266a1d986..91310a1479 100644 --- a/backends/platform/ds/arm9/source/portdefs.h +++ b/backends/platform/ds/arm9/source/portdefs.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/ramsave.cpp b/backends/platform/ds/arm9/source/ramsave.cpp index 0d6f32e4d7..ea4bff9cc3 100644 --- a/backends/platform/ds/arm9/source/ramsave.cpp +++ b/backends/platform/ds/arm9/source/ramsave.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/ramsave.h b/backends/platform/ds/arm9/source/ramsave.h index aaa555208e..69e3c7caa7 100644 --- a/backends/platform/ds/arm9/source/ramsave.h +++ b/backends/platform/ds/arm9/source/ramsave.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/scummhelp.cpp b/backends/platform/ds/arm9/source/scummhelp.cpp index 62f0dad4fd..2bbaac4b07 100644 --- a/backends/platform/ds/arm9/source/scummhelp.cpp +++ b/backends/platform/ds/arm9/source/scummhelp.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/scummhelp.h b/backends/platform/ds/arm9/source/scummhelp.h index 21ad741fb2..54c9558c94 100644 --- a/backends/platform/ds/arm9/source/scummhelp.h +++ b/backends/platform/ds/arm9/source/scummhelp.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/touchkeyboard.cpp b/backends/platform/ds/arm9/source/touchkeyboard.cpp index 6302a959ff..3f1d6f8064 100644 --- a/backends/platform/ds/arm9/source/touchkeyboard.cpp +++ b/backends/platform/ds/arm9/source/touchkeyboard.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/touchkeyboard.h b/backends/platform/ds/arm9/source/touchkeyboard.h index 5831e225b4..53fd25e12a 100644 --- a/backends/platform/ds/arm9/source/touchkeyboard.h +++ b/backends/platform/ds/arm9/source/touchkeyboard.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/zipreader.cpp b/backends/platform/ds/arm9/source/zipreader.cpp index 8cb97b20cf..59f695ebce 100644 --- a/backends/platform/ds/arm9/source/zipreader.cpp +++ b/backends/platform/ds/arm9/source/zipreader.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ds/arm9/source/zipreader.h b/backends/platform/ds/arm9/source/zipreader.h index f144bff064..d4390ab74d 100644 --- a/backends/platform/ds/arm9/source/zipreader.h +++ b/backends/platform/ds/arm9/source/zipreader.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 Neil Millstone - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp2x/events.cpp b/backends/platform/gp2x/events.cpp index 7ef18fca01..80cdad924b 100644 --- a/backends/platform/gp2x/events.cpp +++ b/backends/platform/gp2x/events.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2005-2006 John Willis (Portions of the GP2X Backend) +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp2x/gp2x-common.h b/backends/platform/gp2x/gp2x-common.h index a2c891ef27..4c91a00247 100644 --- a/backends/platform/gp2x/gp2x-common.h +++ b/backends/platform/gp2x/gp2x-common.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2005-2006 John Willis (Portions of the GP2X Backend) +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp2x/gp2x-hw.cpp b/backends/platform/gp2x/gp2x-hw.cpp index 9f573c86e0..d1b6f80a1e 100644 --- a/backends/platform/gp2x/gp2x-hw.cpp +++ b/backends/platform/gp2x/gp2x-hw.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2005-2006 John Willis (Portions of the GP2X Backend) +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp2x/gp2x-hw.h b/backends/platform/gp2x/gp2x-hw.h index 8f769200d5..bb681154d7 100644 --- a/backends/platform/gp2x/gp2x-hw.h +++ b/backends/platform/gp2x/gp2x-hw.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2005-2006 John Willis (Portions of the GP2X Backend) +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp2x/gp2x-mem.c b/backends/platform/gp2x/gp2x-mem.c index fa09c2c4bd..f129deb783 100644 --- a/backends/platform/gp2x/gp2x-mem.c +++ b/backends/platform/gp2x/gp2x-mem.c @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2005-2006 John Willis (Portions of the GP2X Backend) +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp2x/gp2x-mem.h b/backends/platform/gp2x/gp2x-mem.h index a7a5490205..bf2d050623 100644 --- a/backends/platform/gp2x/gp2x-mem.h +++ b/backends/platform/gp2x/gp2x-mem.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2005-2006 John Willis (Portions of the GP2X Backend) +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp2x/gp2x.cpp b/backends/platform/gp2x/gp2x.cpp index a29ae4b8f9..42a9345762 100644 --- a/backends/platform/gp2x/gp2x.cpp +++ b/backends/platform/gp2x/gp2x.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2005-2006 John Willis (Portions of the GP2X Backend) +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp2x/graphics.cpp b/backends/platform/gp2x/graphics.cpp index e327ac85e0..a482689e43 100644 --- a/backends/platform/gp2x/graphics.cpp +++ b/backends/platform/gp2x/graphics.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2005-2006 John Willis (Portions of the GP2X Backend) +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/debug-gdbstub-usb.cpp b/backends/platform/gp32/debug-gdbstub-usb.cpp index 9329c5c601..d18a1990b5 100644 --- a/backends/platform/gp32/debug-gdbstub-usb.cpp +++ b/backends/platform/gp32/debug-gdbstub-usb.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001/2004 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/fontdata.c b/backends/platform/gp32/fontdata.c index f2d833088d..56f778ce2c 100644 --- a/backends/platform/gp32/fontdata.c +++ b/backends/platform/gp32/fontdata.c @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gfx_splash.h b/backends/platform/gp32/gfx_splash.h index c83ecffb0e..6e1081ca6e 100644 --- a/backends/platform/gp32/gfx_splash.h +++ b/backends/platform/gp32/gfx_splash.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/globals.h b/backends/platform/gp32/globals.h index 425e3a2e91..49f11ddb4e 100644 --- a/backends/platform/gp32/globals.h +++ b/backends/platform/gp32/globals.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2006 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32_launcher.cpp b/backends/platform/gp32/gp32_launcher.cpp index 299e1d832a..69c9b00e3e 100644 --- a/backends/platform/gp32/gp32_launcher.cpp +++ b/backends/platform/gp32/gp32_launcher.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32_launcher.h b/backends/platform/gp32/gp32_launcher.h index 94b1f6ce85..d7384e4caa 100644 --- a/backends/platform/gp32/gp32_launcher.h +++ b/backends/platform/gp32/gp32_launcher.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32_main.cpp b/backends/platform/gp32/gp32_main.cpp index 5a6b7a3d22..578ef86e4e 100644 --- a/backends/platform/gp32/gp32_main.cpp +++ b/backends/platform/gp32/gp32_main.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32_osys.cpp b/backends/platform/gp32/gp32_osys.cpp index d1e1e5de70..ab2ac1616b 100644 --- a/backends/platform/gp32/gp32_osys.cpp +++ b/backends/platform/gp32/gp32_osys.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32_osys.h b/backends/platform/gp32/gp32_osys.h index 96d2b0d592..fa8a0903ad 100644 --- a/backends/platform/gp32/gp32_osys.h +++ b/backends/platform/gp32/gp32_osys.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32std.cpp b/backends/platform/gp32/gp32std.cpp index fe4da7911e..7218505436 100644 --- a/backends/platform/gp32/gp32std.cpp +++ b/backends/platform/gp32/gp32std.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32std.h b/backends/platform/gp32/gp32std.h index 0abe4f0b89..746b096d29 100644 --- a/backends/platform/gp32/gp32std.h +++ b/backends/platform/gp32/gp32std.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32std_file.cpp b/backends/platform/gp32/gp32std_file.cpp index 6d2e44aa68..9269d69617 100644 --- a/backends/platform/gp32/gp32std_file.cpp +++ b/backends/platform/gp32/gp32std_file.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32std_file.h b/backends/platform/gp32/gp32std_file.h index 37824682b1..a515a63590 100644 --- a/backends/platform/gp32/gp32std_file.h +++ b/backends/platform/gp32/gp32std_file.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32std_grap.cpp b/backends/platform/gp32/gp32std_grap.cpp index d65b2f872a..275513818d 100644 --- a/backends/platform/gp32/gp32std_grap.cpp +++ b/backends/platform/gp32/gp32std_grap.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32std_grap.h b/backends/platform/gp32/gp32std_grap.h index 91f44c952a..79bc312779 100644 --- a/backends/platform/gp32/gp32std_grap.h +++ b/backends/platform/gp32/gp32std_grap.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32std_input.cpp b/backends/platform/gp32/gp32std_input.cpp index 3d808e987e..b36535dbc6 100644 --- a/backends/platform/gp32/gp32std_input.cpp +++ b/backends/platform/gp32/gp32std_input.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32std_input.h b/backends/platform/gp32/gp32std_input.h index c7ab3e3212..6c765d840f 100644 --- a/backends/platform/gp32/gp32std_input.h +++ b/backends/platform/gp32/gp32std_input.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32std_memory.cpp b/backends/platform/gp32/gp32std_memory.cpp index d51e3e1eea..17569e4917 100644 --- a/backends/platform/gp32/gp32std_memory.cpp +++ b/backends/platform/gp32/gp32std_memory.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005/2006 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32std_memory.h b/backends/platform/gp32/gp32std_memory.h index ea89b6ecb9..6fe5804453 100644 --- a/backends/platform/gp32/gp32std_memory.h +++ b/backends/platform/gp32/gp32std_memory.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32std_sound.cpp b/backends/platform/gp32/gp32std_sound.cpp index 56335f1c4f..70969bc1b7 100644 --- a/backends/platform/gp32/gp32std_sound.cpp +++ b/backends/platform/gp32/gp32std_sound.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp32std_sound.h b/backends/platform/gp32/gp32std_sound.h index bca450620a..ad3f18a17f 100644 --- a/backends/platform/gp32/gp32std_sound.h +++ b/backends/platform/gp32/gp32std_sound.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/gp_clipped.c b/backends/platform/gp32/gp_clipped.c index 5ad94e41d4..5bcb9358d3 100644 --- a/backends/platform/gp32/gp_clipped.c +++ b/backends/platform/gp32/gp_clipped.c @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * GP32 Blitting library - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2003,2004,2005 CARTIER Matthieu - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/portdefs.h b/backends/platform/gp32/portdefs.h index 7269f105e6..e58c634e16 100644 --- a/backends/platform/gp32/portdefs.h +++ b/backends/platform/gp32/portdefs.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/gp32/startup.c b/backends/platform/gp32/startup.c index 6f74241e09..ad1022ca3c 100644 --- a/backends/platform/gp32/startup.c +++ b/backends/platform/gp32/startup.c @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project - * Copyright (C) 2002 Ph0x - GP32 Backend - * Copyright (C) 2003/2004 DJWillis - GP32 Backend - * Copyright (C) 2005 Won Star - GP32 Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/maemo/hildon.cpp b/backends/platform/maemo/hildon.cpp index 1c9bd9162a..cd23617685 100644 --- a/backends/platform/maemo/hildon.cpp +++ b/backends/platform/maemo/hildon.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/maemo/maemo-sdl.cpp b/backends/platform/maemo/maemo-sdl.cpp index 3a41272ada..7d0c218ca8 100644 --- a/backends/platform/maemo/maemo-sdl.cpp +++ b/backends/platform/maemo/maemo-sdl.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/maemo/maemo-sdl.h b/backends/platform/maemo/maemo-sdl.h index e497c2597d..530af27af6 100644 --- a/backends/platform/maemo/maemo-sdl.h +++ b/backends/platform/maemo/maemo-sdl.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/maemo/main.cpp b/backends/platform/maemo/main.cpp index becff29953..40b2efb626 100644 --- a/backends/platform/maemo/main.cpp +++ b/backends/platform/maemo/main.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/maemo/portdefs.h b/backends/platform/maemo/portdefs.h index f825e5c4e2..eec82858c5 100644 --- a/backends/platform/maemo/portdefs.h +++ b/backends/platform/maemo/portdefs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/morphos/morphos.cpp b/backends/platform/morphos/morphos.cpp index 2b92809691..66525a7664 100644 --- a/backends/platform/morphos/morphos.cpp +++ b/backends/platform/morphos/morphos.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002 Rüdiger Hanke +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/morphos/morphos.h b/backends/platform/morphos/morphos.h index 46ed2fdcc0..f409b7f950 100644 --- a/backends/platform/morphos/morphos.h +++ b/backends/platform/morphos/morphos.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002 Rüdiger Hanke (MorphOS port) +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/morphos/morphos_scaler.cpp b/backends/platform/morphos/morphos_scaler.cpp index a5e7519054..2d66dd961b 100644 --- a/backends/platform/morphos/morphos_scaler.cpp +++ b/backends/platform/morphos/morphos_scaler.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM Team +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/morphos/morphos_scaler.h b/backends/platform/morphos/morphos_scaler.h index d794e361a6..aee5d7e575 100644 --- a/backends/platform/morphos/morphos_scaler.h +++ b/backends/platform/morphos/morphos_scaler.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM Team +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/morphos/morphos_sound.cpp b/backends/platform/morphos/morphos_sound.cpp index ce6048b9c3..df166ccde0 100644 --- a/backends/platform/morphos/morphos_sound.cpp +++ b/backends/platform/morphos/morphos_sound.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002 Rüdiger Hanke +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/morphos/morphos_sound.h b/backends/platform/morphos/morphos_sound.h index a2d211a37f..0c5ca7096f 100644 --- a/backends/platform/morphos/morphos_sound.h +++ b/backends/platform/morphos/morphos_sound.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002 Rüdiger Hanke (MorphOS port) +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/morphos/morphos_start.cpp b/backends/platform/morphos/morphos_start.cpp index ac5c16ad85..12dd9a9d0a 100644 --- a/backends/platform/morphos/morphos_start.cpp +++ b/backends/platform/morphos/morphos_start.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002 Rüdiger Hanke (MorphOS port) +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/morphos/morphos_timer.cpp b/backends/platform/morphos/morphos_timer.cpp index ec2c647d80..89391f940e 100644 --- a/backends/platform/morphos/morphos_timer.cpp +++ b/backends/platform/morphos/morphos_timer.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM Team +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/morphos/morphos_timer.h b/backends/platform/morphos/morphos_timer.h index 1ab3259b39..0eadf8a2de 100644 --- a/backends/platform/morphos/morphos_timer.h +++ b/backends/platform/morphos/morphos_timer.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM Team +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp index cfccdb0531..963b3429f5 100644 --- a/backends/platform/null/null.cpp +++ b/backends/platform/null/null.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/DmaPipe.cpp b/backends/platform/ps2/DmaPipe.cpp index 7f3a372234..2b50d10d1f 100644 --- a/backends/platform/ps2/DmaPipe.cpp +++ b/backends/platform/ps2/DmaPipe.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/DmaPipe.h b/backends/platform/ps2/DmaPipe.h index 01ed03d968..6c770c03b0 100644 --- a/backends/platform/ps2/DmaPipe.h +++ b/backends/platform/ps2/DmaPipe.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/Gs2dScreen.cpp b/backends/platform/ps2/Gs2dScreen.cpp index 7cf82ae5a0..4829027f15 100644 --- a/backends/platform/ps2/Gs2dScreen.cpp +++ b/backends/platform/ps2/Gs2dScreen.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/Gs2dScreen.h b/backends/platform/ps2/Gs2dScreen.h index d74eed198b..353e577980 100644 --- a/backends/platform/ps2/Gs2dScreen.h +++ b/backends/platform/ps2/Gs2dScreen.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/GsDefs.h b/backends/platform/ps2/GsDefs.h index 65dec5e2a6..515a2640bd 100644 --- a/backends/platform/ps2/GsDefs.h +++ b/backends/platform/ps2/GsDefs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/asyncfio.cpp b/backends/platform/ps2/asyncfio.cpp index 45cadbafa9..3051699b8b 100644 --- a/backends/platform/ps2/asyncfio.cpp +++ b/backends/platform/ps2/asyncfio.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/asyncfio.h b/backends/platform/ps2/asyncfio.h index ce5145dea2..4ce2aa15d1 100644 --- a/backends/platform/ps2/asyncfio.h +++ b/backends/platform/ps2/asyncfio.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/eecodyvdfs.c b/backends/platform/ps2/eecodyvdfs.c index 655b5b941c..623e827623 100644 --- a/backends/platform/ps2/eecodyvdfs.c +++ b/backends/platform/ps2/eecodyvdfs.c @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/eecodyvdfs.h b/backends/platform/ps2/eecodyvdfs.h index 9e58d35687..b9e2823cb9 100644 --- a/backends/platform/ps2/eecodyvdfs.h +++ b/backends/platform/ps2/eecodyvdfs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/fileio.cpp b/backends/platform/ps2/fileio.cpp index 3495c4a132..9fcd1b4354 100644 --- a/backends/platform/ps2/fileio.cpp +++ b/backends/platform/ps2/fileio.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/fileio.h b/backends/platform/ps2/fileio.h index ed94c2db6a..4ec004ed9a 100644 --- a/backends/platform/ps2/fileio.h +++ b/backends/platform/ps2/fileio.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/icon.cpp b/backends/platform/ps2/icon.cpp index 4569bc29c3..018bbdc94b 100644 --- a/backends/platform/ps2/icon.cpp +++ b/backends/platform/ps2/icon.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/iop/CoDyVDfs/common/codyvdirx.h b/backends/platform/ps2/iop/CoDyVDfs/common/codyvdirx.h index 6b81d000ae..a50a4a737c 100644 --- a/backends/platform/ps2/iop/CoDyVDfs/common/codyvdirx.h +++ b/backends/platform/ps2/iop/CoDyVDfs/common/codyvdirx.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/iop/CoDyVDfs/iop/cdtypes.h b/backends/platform/ps2/iop/CoDyVDfs/iop/cdtypes.h index 9f7a9762be..d8e0e96e59 100644 --- a/backends/platform/ps2/iop/CoDyVDfs/iop/cdtypes.h +++ b/backends/platform/ps2/iop/CoDyVDfs/iop/cdtypes.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c b/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c index 627054e6fd..e5eb76fdc8 100644 --- a/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c +++ b/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.h b/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.h index 5e6295993c..68738a3222 100644 --- a/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.h +++ b/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c b/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c index 701ece1525..75d4adf128 100644 --- a/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c +++ b/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.h b/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.h index 21d7dff218..e92576256c 100644 --- a/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.h +++ b/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/iop/CoDyVDfs/iop/rpcfs.c b/backends/platform/ps2/iop/CoDyVDfs/iop/rpcfs.c index 16f70e9ed4..c46d452d2c 100644 --- a/backends/platform/ps2/iop/CoDyVDfs/iop/rpcfs.c +++ b/backends/platform/ps2/iop/CoDyVDfs/iop/rpcfs.c @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/irxboot.cpp b/backends/platform/ps2/irxboot.cpp index 8872fb5f9f..5c2cc8fa4c 100644 --- a/backends/platform/ps2/irxboot.cpp +++ b/backends/platform/ps2/irxboot.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/irxboot.h b/backends/platform/ps2/irxboot.h index c41a4ac311..612d7f61c5 100644 --- a/backends/platform/ps2/irxboot.h +++ b/backends/platform/ps2/irxboot.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/ps2input.cpp b/backends/platform/ps2/ps2input.cpp index 1bb5206a9c..a3f4a31e8f 100644 --- a/backends/platform/ps2/ps2input.cpp +++ b/backends/platform/ps2/ps2input.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/ps2input.h b/backends/platform/ps2/ps2input.h index 6a6bdfe2e9..fe35af0526 100644 --- a/backends/platform/ps2/ps2input.h +++ b/backends/platform/ps2/ps2input.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/ps2mutex.cpp b/backends/platform/ps2/ps2mutex.cpp index 04b015b273..e270599013 100644 --- a/backends/platform/ps2/ps2mutex.cpp +++ b/backends/platform/ps2/ps2mutex.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/ps2pad.cpp b/backends/platform/ps2/ps2pad.cpp index 98341e9f95..3d285eedd5 100644 --- a/backends/platform/ps2/ps2pad.cpp +++ b/backends/platform/ps2/ps2pad.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/ps2pad.h b/backends/platform/ps2/ps2pad.h index 0e2994aafe..cf37a720e7 100644 --- a/backends/platform/ps2/ps2pad.h +++ b/backends/platform/ps2/ps2pad.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/ps2time.cpp b/backends/platform/ps2/ps2time.cpp index a8072492a0..2e7741bfed 100644 --- a/backends/platform/ps2/ps2time.cpp +++ b/backends/platform/ps2/ps2time.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/savefile.cpp b/backends/platform/ps2/savefile.cpp index 9c7d446d83..b0f792f386 100644 --- a/backends/platform/ps2/savefile.cpp +++ b/backends/platform/ps2/savefile.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/savefile.h b/backends/platform/ps2/savefile.h index aafb124ad0..1eafd7eadb 100644 --- a/backends/platform/ps2/savefile.h +++ b/backends/platform/ps2/savefile.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/sysdefs.h b/backends/platform/ps2/sysdefs.h index 086c75162c..4aef58b4bd 100644 --- a/backends/platform/ps2/sysdefs.h +++ b/backends/platform/ps2/sysdefs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index 4ba426590c..80d5ab9c83 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h index f3821cee66..4a3764666e 100644 --- a/backends/platform/ps2/systemps2.h +++ b/backends/platform/ps2/systemps2.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index 772fc0807a..bee422d36f 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project - * Copyright (C) 2005 Joost Peters PSP Backend - * Copyright (C) 2005 Thomas Mayer PSP Backend - * Copyright (C) 2005 Paolo Costabel PSP Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index fe5d5f3195..b833f5e179 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project - * Copyright (C) 2005 Joost Peters PSP Backend - * Copyright (C) 2005 Thomas Mayer PSP Backend - * Copyright (C) 2005 Paolo Costabel PSP Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/psp/osys_psp_gu.cpp b/backends/platform/psp/osys_psp_gu.cpp index 8baa4e021b..5175460007 100644 --- a/backends/platform/psp/osys_psp_gu.cpp +++ b/backends/platform/psp/osys_psp_gu.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project - * Copyright (C) 2005 Joost Peters PSP Backend - * Copyright (C) 2005 Thomas Mayer PSP Backend - * Copyright (C) 2005 Paolo Costabel PSP Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/psp/osys_psp_gu.h b/backends/platform/psp/osys_psp_gu.h index 1a9a6d9ee1..6486e7f3cc 100644 --- a/backends/platform/psp/osys_psp_gu.h +++ b/backends/platform/psp/osys_psp_gu.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project - * Copyright (C) 2005 Joost Peters PSP Backend - * Copyright (C) 2005 Thomas Mayer PSP Backend - * Copyright (C) 2005 Paolo Costabel PSP Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/psp/portdefs.h b/backends/platform/psp/portdefs.h index a63c8ff39e..e6ba71fc64 100644 --- a/backends/platform/psp/portdefs.h +++ b/backends/platform/psp/portdefs.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project - * Copyright (C) 2005 Joost Peters PSP Backend - * Copyright (C) 2005 Thomas Mayer PSP Backend - * Copyright (C) 2005 Paolo Costabel PSP Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/psp/psp_main.cpp b/backends/platform/psp/psp_main.cpp index 4f05db0eb1..8cfed7e573 100644 --- a/backends/platform/psp/psp_main.cpp +++ b/backends/platform/psp/psp_main.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project - * Copyright (C) 2005 Joost Peters PSP Backend - * Copyright (C) 2005 Thomas Mayer PSP Backend - * Copyright (C) 2005 Paolo Costabel PSP Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/psp/trace.cpp b/backends/platform/psp/trace.cpp index 45d594b010..3fe796dd26 100644 --- a/backends/platform/psp/trace.cpp +++ b/backends/platform/psp/trace.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project - * Copyright (C) 2005 Joost Peters PSP Backend - * Copyright (C) 2005 Thomas Mayer PSP Backend - * Copyright (C) 2005 Paolo Costabel PSP Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/psp/trace.h b/backends/platform/psp/trace.h index 948f6ea2a3..80afdbc4fe 100644 --- a/backends/platform/psp/trace.h +++ b/backends/platform/psp/trace.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project - * Copyright (C) 2005 Joost Peters PSP Backend - * Copyright (C) 2005 Thomas Mayer PSP Backend - * Copyright (C) 2005 Paolo Costabel PSP Backend +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/sdl/events.cpp b/backends/platform/sdl/events.cpp index c62c4e5b0b..bc7f0eecde 100644 --- a/backends/platform/sdl/events.cpp +++ b/backends/platform/sdl/events.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp index 2ffabd9aba..212eb43585 100644 --- a/backends/platform/sdl/graphics.cpp +++ b/backends/platform/sdl/graphics.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/sdl/sdl-common.h b/backends/platform/sdl/sdl-common.h index 7703a1a511..e66ca71e7f 100644 --- a/backends/platform/sdl/sdl-common.h +++ b/backends/platform/sdl/sdl-common.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index b846afe2c0..0fe16e0520 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl index bd2a3cf0dc..30d5bd25d8 100644 --- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl +++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl @@ -12,6 +12,7 @@ MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib MACRO DISABLE_SWORD2 // LIB:scummvm_sword2.lib MACRO DISABLE_PARALLACTION // LIB:scummvm_parallaction.lib + MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib "; ## @@ -141,8 +142,8 @@ if (1) # all regular combo's MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib MACRO DISABLE_LURE // LIB:scummvm_lure.lib MACRO DISABLE_CINE // LIB:scummvm_cine.lib - MACRO DISABLE_AGI // LIB:scummvm_agi.lib - MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib + MACRO DISABLE_AGI // LIB:scummvm_agi.lib + MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib $DefaultBottomMacros"; $SDK_Variations{'ALL'}{'agos'} = "$DefaultTopMacros @@ -150,41 +151,41 @@ if (1) # all regular combo's //MACRO DISABLE_AGOS // LIB:scummvm_agos.lib MACRO DISABLE_SKY // LIB:scummvm_sky.lib MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib - MACRO DISABLE_GOB // LIB:scummvm_gob.lib + MACRO DISABLE_GOB // LIB:scummvm_gob.lib MACRO DISABLE_SAGA // LIB:scummvm_saga.lib MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib MACRO DISABLE_LURE // LIB:scummvm_lure.lib MACRO DISABLE_CINE // LIB:scummvm_cine.lib - MACRO DISABLE_AGI // LIB:scummvm_agi.lib - MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib + MACRO DISABLE_AGI // LIB:scummvm_agi.lib + MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib $DefaultBottomMacros"; $SDK_Variations{'ALL'}{'sky'} = "$DefaultTopMacros MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib MACRO DISABLE_AGOS // LIB:scummvm_agos.lib - //MACRO DISABLE_SKY // LIB:scummvm_sky.lib + //MACRO DISABLE_SKY // LIB:scummvm_sky.lib MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib - MACRO DISABLE_GOB // LIB:scummvm_gob.lib + MACRO DISABLE_GOB // LIB:scummvm_gob.lib MACRO DISABLE_SAGA // LIB:scummvm_saga.lib MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib MACRO DISABLE_LURE // LIB:scummvm_lure.lib MACRO DISABLE_CINE // LIB:scummvm_cine.lib - MACRO DISABLE_AGI // LIB:scummvm_agi.lib - MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib + MACRO DISABLE_AGI // LIB:scummvm_agi.lib + MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib $DefaultBottomMacros"; $SDK_Variations{'ALL'}{'queen'} = "$DefaultTopMacros MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib MACRO DISABLE_AGOS // LIB:scummvm_agos.lib - MACRO DISABLE_SKY // LIB:scummvm_sky.lib + MACRO DISABLE_SKY // LIB:scummvm_sky.lib //MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib - MACRO DISABLE_GOB // LIB:scummvm_gob.lib + MACRO DISABLE_GOB // LIB:scummvm_gob.lib MACRO DISABLE_SAGA // LIB:scummvm_saga.lib MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib - MACRO DISABLE_AGI // LIB:scummvm_agi.lib - MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib + MACRO DISABLE_AGI // LIB:scummvm_agi.lib MACRO DISABLE_LURE // LIB:scummvm_lure.lib MACRO DISABLE_CINE // LIB:scummvm_cine.lib + MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib $DefaultBottomMacros"; $SDK_Variations{'ALL'}{'gob'} = "$DefaultTopMacros @@ -196,9 +197,9 @@ if (1) # all regular combo's MACRO DISABLE_SAGA // LIB:scummvm_saga.lib MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib MACRO DISABLE_AGI // LIB:scummvm_agi.lib - MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib MACRO DISABLE_LURE // LIB:scummvm_lure.lib MACRO DISABLE_CINE // LIB:scummvm_cine.lib + MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib $DefaultBottomMacros"; $SDK_Variations{'ALL'}{'saga'} = "$DefaultTopMacros @@ -212,7 +213,7 @@ if (1) # all regular combo's MACRO DISABLE_LURE // LIB:scummvm_lure.lib MACRO DISABLE_CINE // LIB:scummvm_cine.lib MACRO DISABLE_AGI // LIB:scummvm_agi.lib - MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib + MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib $DefaultBottomMacros"; $SDK_Variations{'ALL'}{'kyra'} = "$DefaultTopMacros @@ -223,10 +224,10 @@ if (1) # all regular combo's MACRO DISABLE_GOB // LIB:scummvm_gob.lib MACRO DISABLE_SAGA // LIB:scummvm_saga.lib //MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib - MACRO DISABLE_AGI // LIB:scummvm_agi.lib - MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib + MACRO DISABLE_AGI // LIB:scummvm_agi.lib MACRO DISABLE_LURE // LIB:scummvm_lure.lib - MACRO DISABLE_CINE // LIB:scummvm_cine.lib + MACRO DISABLE_CINE // LIB:scummvm_cine.lib + MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib $DefaultBottomMacros"; # below here you could specify weird & experimental combinations, non-ready engines @@ -234,8 +235,7 @@ if (1) # all regular combo's $SDK_Variations{'ALL'}{'saga_mini'} = " //MACRO USE_ZLIB // LIB:zlib.lib //MACRO USE_MAD // LIB:libmad.lib - //MACRO USE_TREMOR // LIB:libtremor.lib - + //MACRO USE_TREMOR // LIB:libtremor.lib MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib MACRO DISABLE_AGOS // LIB:scummvm_agos.lib MACRO DISABLE_SKY // LIB:scummvm_sky.lib @@ -243,31 +243,30 @@ if (1) # all regular combo's MACRO DISABLE_GOB // LIB:scummvm_gob.lib //MACRO DISABLE_SAGA // LIB:scummvm_saga.lib MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib - MACRO DISABLE_AGI // LIB:scummvm_agi.lib - MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib + MACRO DISABLE_AGI // LIB:scummvm_agi.lib MACRO DISABLE_LURE // LIB:scummvm_lure.lib - MACRO DISABLE_CINE // LIB:scummvm_cine.lib + MACRO DISABLE_CINE // LIB:scummvm_cine.lib + MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib $DefaultBottomMacros"; - $SDK_Variations{'ALL'}{'scumm_no78he'} = " - MACRO USE_ZLIB // LIB:zlib.lib - MACRO USE_MAD // LIB:libmad.lib - //MACRO USE_TREMOR // LIB:libtremor.lib - MACRO DISABLE_SCUMM_7_8 - MACRO DISABLE_SCUMM_HE - - //MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib - MACRO DISABLE_AGOS // LIB:scummvm_agos.lib - MACRO DISABLE_SKY // LIB:scummvm_sky.lib - MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib - MACRO DISABLE_GOB // LIB:scummvm_gob.lib - MACRO DISABLE_SAGA // LIB:scummvm_saga.lib - MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib - MACRO DISABLE_AGI // LIB:scummvm_agi.lib - MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib - MACRO DISABLE_LURE // LIB:scummvm_lure.lib - MACRO DISABLE_CINE // LIB:scummvm_cine.lib - $DefaultBottomMacros"; +# $SDK_Variations{'ALL'}{'scumm_no78he'} = " +# MACRO USE_ZLIB // LIB:zlib.lib +# MACRO USE_MAD // LIB:libmad.lib +# //MACRO USE_TREMOR // LIB:libtremor.lib +# MACRO DISABLE_SCUMM_7_8 +# MACRO DISABLE_SCUMM_HE +# //MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib +# MACRO DISABLE_AGOS // LIB:scummvm_agos.lib +# MACRO DISABLE_SKY // LIB:scummvm_sky.lib +# MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib +# MACRO DISABLE_GOB // LIB:scummvm_gob.lib +# MACRO DISABLE_SAGA // LIB:scummvm_saga.lib +# MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib +# MACRO DISABLE_AGI // LIB:scummvm_agi.lib +# MACRO DISABLE_LURE // LIB:scummvm_lure.lib +# MACRO DISABLE_CINE // LIB:scummvm_cine.lib +# MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib +# $DefaultBottomMacros"; # $SDK_Variations{'ALL'}{'all_vorbis'} = " # MACRO USE_ZLIB // LIB:zlib.lib @@ -290,15 +289,12 @@ if (1) # all regular combo's MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib MACRO DISABLE_GOB // LIB:scummvm_gob.lib MACRO DISABLE_SAGA // LIB:scummvm_saga.lib - MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib - - MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib - MACRO DISABLE_SWORD2 // LIB:scummvm_sword2.lib + MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib //MACRO DISABLE_LURE // LIB:scummvm_lure.lib MACRO DISABLE_CINE // LIB:scummvm_agi.lib - MACRO DISABLE_AGI // LIB:scummvm_agi.lib - MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib - "; + MACRO DISABLE_AGI // LIB:scummvm_agi.lib + MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib + $DefaultBottomMacros"; # empty $SDK_Variations{''} string instead of 'ALL' = package disabled $SDK_Variations{'ALL'}{'test_cine'} = "$DefaultTopMacros @@ -308,52 +304,44 @@ if (1) # all regular combo's MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib MACRO DISABLE_GOB // LIB:scummvm_gob.lib MACRO DISABLE_SAGA // LIB:scummvm_saga.lib - MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib - - MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib - MACRO DISABLE_SWORD2 // LIB:scummvm_sword2.lib + MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib MACRO DISABLE_LURE // LIB:scummvm_lure.lib //MACRO DISABLE_CINE // LIB:scummvm_cine.lib - MACRO DISABLE_AGI // LIB:scummvm_agi.lib - MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib - - "; + MACRO DISABLE_AGI // LIB:scummvm_agi.lib + MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib + $DefaultBottomMacros"; $SDK_Variations{'ALL'}{'test_agi'} = "$DefaultTopMacros MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib MACRO DISABLE_AGOS // LIB:scummvm_agos.lib - MACRO DISABLE_SKY // LIB:scummvm_sky.lib + MACRO DISABLE_SKY // LIB:scummvm_sky.lib MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib - MACRO DISABLE_GOB // LIB:scummvm_gob.lib + MACRO DISABLE_GOB // LIB:scummvm_gob.lib MACRO DISABLE_SAGA // LIB:scummvm_saga.lib - MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib - - MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib - MACRO DISABLE_SWORD2 // LIB:scummvm_sword2.lib + MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib MACRO DISABLE_LURE // LIB:scummvm_lure.lib MACRO DISABLE_CINE // LIB:scummvm_cine.lib //MACRO DISABLE_AGI // LIB:scummvm_agi.lib - MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib - - "; + MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib + $DefaultBottomMacros"; $SDK_Variations{'ALL'}{'test_touche'} = "$DefaultTopMacros MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib MACRO DISABLE_AGOS // LIB:scummvm_agos.lib - MACRO DISABLE_SKY // LIB:scummvm_sky.lib + MACRO DISABLE_SKY // LIB:scummvm_sky.lib MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib - MACRO DISABLE_GOB // LIB:scummvm_gob.lib + MACRO DISABLE_GOB // LIB:scummvm_gob.lib MACRO DISABLE_SAGA // LIB:scummvm_saga.lib - MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib - - MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib - MACRO DISABLE_SWORD2 // LIB:scummvm_sword2.lib + MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib MACRO DISABLE_LURE // LIB:scummvm_lure.lib MACRO DISABLE_CINE // LIB:scummvm_cine.lib - MACRO DISABLE_AGI // LIB:scummvm_agi.lib + MACRO DISABLE_AGI // LIB:scummvm_agi.lib + MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib //MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib - + MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib + MACRO DISABLE_SWORD2 // LIB:scummvm_sword2.lib + MACRO DISABLE_PARALLACTION // LIB:scummvm_parallaction.lib "; } @@ -368,6 +356,9 @@ if (1) # all regular combo's # MACRO DISABLE_GOB // LIB:scummvm_gob.lib # MACRO DISABLE_SAGA // LIB:scummvm_saga.lib # MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib +# MACRO DISABLE_PARALLACTION // LIB:scummvm_parallaction.lib +# MACRO DISABLE_CINE // LIB:scummvm_cine.lib +# MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib # //MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib # //MACRO DISABLE_SWORD2 // LIB:scummvm_sword2.lib # "; diff --git a/backends/platform/symbian/S60v3/BLD.INF.in b/backends/platform/symbian/S60v3/BLD.INF.in index f7b7090adf..d499fccc39 100644 --- a/backends/platform/symbian/S60v3/BLD.INF.in +++ b/backends/platform/symbian/S60v3/BLD.INF.in @@ -7,5 +7,5 @@ PRJ_MMPFILES // empty base file, will be updated by Perl build scripts //STOP_AUTO_PROJECTS// - +gnumakefile icons.mk .\ScummVM_S60v3.mmp diff --git a/backends/platform/symbian/S60v3/icons.mk b/backends/platform/symbian/S60v3/icons.mk new file mode 100644 index 0000000000..5f17dd7b8b --- /dev/null +++ b/backends/platform/symbian/S60v3/icons.mk @@ -0,0 +1,34 @@ +ifeq (WINS,$(findstring WINS, $(PLATFORM)))
+ZDIR=$(EPOCROOT)epoc32\release\$(PLATFORM)\$(CFG)\Z
+else
+ZDIR=$(EPOCROOT)epoc32\data\z
+endif
+
+TARGETDIR=$(ZDIR)\RESOURCE\APPS
+ICONTARGETFILENAME=$(TARGETDIR)\scummvm.mif
+
+do_nothing :
+ @rem do_nothing
+
+MAKMAKE : do_nothing
+
+BLD : do_nothing
+
+CLEAN : do_nothing
+
+LIB : do_nothing
+
+CLEANLIB : do_nothing
+
+RESOURCE :
+ mifconv $(ICONTARGETFILENAME) \
+ /c32 ..\res\scummvm.svg
+
+FREEZE : do_nothing
+
+SAVESPACE : do_nothing
+
+RELEASABLES :
+ @echo $(ICONTARGETFILENAME)
+
+FINAL : do_nothing
\ No newline at end of file diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg index ec57e4346f..73cbad17cd 100644 --- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg +++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg @@ -41,11 +41,12 @@ *"..\res\scummvm.key","..\res\scummvm.cer",KEY="scummvm" ; Launcher, Application, AIF & Resource file -"\s60v3\epoc32\release\gcce\urel\ScummVM.exe"- "!:\sys\bin\ScummVM.exe" -"\s60v3\epoc32\data\z\resource\apps\ScummVM.rsc"- "!:\resource\apps\ScummVM.rsc" -"\s60v3\epoc32\Data\Z\resource\apps\scummvm_loc.rsc"- "!:\resource\apps\scummvm_loc.rsc" -"\s60v3\epoc32\data\Z\resource\APPS\scummvm.MBM"- "!:\resource\apps\scummvm.MBM" -"\s60v3\epoc32\data\z\private\10003a3f\apps\scummvm_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_reg.rsc" +"\epoc32\release\gcce\urel\ScummVM.exe"- "!:\sys\bin\ScummVM.exe" +"\epoc32\data\z\resource\apps\ScummVM.rsc"- "!:\resource\apps\ScummVM.rsc" +"\epoc32\Data\Z\resource\apps\scummvm_loc.rsc"- "!:\resource\apps\scummvm_loc.rsc" +"\epoc32\data\Z\resource\APPS\scummvm.MBM"- "!:\resource\apps\scummvm.MBM" +"\epoc32\data\Z\resource\APPS\scummvm.MIF"- "!:\resource\apps\scummvm.MIF" +"\epoc32\data\z\private\10003a3f\apps\scummvm_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_reg.rsc" ; Config/log files: 'empty' will automagically be removed on uninstall ""-"c:\data\scummvm\scummvm.ini",FILENULL diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg index 7ee2c57844..1e529127f9 100644 --- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg +++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg @@ -41,11 +41,11 @@ *"..\res\scummvm.key","..\res\scummvm.cer",KEY="scummvm" ; Application, AIF & Resource file -"\uiq3\epoc32\release\gcce\urel\ScummVM.exe"- "!:\sys\bin\ScummVM.exe" -"\uiq3\epoc32\data\z\resource\apps\ScummVM.rsc"- "!:\resource\apps\ScummVM.rsc" -"\uiq3\epoc32\Data\Z\resource\apps\scummvm_loc.rsc"- "!:\resource\apps\scummvm_loc.rsc" -"\uiq3\epoc32\data\Z\resource\APPS\scummvm.MBM"- "!:\resource\apps\scummvm.MBM" -"\uiq3\epoc32\data\z\private\10003a3f\apps\scummvm_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_reg.rsc" +"\epoc32\release\gcce\urel\ScummVM.exe"- "!:\sys\bin\ScummVM.exe" +"\epoc32\data\z\resource\apps\ScummVM.rsc"- "!:\resource\apps\ScummVM.rsc" +"\epoc32\Data\Z\resource\apps\scummvm_loc.rsc"- "!:\resource\apps\scummvm_loc.rsc" +"\epoc32\data\Z\resource\APPS\scummvm.MBM"- "!:\resource\apps\scummvm.MBM" +"\epoc32\data\z\private\10003a3f\apps\scummvm_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_reg.rsc" ; Config/log files: 'empty' will automagically be removed on uninstall ""-"c:\shared\scummvm\scummvm.ini",FILENULL diff --git a/backends/platform/symbian/res/scummvm.svg b/backends/platform/symbian/res/scummvm.svg new file mode 100644 index 0000000000..850c03214b --- /dev/null +++ b/backends/platform/symbian/res/scummvm.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="64" height="64" viewBox="9 26.110352 256 256">
+<metadata/>
+<defs/>
+<path d="M 249.05009,175.79971 C 248.53891,172.49798 247.74049,169.19936 246.65481,166.01745 C 244.6791,160.23291 241.91403,154.65205 238.4964,149.46763 C 236.32392,146.17631 234.09037,142.91366 231.68153,139.75934 C 229.45137,136.83425 227.17371,134.22747 224.56695,131.62588 C 223.74026,130.79914 222.40012,129.84113 222.07216,128.70756 C 221.69556,127.40207 222.75297,126.29976 223.40211,125.23964 C 224.20619,123.92114 224.94806,122.57502 225.79738,121.27787 C 227.24043,119.07377 228.67556,116.86445 230.06658,114.63325 C 234.87183,106.93946 239.32763,99.044058 243.4645,91.030924 C 245.92763,86.263259 248.09332,81.587795 247.50978,76.169476 C 247.25306,73.778352 246.07239,71.52788 244.62482,69.569657 C 239.25751,62.317618 231.87717,55.638095 224.07953,50.624545 C 218.42271,46.987846 212.35761,43.903345 206.11838,41.196529 C 193.73941,35.828738 180.59028,31.834152 167.22403,29.164322 C 160.40576,27.802058 153.42464,26.712246 146.4322,26.546587 C 124.6627,26.031896 100.03934,28.496474 80.296996,37.311862 C 73.836092,40.195278 67.506939,43.813744 61.941153,47.98545 C 51.870942,55.534948 43.25565,65.529749 36.935544,75.952759 C 34.371765,80.183853 32.219073,84.872333 30.804867,89.539465 C 28.571315,96.918087 28.082761,104.53791 28.284629,112.16294 C 28.313467,113.28975 28.366619,114.41394 28.443521,115.53657 C 28.909457,122.48698 30.263726,129.38843 32.524986,136.03305 C 33.648547,139.34312 34.99716,142.58598 36.563474,145.73873 C 39.861216,152.38022 44.280257,158.23665 48.557933,164.34731 C 49.959699,166.34981 49.175411,166.96765 48.021315,168.83262 C 47.228546,170.11206 46.438038,171.39254 45.638482,172.66572 C 44.037111,175.21625 42.426125,177.75949 40.837758,180.31837 C 37.87816,185.07978 35.20129,189.98288 32.264875,194.75472 C 28.544739,200.79244 24.471757,206.79161 22.644767,213.59303 C 21.740603,216.96562 21.542693,220.49448 22.381265,223.92124 C 24.132483,231.06961 28.956956,237.15526 34.331618,242.40949 C 37.329667,245.34448 41.158373,247.51785 44.664767,249.88918 C 59.186816,259.70061 77.54492,265.42784 94.769847,269.75584 C 112.22775,274.14322 130.71308,275.66021 148.78336,274.60893 C 184.31325,272.54496 222.35715,260.35596 239.61714,229.8902 C 242.86285,224.15671 245.42664,217.75745 247.18859,211.50406 C 250.41735,200.01936 250.85728,187.52508 249.05009,175.79971 z "/>
+<image y="45.56538" x="49.37302" height="208.96297" width="173.89946" xlink:href="E:\scummvm_green.gif" style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"/>
+</svg>
diff --git a/backends/platform/symbian/src/ScummApp.cpp b/backends/platform/symbian/src/ScummApp.cpp index 9341b374f9..3c3c0dc065 100644 --- a/backends/platform/symbian/src/ScummApp.cpp +++ b/backends/platform/symbian/src/ScummApp.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL - * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System - * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/symbian/src/ScummApp.h b/backends/platform/symbian/src/ScummApp.h index bd81edaa83..bf0eb6f436 100644 --- a/backends/platform/symbian/src/ScummApp.h +++ b/backends/platform/symbian/src/ScummApp.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL - * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System - * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/symbian/src/ScummVMApp.cpp b/backends/platform/symbian/src/ScummVMApp.cpp index e30cb62e87..daa0e75744 100644 --- a/backends/platform/symbian/src/ScummVMApp.cpp +++ b/backends/platform/symbian/src/ScummVMApp.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL - * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System - * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/symbian/src/ScummVMApp.h b/backends/platform/symbian/src/ScummVMApp.h index 0c422ad178..9f1b6f8452 100644 --- a/backends/platform/symbian/src/ScummVMApp.h +++ b/backends/platform/symbian/src/ScummVMApp.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL - * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System - * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp index 25dd1472c8..cb2652eac4 100644 --- a/backends/platform/symbian/src/SymbianActions.cpp +++ b/backends/platform/symbian/src/SymbianActions.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/symbian/src/SymbianActions.h b/backends/platform/symbian/src/SymbianActions.h index c1176d00b0..0facde763c 100644 --- a/backends/platform/symbian/src/SymbianActions.h +++ b/backends/platform/symbian/src/SymbianActions.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index 846f1cce06..737795182e 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL - * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System - * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h index 80278af58c..c7142b621d 100644 --- a/backends/platform/symbian/src/SymbianOS.h +++ b/backends/platform/symbian/src/SymbianOS.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL - * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System - * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index 906b6317d3..4299eb59ad 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -1,8 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL - * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System - * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEActionsPocket.cpp b/backends/platform/wince/CEActionsPocket.cpp index 6cddf62695..2bb79850e3 100644 --- a/backends/platform/wince/CEActionsPocket.cpp +++ b/backends/platform/wince/CEActionsPocket.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEActionsPocket.h b/backends/platform/wince/CEActionsPocket.h index d20829f3f6..0f6430d443 100644 --- a/backends/platform/wince/CEActionsPocket.h +++ b/backends/platform/wince/CEActionsPocket.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEActionsSmartphone.cpp b/backends/platform/wince/CEActionsSmartphone.cpp index 1d53b01dc4..3d85ebc68e 100644 --- a/backends/platform/wince/CEActionsSmartphone.cpp +++ b/backends/platform/wince/CEActionsSmartphone.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEActionsSmartphone.h b/backends/platform/wince/CEActionsSmartphone.h index 3ba57f1239..648d0ae4cf 100644 --- a/backends/platform/wince/CEActionsSmartphone.h +++ b/backends/platform/wince/CEActionsSmartphone.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEDevice.cpp b/backends/platform/wince/CEDevice.cpp index 5a60c76bfe..a76360f590 100644 --- a/backends/platform/wince/CEDevice.cpp +++ b/backends/platform/wince/CEDevice.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -154,66 +157,3 @@ bool CEDevice::isSmartphone() { return true; return (_wcsnicmp(platformType, TEXT("SmartPhone"), 10) == 0); } - -Common::String CEDevice::getKeyName(unsigned int keyCode) { - switch (keyCode) { - case SDLK_F1: - return "Softkey A"; - case SDLK_F2: - return "Softkey B"; - case SDLK_F3: - return "Talk"; - case SDLK_F4: - return "End"; - case SDLK_APP1: - return "Application 1"; - case SDLK_APP2: - return "Application 2"; - case SDLK_APP3: - return "Application 3"; - case SDLK_APP4: - return "Application 4"; - case SDLK_APP5: - return "Application 5"; - case SDLK_APP6: - return "Application 6"; - case SDLK_LSUPER: - return "Home"; - case SDLK_ESCAPE: - return "Back"; - case SDLK_UP: - return "Up"; - case SDLK_DOWN: - return "Down"; - case SDLK_LEFT: - return "Left"; - case SDLK_RIGHT: - return "Right"; - case SDLK_RETURN: - return "Action"; - case SDLK_F10: - return "Record"; - case SDLK_F6: - return "Volume Up"; - case SDLK_F7: - return "Volume Down"; - case SDLK_F17: - return "Flip"; - case SDLK_F18: - return "Power"; - case SDLK_F16: - return "Speaker"; - case SDLK_F8: - return "Star"; - case SDLK_F9: - return "Pound"; - case SDLK_F11: - return "Symbol"; - case SDLK_F19: - return "Red Key"; - case 0: - return "None"; - default: - return SDL_GetKeyName((SDLKey)keyCode); - } -} diff --git a/backends/platform/wince/CEDevice.h b/backends/platform/wince/CEDevice.h index 4dd86f1619..c2dab4e793 100644 --- a/backends/platform/wince/CEDevice.h +++ b/backends/platform/wince/CEDevice.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -39,7 +42,6 @@ class CEDevice { static bool hasWideResolution(); static bool hasSmartphoneResolution(); static bool isSmartphone(); - static Common::String getKeyName(unsigned int keyCode); private: static DWORD reg_access(TCHAR *key, TCHAR *val, DWORD data); diff --git a/backends/platform/wince/CEException.cpp b/backends/platform/wince/CEException.cpp index 283d87882a..aec818102d 100644 --- a/backends/platform/wince/CEException.cpp +++ b/backends/platform/wince/CEException.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEException.h b/backends/platform/wince/CEException.h index 0d4bb747ca..08a51a3b3c 100644 --- a/backends/platform/wince/CEException.h +++ b/backends/platform/wince/CEException.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CELauncherDialog.cpp b/backends/platform/wince/CELauncherDialog.cpp index ef522a70fe..994bba6437 100644 --- a/backends/platform/wince/CELauncherDialog.cpp +++ b/backends/platform/wince/CELauncherDialog.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CELauncherDialog.h b/backends/platform/wince/CELauncherDialog.h index ee0b4e96b0..55d177bcb8 100644 --- a/backends/platform/wince/CELauncherDialog.h +++ b/backends/platform/wince/CELauncherDialog.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEScaler.cpp b/backends/platform/wince/CEScaler.cpp index 85151dafe5..a09c4dcc65 100644 --- a/backends/platform/wince/CEScaler.cpp +++ b/backends/platform/wince/CEScaler.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEScaler.h b/backends/platform/wince/CEScaler.h index 9ff10c632f..b02b0555f1 100644 --- a/backends/platform/wince/CEScaler.h +++ b/backends/platform/wince/CEScaler.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/CEGUI.h b/backends/platform/wince/CEgui/CEGUI.h index 1b5d5197f2..1107e7d5e5 100644 --- a/backends/platform/wince/CEgui/CEGUI.h +++ b/backends/platform/wince/CEgui/CEGUI.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/GUIElement.cpp b/backends/platform/wince/CEgui/GUIElement.cpp index 520c17e11d..6c74e7e7e7 100644 --- a/backends/platform/wince/CEgui/GUIElement.cpp +++ b/backends/platform/wince/CEgui/GUIElement.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/GUIElement.h b/backends/platform/wince/CEgui/GUIElement.h index eef84043b3..ebf80320e7 100644 --- a/backends/platform/wince/CEgui/GUIElement.h +++ b/backends/platform/wince/CEgui/GUIElement.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/ItemAction.cpp b/backends/platform/wince/CEgui/ItemAction.cpp index 7010d85ec0..f9bf903cd2 100644 --- a/backends/platform/wince/CEgui/ItemAction.cpp +++ b/backends/platform/wince/CEgui/ItemAction.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/ItemAction.h b/backends/platform/wince/CEgui/ItemAction.h index 97202e14a1..35747374b9 100644 --- a/backends/platform/wince/CEgui/ItemAction.h +++ b/backends/platform/wince/CEgui/ItemAction.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/ItemSwitch.cpp b/backends/platform/wince/CEgui/ItemSwitch.cpp index 7498463871..7fc32ac67f 100644 --- a/backends/platform/wince/CEgui/ItemSwitch.cpp +++ b/backends/platform/wince/CEgui/ItemSwitch.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/ItemSwitch.h b/backends/platform/wince/CEgui/ItemSwitch.h index 60a96c4894..cd9dacbc83 100644 --- a/backends/platform/wince/CEgui/ItemSwitch.h +++ b/backends/platform/wince/CEgui/ItemSwitch.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/Panel.cpp b/backends/platform/wince/CEgui/Panel.cpp index 8b49b5d3a7..3d120d87bb 100644 --- a/backends/platform/wince/CEgui/Panel.cpp +++ b/backends/platform/wince/CEgui/Panel.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/Panel.h b/backends/platform/wince/CEgui/Panel.h index 8c4f4b3c7f..549f692ea0 100644 --- a/backends/platform/wince/CEgui/Panel.h +++ b/backends/platform/wince/CEgui/Panel.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/PanelItem.cpp b/backends/platform/wince/CEgui/PanelItem.cpp index 762fac1047..12353f6d39 100644 --- a/backends/platform/wince/CEgui/PanelItem.cpp +++ b/backends/platform/wince/CEgui/PanelItem.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/PanelItem.h b/backends/platform/wince/CEgui/PanelItem.h index 638a9303d1..d11f943a6a 100644 --- a/backends/platform/wince/CEgui/PanelItem.h +++ b/backends/platform/wince/CEgui/PanelItem.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/PanelKeyboard.cpp b/backends/platform/wince/CEgui/PanelKeyboard.cpp index ca7074a7fe..8a17a4c1c4 100644 --- a/backends/platform/wince/CEgui/PanelKeyboard.cpp +++ b/backends/platform/wince/CEgui/PanelKeyboard.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/PanelKeyboard.h b/backends/platform/wince/CEgui/PanelKeyboard.h index 2f53d0afa3..fe586b3727 100644 --- a/backends/platform/wince/CEgui/PanelKeyboard.h +++ b/backends/platform/wince/CEgui/PanelKeyboard.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.cpp b/backends/platform/wince/CEgui/SDL_ImageResource.cpp index 0261d11684..de055f2e54 100644 --- a/backends/platform/wince/CEgui/SDL_ImageResource.cpp +++ b/backends/platform/wince/CEgui/SDL_ImageResource.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.h b/backends/platform/wince/CEgui/SDL_ImageResource.h index 0c46497de8..3dffbac281 100644 --- a/backends/platform/wince/CEgui/SDL_ImageResource.h +++ b/backends/platform/wince/CEgui/SDL_ImageResource.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/Toolbar.cpp b/backends/platform/wince/CEgui/Toolbar.cpp index 03859ab392..d8c23b3d08 100644 --- a/backends/platform/wince/CEgui/Toolbar.cpp +++ b/backends/platform/wince/CEgui/Toolbar.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/Toolbar.h b/backends/platform/wince/CEgui/Toolbar.h index ae97c1c8d5..f60947925e 100644 --- a/backends/platform/wince/CEgui/Toolbar.h +++ b/backends/platform/wince/CEgui/Toolbar.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/ToolbarHandler.cpp b/backends/platform/wince/CEgui/ToolbarHandler.cpp index 1470479478..eb65984778 100644 --- a/backends/platform/wince/CEgui/ToolbarHandler.cpp +++ b/backends/platform/wince/CEgui/ToolbarHandler.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEgui/ToolbarHandler.h b/backends/platform/wince/CEgui/ToolbarHandler.h index 376d536dd4..4606d59302 100644 --- a/backends/platform/wince/CEgui/ToolbarHandler.h +++ b/backends/platform/wince/CEgui/ToolbarHandler.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEkeys/CEKeys.h b/backends/platform/wince/CEkeys/CEKeys.h index 2b191b137f..87e6d461da 100644 --- a/backends/platform/wince/CEkeys/CEKeys.h +++ b/backends/platform/wince/CEkeys/CEKeys.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEkeys/EventsBuffer.cpp b/backends/platform/wince/CEkeys/EventsBuffer.cpp index ca8c2eee58..c8b09f611a 100644 --- a/backends/platform/wince/CEkeys/EventsBuffer.cpp +++ b/backends/platform/wince/CEkeys/EventsBuffer.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/CEkeys/EventsBuffer.h b/backends/platform/wince/CEkeys/EventsBuffer.h index eacc00fe75..541e1b15c8 100644 --- a/backends/platform/wince/CEkeys/EventsBuffer.h +++ b/backends/platform/wince/CEkeys/EventsBuffer.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/Makefile b/backends/platform/wince/Makefile index 44c4b597cf..cc9e2951be 100644 --- a/backends/platform/wince/Makefile +++ b/backends/platform/wince/Makefile @@ -3,7 +3,7 @@ # $URL$ # $Id$ -wince_gcc_root = /cygdrive/e/wince-gcc-root/ +wince_gcc_root = /cygdrive/e/wince-gcc-root srcdir = ../../.. VPATH = $(srcdir) @@ -41,11 +41,10 @@ AS = arm-wince-pe-as DEFINES := -D_WIN32_WCE=300 -DARM -D__ARM__ -D_ARM_ -DUNICODE -DSCUMM_NEED_ALIGNMENT -DFPM_DEFAULT -DUSE_MAD -DNONSTANDARD_PORT -DUSE_TREMOR -DUSE_VORBIS -DUSE_MPEG2 -DWIN32 -DUSE_ZLIB DEFINES += -D__stdcall= -Dcdecl= -D__cdecl__= -D__cdecl= -Wno-multichar #DEFINES += -DDEBUG -DUSE_WINDBG -g -DEFINES += -O2 INCLUDES := -I$(srcdir) -I. -I$(srcdir)/engines -Imissing/gcc -Ilibs/include -Ilibs/include/sdl -ICEgui -ICEkeys -I$(wince_gcc_root)/include -CFLAGS := +CFLAGS := -O3 -march=armv4 -mtune=xscale CXXFLAGS := $(CFLAGS) diff --git a/backends/platform/wince/portdefs.h b/backends/platform/wince/portdefs.h index fca78367e4..bec4b08a8c 100644 --- a/backends/platform/wince/portdefs.h +++ b/backends/platform/wince/portdefs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp index 48eca8164e..8ef7412530 100644 --- a/backends/platform/wince/wince-sdl.cpp +++ b/backends/platform/wince/wince-sdl.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -176,7 +179,6 @@ int SDL_main(int argc, char **argv) { #endif CEDevice::init(); - OSystem_WINCE3::initScreenInfos(); /* Redirect standard input and standard output */ strcpy(stdout_fname, getcwd(NULL, MAX_PATH)); @@ -265,16 +267,6 @@ static Uint32 timer_handler_wrapper(Uint32 interval) { void OSystem_WINCE3::initBackend() { - // Initialize global key mapping - GUI::Actions::init(); - GUI_Actions::Instance()->initInstanceMain(this); - if (!GUI_Actions::Instance()->loadMapping()) { // error during loading means not present/wrong version - warning("Setting default action mappings."); - GUI_Actions::Instance()->saveMapping(); // write defaults - } - - loadDeviceConfiguration(); - // Instantiate our own sound mixer // mixer init is postponed until a game engine is selected. if (_mixer == 0) { @@ -290,6 +282,23 @@ void OSystem_WINCE3::initBackend() // Chain init OSystem_SDL::initBackend(); + + // Query SDL for screen size and init screen dependent stuff + OSystem_WINCE3::initScreenInfos(); + _isSmartphone = CEDevice::isSmartphone(); + create_toolbar(); + _hasSmartphoneResolution = CEDevice::hasSmartphoneResolution() || CEDevice::isSmartphone(); + if (_hasSmartphoneResolution) _panelVisible = false; // init correctly in smartphones + + // Initialize global key mapping + GUI::Actions::init(); + GUI_Actions::Instance()->initInstanceMain(this); + if (!GUI_Actions::Instance()->loadMapping()) { // error during loading means not present/wrong version + warning("Setting default action mappings."); + GUI_Actions::Instance()->saveMapping(); // write defaults + } + + loadDeviceConfiguration(); } int OSystem_WINCE3::getScreenWidth() { @@ -303,8 +312,13 @@ int OSystem_WINCE3::getScreenHeight() { void OSystem_WINCE3::initScreenInfos() { // sdl port ensures that we use correctly full screen _isOzone = 0; - _platformScreenWidth = GetSystemMetrics(SM_CXSCREEN); - _platformScreenHeight = GetSystemMetrics(SM_CYSCREEN); + SDL_Rect **r; + r = SDL_ListModes(NULL, 0); + printf("listmodes: %dx%d\n", r[0]->w, r[0]->h); + //_platformScreenWidth = GetSystemMetrics(SM_CXSCREEN); + //_platformScreenHeight = GetSystemMetrics(SM_CYSCREEN); + _platformScreenWidth = r[0]->w; + _platformScreenHeight = r[0]->h; } bool OSystem_WINCE3::isOzone() { @@ -322,15 +336,11 @@ OSystem_WINCE3::OSystem_WINCE3() : OSystem_SDL(), _saveToolbarState(false), _saveActiveToolbar(NAME_MAIN_PANEL), _rbutton(false), _hasfocus(true), _usesEmulatedMouse(false), _mouseBackupOld(NULL), _mouseBackupToolbar(NULL), _mouseBackupDim(0) { - _isSmartphone = CEDevice::isSmartphone(); - _hasSmartphoneResolution = CEDevice::hasSmartphoneResolution() || CEDevice::isSmartphone(); memset(&_mouseCurState, 0, sizeof(_mouseCurState)); if (_isSmartphone) { _mouseCurState.x = 20; _mouseCurState.y = 20; } - if (_hasSmartphoneResolution) _panelVisible = false; // init correctly in smartphones - create_toolbar(); _mixer = 0; _screen = NULL; @@ -912,7 +922,6 @@ void OSystem_WINCE3::update_game_settings() { } void OSystem_WINCE3::initSize(uint w, uint h) { - if (_hasSmartphoneResolution && h == 240) h = 200; // mainly for the launcher @@ -975,7 +984,6 @@ int OSystem_WINCE3::getDefaultGraphicsMode() const { } bool OSystem_WINCE3::update_scalers() { - if (_mode != GFX_NORMAL) return false; @@ -984,12 +992,21 @@ bool OSystem_WINCE3::update_scalers() { if (CEDevice::hasPocketPCResolution()) { if ( (!_orientationLandscape && (_screenWidth == 320 || !_screenWidth)) || CEDevice::hasSquareQVGAResolution() ) { - _scaleFactorXm = 3; - _scaleFactorXd = 4; - _scaleFactorYm = 1; - _scaleFactorYd = 1; - _scalerProc = PocketPCPortrait; - _modeFlags = 0; + if (getScreenWidth() != 320) { + _scaleFactorXm = 3; + _scaleFactorXd = 4; + _scaleFactorYm = 1; + _scaleFactorYd = 1; + _scalerProc = PocketPCPortrait; + _modeFlags = 0; + } else { + _scaleFactorXm = 1; + _scaleFactorXd = 1; + _scaleFactorYm = 1; + _scaleFactorYd = 1; + _scalerProc = Normal1x; + _modeFlags = 0; + } } else if ( _orientationLandscape && (_screenWidth == 320 || !_screenWidth)) { Common::String gameid(ConfMan.get("gameid")); // consider removing this check and start honoring the _adjustAspectRatio flag if (!_panelVisible && !_hasSmartphoneResolution && !_overlayVisible && !(strncmp(gameid.c_str(), "zak", 3) == 0)) { diff --git a/backends/platform/wince/wince-sdl.h b/backends/platform/wince/wince-sdl.h index 6f7cb7a0c1..0e8e5e53ba 100644 --- a/backends/platform/wince/wince-sdl.h +++ b/backends/platform/wince/wince-sdl.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/x11/x11.cpp b/backends/platform/x11/x11.cpp index 60c6939b2d..56e9b2a79b 100644 --- a/backends/platform/x11/x11.cpp +++ b/backends/platform/x11/x11.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/platform/x11/x11.h b/backends/platform/x11/x11.h index 3a46a3f793..bf5da5745a 100644 --- a/backends/platform/x11/x11.h +++ b/backends/platform/x11/x11.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/plugins/dc/dc-provider.cpp b/backends/plugins/dc/dc-provider.cpp index 46e4b84674..166852655b 100644 --- a/backends/plugins/dc/dc-provider.cpp +++ b/backends/plugins/dc/dc-provider.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/plugins/dc/dc-provider.h b/backends/plugins/dc/dc-provider.h index fd1c053c21..e4db3090ee 100644 --- a/backends/plugins/dc/dc-provider.h +++ b/backends/plugins/dc/dc-provider.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/plugins/dynamic-plugin.h b/backends/plugins/dynamic-plugin.h index 5ceffd7c1e..dd3b84fb53 100644 --- a/backends/plugins/dynamic-plugin.h +++ b/backends/plugins/dynamic-plugin.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/plugins/posix/posix-provider.cpp b/backends/plugins/posix/posix-provider.cpp index 395968918b..ce319840a4 100644 --- a/backends/plugins/posix/posix-provider.cpp +++ b/backends/plugins/posix/posix-provider.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/plugins/posix/posix-provider.h b/backends/plugins/posix/posix-provider.h index 54f7f7406b..df9e81c741 100644 --- a/backends/plugins/posix/posix-provider.h +++ b/backends/plugins/posix/posix-provider.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/plugins/sdl/sdl-provider.cpp b/backends/plugins/sdl/sdl-provider.cpp index 1f7c906fd9..0f67c9a691 100644 --- a/backends/plugins/sdl/sdl-provider.cpp +++ b/backends/plugins/sdl/sdl-provider.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/plugins/sdl/sdl-provider.h b/backends/plugins/sdl/sdl-provider.h index 3cdb9f485e..87607d6a19 100644 --- a/backends/plugins/sdl/sdl-provider.h +++ b/backends/plugins/sdl/sdl-provider.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/plugins/win32/win32-provider.cpp b/backends/plugins/win32/win32-provider.cpp index b88f900027..eeea3b805c 100644 --- a/backends/plugins/win32/win32-provider.cpp +++ b/backends/plugins/win32/win32-provider.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,6 +29,8 @@ #include "backends/plugins/dynamic-plugin.h" #include "common/fs.h" +#include <windows.h> + #define PLUGIN_DIRECTORY "" #define PLUGIN_PREFIX "" #define PLUGIN_SUFFIX ".dll" diff --git a/backends/plugins/win32/win32-provider.h b/backends/plugins/win32/win32-provider.h index fedeeb6ae9..d653c5b534 100644 --- a/backends/plugins/win32/win32-provider.h +++ b/backends/plugins/win32/win32-provider.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/saves/compressed/compressed-saves.cpp b/backends/saves/compressed/compressed-saves.cpp index 07dc0d2d29..83c33fdae5 100644 --- a/backends/saves/compressed/compressed-saves.cpp +++ b/backends/saves/compressed/compressed-saves.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/saves/compressed/compressed-saves.h b/backends/saves/compressed/compressed-saves.h index 5bda5183bd..031007ef8b 100644 --- a/backends/saves/compressed/compressed-saves.h +++ b/backends/saves/compressed/compressed-saves.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/saves/default/default-saves.cpp b/backends/saves/default/default-saves.cpp index f6a13b0d68..1898a23f2a 100644 --- a/backends/saves/default/default-saves.cpp +++ b/backends/saves/default/default-saves.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/saves/default/default-saves.h b/backends/saves/default/default-saves.h index 6eeee417e7..3aea1495a4 100644 --- a/backends/saves/default/default-saves.h +++ b/backends/saves/default/default-saves.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/saves/savefile.cpp b/backends/saves/savefile.cpp index 567dcba516..4b50e9c57d 100644 --- a/backends/saves/savefile.cpp +++ b/backends/saves/savefile.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp index aa9d4c9fec..5dfb3bdc83 100644 --- a/backends/timer/default/default-timer.cpp +++ b/backends/timer/default/default-timer.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/backends/timer/default/default-timer.h b/backends/timer/default/default-timer.h index 40c5cfcc32..2a999c6e0f 100644 --- a/backends/timer/default/default-timer.h +++ b/backends/timer/default/default-timer.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 5583eed30a..b273e50f81 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -245,18 +247,17 @@ void registerDefaults() { } \ const char *option = s; \ if (*s == '\0' && !isLongCmd) { option = s2; i++; } \ - if (!option) option = defaultVal; \ + if (!option || *option == '\0') option = defaultVal; \ if (option) settings[longCmd] = option; // Use this for options which have a required (string) value #define DO_OPTION(shortCmd, longCmd) \ DO_OPTION_OPT(shortCmd, longCmd, 0) \ - if (!option) usage("Option '%s' requires an argument", argv[i-1]); + if (!option) usage("Option '%s' requires an argument", argv[isLongCmd ? i : i-1]); // Use this for options which have a required integer value #define DO_OPTION_INT(shortCmd, longCmd) \ - DO_OPTION_OPT(shortCmd, longCmd, 0) \ - if (!option) usage("Option '%s' requires an argument", argv[i-1]); \ + DO_OPTION(shortCmd, longCmd) \ char *endptr = 0; \ int intValue; intValue = (int)strtol(option, &endptr, 0); \ if (endptr == NULL || *endptr != 0) usage("--%s: Invalid number '%s'", longCmd, option); diff --git a/base/commandLine.h b/base/commandLine.h index dbf1776c74..794e08b651 100644 --- a/base/commandLine.h +++ b/base/commandLine.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/base/game.cpp b/base/game.cpp index 5327f35a36..960d9ef9f1 100644 --- a/base/game.cpp +++ b/base/game.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/base/game.h b/base/game.h index 8ff8fc8f3d..9fd997c241 100644 --- a/base/game.h +++ b/base/game.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/base/main.cpp b/base/main.cpp index e353d78deb..38e93e2961 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/base/main.h b/base/main.h index 82f6058535..decdaa1c27 100644 --- a/base/main.h +++ b/base/main.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/base/plugins.cpp b/base/plugins.cpp index 7e614dd2bd..382ea4f640 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -139,6 +141,8 @@ public: #pragma mark - +DECLARE_SINGLETON(PluginManager); + PluginManager::PluginManager() { #ifndef DYNAMIC_MODULES // Add the static plugin provider if we do not build with dynamic diff --git a/base/plugins.h b/base/plugins.h index 9b20c6fbdd..2ac87882af 100644 --- a/base/plugins.h +++ b/base/plugins.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/base/version.cpp b/base/version.cpp index 8f354444f3..b41ec00ea0 100644 --- a/base/version.cpp +++ b/base/version.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/base/version.h b/base/version.h index 1cbdc0bb2d..268fd5667e 100644 --- a/base/version.h +++ b/base/version.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/advancedDetector.cpp b/common/advancedDetector.cpp index 84b8365584..24e884a164 100644 --- a/common/advancedDetector.cpp +++ b/common/advancedDetector.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -69,7 +72,7 @@ GameList gameIDList(const Common::ADParams ¶ms) { return GameList(params.list); } -void upgradeTargetIfNecessary(const Common::ADParams ¶ms) { +static void upgradeTargetIfNecessary(const Common::ADParams ¶ms) { if (params.obsoleteList == 0) return; @@ -97,25 +100,21 @@ GameDescriptor findGameID( const PlainGameDescriptor *g = params.list; while (g->gameid) { if (0 == scumm_stricmp(gameid, g->gameid)) - return *g; + return GameDescriptor(*g); g++; } - GameDescriptor gs; - if (params.obsoleteList != 0) { const Common::ADObsoleteGameID *o = params.obsoleteList; while (o->from) { if (0 == scumm_stricmp(gameid, o->from)) { - gs["gameid"] = gameid; - gs["description"] = "Obsolete game ID"; - return gs; + return GameDescriptor(gameid, "Obsolete game ID"); } o++; } - } else - return GameDescriptor(g->gameid, g->description); - return gs; + } + + return GameDescriptor(); } static GameDescriptor toGameDescriptor(const ADGameDescription &g, const PlainGameDescriptor *sg) { @@ -221,6 +220,9 @@ const ADGameDescription *detectBestMatchingGame( PluginError detectGameForEngineCreation( const Common::ADParams ¶ms ) { + + upgradeTargetIfNecessary(params); + Common::String gameid = ConfMan.get("gameid"); FSList fslist; diff --git a/common/advancedDetector.h b/common/advancedDetector.h index ec8249db83..fab847e671 100644 --- a/common/advancedDetector.h +++ b/common/advancedDetector.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -207,9 +210,7 @@ GameList detectAllGames(const FSList &fslist, const Common::ADParams ¶ms); const ADGameDescription *detectBestMatchingGame(const Common::ADParams ¶ms); // FIXME/TODO: Rename this function to something more sensible. -void upgradeTargetIfNecessary(const Common::ADParams ¶ms); - -// FIXME/TODO: Rename this function to something more sensible. +// Only used by ADVANCED_DETECTOR_DEFINE_PLUGIN_WITH_FUNC PluginError detectGameForEngineCreation(const Common::ADParams ¶ms); @@ -237,7 +238,6 @@ PluginError detectGameForEngineCreation(const Common::ADParams ¶ms); PluginError Engine_##engine##_create(OSystem *syst, Engine **engine) { \ assert(syst); \ assert(engine); \ - Common::AdvancedDetector::upgradeTargetIfNecessary(params); \ PluginError err = Common::AdvancedDetector::detectGameForEngineCreation(params); \ if (err == kNoError) \ *engine = factoryFunc(syst); \ diff --git a/common/algorithm.h b/common/algorithm.h index 616dc67317..19fb397fd8 100644 --- a/common/algorithm.h +++ b/common/algorithm.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/array.h b/common/array.h index 97ee6abdf4..af9ec811da 100644 --- a/common/array.h +++ b/common/array.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/config-file.cpp b/common/config-file.cpp index eef70ef1b9..c89c169b44 100644 --- a/common/config-file.cpp +++ b/common/config-file.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/config-file.h b/common/config-file.h index 2e1e80ed10..3f0812dd2b 100644 --- a/common/config-file.h +++ b/common/config-file.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 41f3c1a7e9..5c0cd7c40f 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -33,6 +35,8 @@ #include "common/file.h" #include "common/util.h" +DECLARE_SINGLETON(Common::ConfigManager); + #ifdef __PLAYSTATION2__ #include "backends/platform/ps2/systemps2.h" #endif diff --git a/common/config-manager.h b/common/config-manager.h index 9561ce01c3..79f56c5bca 100644 --- a/common/config-manager.h +++ b/common/config-manager.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/endian.h b/common/endian.h index c2e9267b58..685af27a17 100644 --- a/common/endian.h +++ b/common/endian.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/events.h b/common/events.h index 1f05188d90..9b434e94f9 100644 --- a/common/events.h +++ b/common/events.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -34,7 +37,7 @@ namespace Common { * @see Event * * @todo Merge EVENT_LBUTTONDOWN, EVENT_RBUTTONDOWN and EVENT_WHEELDOWN; - * likewiese EVENT_LBUTTONUP, EVENT_RBUTTONUP, EVENT_WHEELUP. + * likewise EVENT_LBUTTONUP, EVENT_RBUTTONUP, EVENT_WHEELUP. * To do that, we just have to add a field to the Event which * indicates which button was pressed. */ @@ -53,7 +56,8 @@ enum EventType { EVENT_WHEELDOWN = 9, EVENT_QUIT = 10, - EVENT_SCREEN_CHANGED = 11 + EVENT_SCREEN_CHANGED = 11, + EVENT_PREDICTIVE_DIALOG = 12 }; /** diff --git a/common/file.cpp b/common/file.cpp index 9ccfcd85ba..2eba1bcb3d 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/file.h b/common/file.h index c5371098c5..3d816a6104 100644 --- a/common/file.h +++ b/common/file.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/fs.cpp b/common/fs.cpp index e9c673abb2..ef106c2488 100644 --- a/common/fs.cpp +++ b/common/fs.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/fs.h b/common/fs.h index 6a89bfcdaf..5e441a212f 100644 --- a/common/fs.h +++ b/common/fs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/func.h b/common/func.h index 19d0ceafec..a424fcf205 100644 --- a/common/func.h +++ b/common/func.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -247,7 +250,7 @@ template <typename T> struct Hash; #define GENERATE_TRIVIAL_HASH_FUNCTOR(T) \ - template <> struct Hash<T> { \ + template <> struct Hash<T> : public UnaryFunction<T, uint> { \ uint operator()(T val) const { return (uint)val; } \ } diff --git a/common/hash-str.h b/common/hash-str.h index 99ebf99a10..5575735f1d 100644 --- a/common/hash-str.h +++ b/common/hash-str.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/hashmap.cpp b/common/hashmap.cpp index 1bab04a6a1..4749234740 100644 --- a/common/hashmap.cpp +++ b/common/hashmap.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/hashmap.h b/common/hashmap.h index 982e3df70f..28ba022e70 100644 --- a/common/hashmap.h +++ b/common/hashmap.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/iff_container.h b/common/iff_container.h index 730163254f..0d07b5bd57 100644 --- a/common/iff_container.h +++ b/common/iff_container.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/common/iff_container.h $ + * $Id:iff_container.h 26949 2007-05-26 20:23:24Z david_corrales $ */ #ifndef COMMON_IFF_CONTAINER_H diff --git a/common/list.h b/common/list.h index 68a464d194..1fda266da9 100644 --- a/common/list.h +++ b/common/list.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/md5.cpp b/common/md5.cpp index 700897e08f..a48ecb4948 100644 --- a/common/md5.cpp +++ b/common/md5.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -301,37 +304,37 @@ bool md5_file(ReadStream &stream, uint8 digest[16], uint32 length) { return true; } -bool md5_file_string(const FilesystemNode &file, char md5str[32+1], uint32 length) { +bool md5_file_string(const FilesystemNode &file, char *md5str, uint32 length) { uint8 digest[16]; if (!md5_file(file, digest, length)) return false; for (int i = 0; i < 16; i++) { - sprintf(md5str + i*2, "%02x", (int)digest[i]); + snprintf(md5str + i*2, 3, "%02x", (int)digest[i]); } return true; } -bool md5_file_string(const char *name, char md5str[32+1], uint32 length) { +bool md5_file_string(const char *name, char *md5str, uint32 length) { uint8 digest[16]; if (!md5_file(name, digest, length)) return false; for (int i = 0; i < 16; i++) { - sprintf(md5str + i*2, "%02x", (int)digest[i]); + snprintf(md5str + i*2, 3, "%02x", (int)digest[i]); } return true; } -bool md5_file_string(ReadStream &stream, char md5str[32+1], uint32 length) { +bool md5_file_string(ReadStream &stream, char *md5str, uint32 length) { uint8 digest[16]; if (!md5_file(stream, digest, length)) return false; for (int i = 0; i < 16; i++) { - sprintf(md5str + i*2, "%02x", (int)digest[i]); + snprintf(md5str + i*2, 3, "%02x", (int)digest[i]); } return true; diff --git a/common/md5.h b/common/md5.h index 6700ff355f..578c363e8c 100644 --- a/common/md5.h +++ b/common/md5.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -35,9 +38,10 @@ bool md5_file(ReadStream &stream, uint8 digest[16], uint32 length = 0); // The following two methods work similar to the above two, but // instead of computing the binary MD5 digest, they produce // a human readable lowercase hexstring representing the digest. -bool md5_file_string(const char *name, char md5str[32+1], uint32 length = 0); -bool md5_file_string(const FilesystemNode &file, char md5str[32+1], uint32 length = 0); -bool md5_file_string(ReadStream &stream, char md5str[32+1], uint32 length = 0); +// The md5str parameter must point to a buffer of 32+1 chars. +bool md5_file_string(const char *name, char *md5str, uint32 length = 0); +bool md5_file_string(const FilesystemNode &file, char *md5str, uint32 length = 0); +bool md5_file_string(ReadStream &stream, char *md5str, uint32 length = 0); } // End of namespace Common diff --git a/common/mutex.cpp b/common/mutex.cpp index 3ce520cffe..693b14db2f 100644 --- a/common/mutex.cpp +++ b/common/mutex.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/mutex.h b/common/mutex.h index ca332b32ad..236d75d958 100644 --- a/common/mutex.h +++ b/common/mutex.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/noncopyable.h b/common/noncopyable.h index 7fafc44121..e0af397546 100644 --- a/common/noncopyable.h +++ b/common/noncopyable.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/pack-end.h b/common/pack-end.h index 28461e16a7..701b12dccc 100644 --- a/common/pack-end.h +++ b/common/pack-end.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/pack-start.h b/common/pack-start.h index b39238d03b..0b2c3eff82 100644 --- a/common/pack-start.h +++ b/common/pack-start.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/rect.h b/common/rect.h index be1035669a..b4355052f6 100644 --- a/common/rect.h +++ b/common/rect.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/savefile.h b/common/savefile.h index 9d781b92f8..e1a54638b5 100644 --- a/common/savefile.h +++ b/common/savefile.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/scummsys.h b/common/scummsys.h index 0ba3f67bd8..e4f52295fb 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/singleton.h b/common/singleton.h index f26324999e..56039afb37 100644 --- a/common/singleton.h +++ b/common/singleton.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -37,6 +39,8 @@ private: Singleton<T>(const Singleton<T>&); Singleton<T>& operator= (const Singleton<T>&); + static T* _singleton; + /** * The default object factory used by the template class Singleton. * By specialising this template function, one can make a singleton use a @@ -56,13 +60,16 @@ public: public: static T& instance() { - // TODO: We aren't thread safe. + // TODO: We aren't thread safe. For now we ignore it since the + // only thing using this singleton template is the config manager, + // and that is first instantiated long before any threads. // TODO: We don't leak, but the destruction order is nevertheless // semi-random. If we use multiple singletons, the destruction // order might become an issue. There are various approaches // to solve that problem, but for now this is sufficient - static T *instance = T::makeInstance(); - return *instance; + if (!_singleton) + _singleton = T::makeInstance(); + return *_singleton; } protected: Singleton<T>() { } @@ -75,6 +82,8 @@ protected: typedef T SingletonBaseType; }; +#define DECLARE_SINGLETON(T) template<> T* Common::Singleton<T>::_singleton=0 + } // End of namespace Common #endif diff --git a/common/stack.h b/common/stack.h index 127f8a5cf5..1d38c7d2ac 100644 --- a/common/stack.h +++ b/common/stack.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/stdafx.h b/common/stdafx.h index dde816d361..19f2bc8aef 100644 --- a/common/stdafx.h +++ b/common/stdafx.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/str.cpp b/common/str.cpp index e5272bd133..01d24c1e75 100644 --- a/common/str.cpp +++ b/common/str.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/str.h b/common/str.h index 9fbb6734f5..509300dd6f 100644 --- a/common/str.h +++ b/common/str.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/stream.cpp b/common/stream.cpp index 55ada03195..c94faf7ec0 100644 --- a/common/stream.cpp +++ b/common/stream.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/stream.h b/common/stream.h index 783415025a..9b3ac5a501 100644 --- a/common/stream.h +++ b/common/stream.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/system.cpp b/common/system.cpp index 17ecb3f124..2720a19775 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/system.h b/common/system.h index c1ff066095..ccca1fb7c7 100644 --- a/common/system.h +++ b/common/system.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/timer.h b/common/timer.h index 30a733aaee..68f8aef258 100644 --- a/common/timer.h +++ b/common/timer.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/unzip.cpp b/common/unzip.cpp index abfbdcc4fe..379c20dc02 100644 --- a/common/unzip.cpp +++ b/common/unzip.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/unzip.h b/common/unzip.h index 1fa8f775f2..0152690516 100644 --- a/common/unzip.h +++ b/common/unzip.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/util.cpp b/common/util.cpp index 5e5d719e31..fc5fe9a4e5 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/common/util.h b/common/util.h index d6cfeca89f..2325ba523a 100644 --- a/common/util.h +++ b/common/util.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1025,6 +1025,22 @@ POST_OBJS_FLAGS := LIBS += -ldl ' ;; + *mingw32*) +_def_plugin=' +#define PLUGIN_PREFIX "" +#define PLUGIN_SUFFIX ".dll" +' +_mak_plugins=' +BUILD_PLUGINS := 1 +PLUGIN_PREFIX := +PLUGIN_SUFFIX := .dll +PLUGIN_EXTRA_DEPS = $(EXECUTABLE) +CXXFLAGS += -DDYNAMIC_MODULES +PLUGIN_LDFLAGS := -shared ./libscummvm.a $(LIBS) +PRE_OBJS_FLAGS := -Wl,--whole-archive +POST_OBJS_FLAGS := -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a +' + ;; *) _build_plugins=no _mak_plugins= @@ -1276,7 +1292,7 @@ fi # figure out installation directories # test -z "$_bindir" && _bindir="$_prefix/bin" -test -z "$_mandir" && _mandir="$_prefix/man" +test -z "$_mandir" && _mandir="$_prefix/share/man" test -z "$_datadir" && _datadir="$_prefix/share" DEFINES="$DEFINES -DDATA_PATH=\\\"$_datadir/scummvm\\\"" @@ -1480,6 +1496,7 @@ NASMFLAGS := $NASMFLAGS PREFIX := $_prefix BINDIR := $_bindir MANDIR := $_mandir +DATADIR := $_datadir $_mak_plugins diff --git a/dists/debian/changelog b/dists/debian/changelog index 76deaf3dda..2e653c8e33 100644 --- a/dists/debian/changelog +++ b/dists/debian/changelog @@ -1,3 +1,16 @@ +scummvm (0.10.0-0svn20070530) experimental; urgency=low + + * SVN snapshot. + + Builder: Timo Röhling <timo@glueckspilz.farm.lokal> + Build-date: Wed, 30 May 2007 11:54:05 +0200 + + Please don't file bugs you find in this package in the Debian Bug Tracking + system, use the ScummVM team's own bug tracker instead. You can find this + tracker at <http://sourceforge.net/tracker/?group_id=37116>. + + -- Tore Anderson <tore@debian.org> Wed, 30 May 2007 11:54:05 +0200 + scummvm (0.7.1-1) unstable; urgency=low * New upstream release. diff --git a/dists/debian/control b/dists/debian/control index 26ddbacf55..6b9d6025a9 100644 --- a/dists/debian/control +++ b/dists/debian/control @@ -2,7 +2,7 @@ Source: scummvm Section: games Priority: optional Maintainer: Tore Anderson <tore@debian.org> -Build-Depends: debhelper (>> 4.0.0), nasm [i386], tetex-bin, tetex-extra, gs-gpl, libsdl1.2-dev, libmad0-dev, libasound2-dev, libvorbis-dev (>= 1.0.0-2), libmpeg2-4-dev, libflac-dev (>= 1.1.1-2), libz-dev, libfluidsynth-dev +Build-Depends: debhelper (>> 4.0.0), nasm [i386], libsdl1.2-dev, libmad0-dev, libasound2-dev, libvorbis-dev (>= 1.0.0-2), libmpeg2-4-dev, libflac-dev (>= 1.1.1-2), libz-dev, libfluidsynth-dev Standards-Version: 3.6.1.1 Package: scummvm diff --git a/dists/debian/prepare b/dists/debian/prepare index 8b684898e7..0f86ca742b 100755 --- a/dists/debian/prepare +++ b/dists/debian/prepare @@ -19,7 +19,7 @@ cat debian/changelog > $TMP cat << __eof > debian/changelog scummvm ($VERSION) experimental; urgency=low - * CVS snapshot. + * SVN snapshot. Builder: $GECOS <$USERNAME@$DOMAIN> Build-date: $DATE diff --git a/dists/debian/rules b/dists/debian/rules index 42c2068239..f8f64aea07 100755 --- a/dists/debian/rules +++ b/dists/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -build: doc/README.pdf scummvm +build: scummvm doc/README.pdf: (cd doc; latex readme.tex) @@ -11,15 +11,15 @@ doc/README.pdf: scummvm: dh_testdir - ./configure + ./configure --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games --mandir=/usr/share/man $(MAKE) clean: dh_testdir dh_testroot -$(MAKE) distclean - -rm doc/readme.aux doc/readme.dvi doc/readme.log doc/readme.out \ - doc/readme.toc doc/README.pdf + #-rm doc/readme.aux doc/readme.dvi doc/readme.log doc/readme.out \ + # doc/readme.toc doc/README.pdf dh_clean install: build @@ -27,8 +27,9 @@ install: build dh_testroot dh_clean dh_installdirs - install -m0755 scummvm debian/scummvm/usr/games/scummvm - install -m0644 icons/scummvm.xpm debian/scummvm/usr/share/icons + $(MAKE) install DESTDIR=debian/scummvm + install -m 644 dists/scummvm.desktop debian/scummvm/usr/share/applications + install -m 644 icons/scummvm.svg debian/scummvm/usr/share/pixmaps binary: binary-arch diff --git a/dists/debian/scummvm.dirs b/dists/debian/scummvm.dirs index db81009bfb..82ae8dd1b1 100644 --- a/dists/debian/scummvm.dirs +++ b/dists/debian/scummvm.dirs @@ -1,3 +1,4 @@ usr/games usr/share/man/man6 usr/share/icons +usr/share/applications diff --git a/dists/debian/scummvm.docs b/dists/debian/scummvm.docs index 92723f9744..ca0272abfc 100644 --- a/dists/debian/scummvm.docs +++ b/dists/debian/scummvm.docs @@ -1,4 +1,3 @@ AUTHORS README TODO -doc/README.pdf diff --git a/dists/debian/scummvm.manpages b/dists/debian/scummvm.manpages index 9e5cb61ef9..7b3eb23799 100644 --- a/dists/debian/scummvm.manpages +++ b/dists/debian/scummvm.manpages @@ -1 +1 @@ -scummvm.6 +dists/scummvm.6 diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in index 77095f6ff6..9074acc876 100644 --- a/dists/macosx/Info.plist.in +++ b/dists/macosx/Info.plist.in @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>scummvm</string> <key>CFBundleGetInfoString</key> - <string>@VERSION@, Copyright 2001-2006 The ScummVM team</string> + <string>@VERSION@, Copyright 2001-2007 The ScummVM team</string> <key>CFBundleIconFile</key> <string>scummvm.icns</string> <key>CFBundleIdentifier</key> @@ -27,6 +27,6 @@ <key>NSPrincipalClass</key> <string>NSApplication</string> <key>NSHumanReadableCopyright</key> - <string>Copyright 2001-2006 The ScummVM team</string> + <string>Copyright 2001-2007 The ScummVM team</string> </dict> </plist> diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj index 5edbdff265..01747e836c 100644 --- a/dists/msvc8/scummvm.vcproj +++ b/dists/msvc8/scummvm.vcproj @@ -74,8 +74,9 @@ IgnoreDefaultLibraryNames="libc.lib;libcmt.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/scummvm.pdb" - SubSystem="2" + SubSystem="1" TargetMachine="1" + EntryPointSymbol="WinMainCRTStartup" /> <Tool Name="VCALinkTool" @@ -132,7 +133,7 @@ InlineFunctionExpansion="1" OmitFramePointers="true" AdditionalIncludeDirectories="../..;../../engines" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU" StringPooling="true" MinimalRebuild="false" ExceptionHandling="1" @@ -258,6 +259,10 @@ > </File> <File + RelativePath="..\..\common\algorithm.h" + > + </File> + <File RelativePath="..\..\common\array.h" > </File> diff --git a/dists/scummvm.rc b/dists/scummvm.rc index acc16c10ae..5cf3aacac9 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -27,7 +27,7 @@ BEGIN VALUE "FileDescription", "http://www.scummvm.org/\0" VALUE "FileVersion", "0.10.0svn\0" VALUE "InternalName", "scummvm\0" - VALUE "LegalCopyright", "Copyright © 2001-2006 The ScummVM Team\0" + VALUE "LegalCopyright", "Copyright © 2001-2007 The ScummVM Team\0" VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0" VALUE "OriginalFilename", "scummvm.exe\0" VALUE "ProductName", "ScummVM\0" diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in index 8c83a1a4e0..a89b45a70f 100644 --- a/dists/scummvm.rc.in +++ b/dists/scummvm.rc.in @@ -27,7 +27,7 @@ BEGIN VALUE "FileDescription", "http://www.scummvm.org/\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "scummvm\0" - VALUE "LegalCopyright", "Copyright © 2001-2006 The ScummVM Team\0" + VALUE "LegalCopyright", "Copyright © 2001-2007 The ScummVM Team\0" VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0" VALUE "OriginalFilename", "scummvm.exe\0" VALUE "ProductName", "ScummVM\0" diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index 5e3dc23e6a..a0496bf00b 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -26,7 +27,6 @@ #include "common/events.h" #include "common/file.h" -//#include "common/fs.h" #include "common/savefile.h" #include "common/config-manager.h" @@ -68,6 +68,19 @@ void AgiEngine::processEvents() { _gfx->deinitMachine(); _system->quit(); break; + case Common::EVENT_PREDICTIVE_DIALOG: + if (_game.playerControl && predictiveDialog()) { + if (_game.inputMode == INPUT_NORMAL) { + strcpy((char *)_game.inputBuffer, _predictiveResult); + handleKeys(KEY_ENTER); + } else if (_game.inputMode == INPUT_GETSTRING) { + strcpy(_game.strings[_stringdata.str], _predictiveResult); + newInputMode(INPUT_NORMAL); + _gfx->printCharacter(_stringdata.x + strlen(_game.strings[_stringdata.str]) + 1, + _stringdata.y, ' ', _game.colorFg, _game.colorBg); + } + } + break; case Common::EVENT_LBUTTONDOWN: key = BUTTON_LEFT; g_mouse.button = 1; diff --git a/engines/agi/agi.h b/engines/agi/agi.h index a1f979a28b..0167609514 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/agi_v2.cpp b/engines/agi/agi_v2.cpp index f9db715622..375bbec411 100644 --- a/engines/agi/agi_v2.cpp +++ b/engines/agi/agi_v2.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/agi_v3.cpp b/engines/agi/agi_v3.cpp index 7b295f1663..3e90dc11f1 100644 --- a/engines/agi/agi_v3.cpp +++ b/engines/agi/agi_v3.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/checks.cpp b/engines/agi/checks.cpp index d721d844e2..c9fafbbbbf 100644 --- a/engines/agi/checks.cpp +++ b/engines/agi/checks.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/console.cpp b/engines/agi/console.cpp index 177a1b5882..874ff29e3a 100644 --- a/engines/agi/console.cpp +++ b/engines/agi/console.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2002 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/console.h b/engines/agi/console.h index 81f18b9b9f..ad955d51ae 100644 --- a/engines/agi/console.h +++ b/engines/agi/console.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp index 6e485eb92a..22d2582021 100644 --- a/engines/agi/cycle.cpp +++ b/engines/agi/cycle.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index a6e5549ff4..9f6f0e7156 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1902,11 +1905,9 @@ Common::ADGameDescList fallbackDetector(const FSList *fslist) { char name[8]; for (IntMap::const_iterator f = allFiles.begin(); f != allFiles.end(); ++f) { - debug(" --> %s", f->_key.c_str()); if (f->_key.hasSuffix("vol.0")) { memset(name, 0, 8); strncpy(name, f->_key.c_str(), f->_key.size() > 5 ? f->_key.size() - 5 : f->_key.size()); - debug("YEAH! (%s)", name); if (allFiles.contains("object") && allFiles.contains("words.tok") && allFiles.contains(Common::String(name) + "dir")) { diff --git a/engines/agi/font.h b/engines/agi/font.h index b876e6eea3..12b36f2520 100644 --- a/engines/agi/font.h +++ b/engines/agi/font.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/global.cpp b/engines/agi/global.cpp index 502f58466b..0baf8c259c 100644 --- a/engines/agi/global.cpp +++ b/engines/agi/global.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp index 072fd8f714..8f62ccc08d 100644 --- a/engines/agi/graphics.cpp +++ b/engines/agi/graphics.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/graphics.h b/engines/agi/graphics.h index be79db6858..cdbae8d6e6 100644 --- a/engines/agi/graphics.h +++ b/engines/agi/graphics.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/id.cpp b/engines/agi/id.cpp index 1dc1a6a004..aba19eb64d 100644 --- a/engines/agi/id.cpp +++ b/engines/agi/id.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/inv.cpp b/engines/agi/inv.cpp index f8014a2bc9..d05570c957 100644 --- a/engines/agi/inv.cpp +++ b/engines/agi/inv.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp index 5cfcf1dba5..17865e1f3a 100644 --- a/engines/agi/keyboard.cpp +++ b/engines/agi/keyboard.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/keyboard.h b/engines/agi/keyboard.h index 67e4679b65..3475f76ee4 100644 --- a/engines/agi/keyboard.h +++ b/engines/agi/keyboard.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/logic.cpp b/engines/agi/logic.cpp index 04052df682..210684b0bc 100644 --- a/engines/agi/logic.cpp +++ b/engines/agi/logic.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/logic.h b/engines/agi/logic.h index d8d14eb023..a6c0afa6bf 100644 --- a/engines/agi/logic.h +++ b/engines/agi/logic.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/lzw.cpp b/engines/agi/lzw.cpp index 31a095dc40..f0c7fd06b6 100644 --- a/engines/agi/lzw.cpp +++ b/engines/agi/lzw.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/lzw.h b/engines/agi/lzw.h index f09c4e0b05..5e1f74c819 100644 --- a/engines/agi/lzw.h +++ b/engines/agi/lzw.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/menu.cpp b/engines/agi/menu.cpp index 6c0a407a35..5edaaf0ded 100644 --- a/engines/agi/menu.cpp +++ b/engines/agi/menu.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2002 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/menu.h b/engines/agi/menu.h index d9a10b8310..0196c75583 100644 --- a/engines/agi/menu.h +++ b/engines/agi/menu.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/motion.cpp b/engines/agi/motion.cpp index 3c88c01054..05477c0d99 100644 --- a/engines/agi/motion.cpp +++ b/engines/agi/motion.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/objects.cpp b/engines/agi/objects.cpp index 8eab5eac43..4c49a6014b 100644 --- a/engines/agi/objects.cpp +++ b/engines/agi/objects.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp index ef09b319fa..a51f536b49 100644 --- a/engines/agi/op_cmd.cpp +++ b/engines/agi/op_cmd.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/op_dbg.cpp b/engines/agi/op_dbg.cpp index 365a0fe5e5..7b0a8f8082 100644 --- a/engines/agi/op_dbg.cpp +++ b/engines/agi/op_dbg.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/op_test.cpp b/engines/agi/op_test.cpp index 3ee56e5786..0baa130daf 100644 --- a/engines/agi/op_test.cpp +++ b/engines/agi/op_test.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/opcodes.h b/engines/agi/opcodes.h index e8a29c77d5..0267a63ea9 100644 --- a/engines/agi/opcodes.h +++ b/engines/agi/opcodes.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/picture.cpp b/engines/agi/picture.cpp index 2e7ce38598..9a16d4ab20 100644 --- a/engines/agi/picture.cpp +++ b/engines/agi/picture.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/picture.h b/engines/agi/picture.h index c218479687..6a3f641eca 100644 --- a/engines/agi/picture.h +++ b/engines/agi/picture.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp index 731384b5c7..5e086de2bb 100644 --- a/engines/agi/predictive.cpp +++ b/engines/agi/predictive.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -114,7 +117,7 @@ bool AgiEngine::predictiveDialog(void) { int bx[17], by[17]; String prefix = ""; char temp[MAXWORDLEN + 1]; - + AgiBlock tmpwindow; // FIXME: Move this to a more appropriate place. initAsciiToNumTable(); @@ -146,6 +149,11 @@ bool AgiEngine::predictiveDialog(void) { return false; } + // show the predictive dialog. + // if another window is already in display, save its state into tmpwindow + tmpwindow.active = false; + if (_game.window.active) + memcpy(&tmpwindow, &(_game.window), sizeof(AgiBlock)); drawWindow(50, 40, 269, 159); _gfx->drawRectangle(62, 54, 249, 66, MSG_BOX_TEXT); _gfx->flushBlock(62, 54, 249, 66); @@ -310,7 +318,17 @@ bool AgiEngine::predictiveDialog(void) { _predictiveResult[prefix.size() + _currentCode.size() + 1] = 0; getout: - closeWindow(); + // if another window was shown, bring it up again + if (!tmpwindow.active) + closeWindow(); + else { + _gfx->restoreBlock(_game.window.x1, _game.window.y1, + _game.window.x2, _game.window.y2, _game.window.buffer); + + free(_game.window.buffer); + memcpy(&(_game.window), &tmpwindow, sizeof(AgiBlock)); + _gfx->doUpdate(); + } return rc; } diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp index 94701baa32..ab5f818d17 100644 --- a/engines/agi/saveload.cpp +++ b/engines/agi/saveload.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp index 2863f7b16b..954cca8f8f 100644 --- a/engines/agi/sound.cpp +++ b/engines/agi/sound.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/sound.h b/engines/agi/sound.h index 5f67faa142..5b3a16668b 100644 --- a/engines/agi/sound.h +++ b/engines/agi/sound.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/sprite.cpp b/engines/agi/sprite.cpp index f2b4b24148..2d8bb38741 100644 --- a/engines/agi/sprite.cpp +++ b/engines/agi/sprite.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/sprite.h b/engines/agi/sprite.h index d818365adc..2f703e352a 100644 --- a/engines/agi/sprite.h +++ b/engines/agi/sprite.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/text.cpp b/engines/agi/text.cpp index 8f3f0a7a44..565e94fa26 100644 --- a/engines/agi/text.cpp +++ b/engines/agi/text.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/view.cpp b/engines/agi/view.cpp index 808f227f6e..f80e4b6447 100644 --- a/engines/agi/view.cpp +++ b/engines/agi/view.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2003 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/view.h b/engines/agi/view.h index ecc9fd65a9..a20d63793a 100644 --- a/engines/agi/view.h +++ b/engines/agi/view.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2001 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agi/words.cpp b/engines/agi/words.cpp index caa1863c9c..5fc3c3bca9 100644 --- a/engines/agi/words.cpp +++ b/engines/agi/words.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Copyright (C) 1999-2002 Sarien Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index b50242d32c..33737057f8 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -25,7 +27,6 @@ #include "common/config-manager.h" #include "common/file.h" -//#include "common/fs.h" #include "common/system.h" #include "agos/debugger.h" @@ -156,6 +157,9 @@ AGOSEngine::AGOSEngine(OSystem *syst) _stringIdLocalMin = 0; _stringIdLocalMax = 0; + _stateList = 0; + _numRoomStates = 0; + _menuBase = 0; _roomsList = 0; @@ -395,6 +399,7 @@ AGOSEngine::AGOSEngine(OSystem *syst) _findNextPtr = 0; _agosMenu = 0; + _currentRoom = 0; _superRoomNumber = 0; _wallOn = 0; @@ -964,14 +969,14 @@ int AGOSEngine::go() { for (i = 0; i < 4; i++) { setWindowImage(3, 9902 + i); debug(0, "Displaying image %d", 9902 + i); - delay(1000); + delay(3000); } for (i = 4; i < 16; i++) { setWindowImage(4, 9902 + i); debug(0, "Displaying image %d", 9902 + i); - delay(1000); + delay(3000); } } } diff --git a/engines/agos/agos.h b/engines/agos/agos.h index 83e46f9723..d51c1169cf 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -233,6 +235,9 @@ protected: byte **_localStringtable; uint _stringIdLocalMin, _stringIdLocalMax; + byte *_stateList; + uint _numRoomStates; + byte *_menuBase; byte *_roomsList; @@ -313,7 +318,7 @@ protected: int _agosMenu; byte _textMenu[10]; - uint _superRoomNumber; + uint _currentRoom, _superRoomNumber; uint _wallOn; uint16 _hyperLink, _newLines; @@ -568,6 +573,7 @@ protected: void readGamePcFile(Common::SeekableReadStream *in); void decompressData(const char *srcName, byte *dst, uint32 offset, uint32 srcSize, uint32 dstSize); void loadOffsets(const char *filename, int number, uint32 &file, uint32 &offset, uint32 &compressedSize, uint32 &size); + void loadSound(uint sound); void loadSound(uint sound, int pan, int vol, uint type); void loadVoice(uint speechId); @@ -723,6 +729,8 @@ protected: void mouseOff(); void mouseOn(); + bool loadRoomItems(uint item); + virtual bool loadTablesIntoMem(uint subr_id); bool loadXTablesIntoMem(uint subr_id); void loadTextIntoMem(uint stringId); @@ -1328,7 +1336,7 @@ public: void oe2_ifExitOpen(); void oe2_ifExitClosed(); void oe2_ifExitLocked(); - void oe2_unk174(); + void oe2_playEffect(); void oe2_getDollar2(); void oe2_setSRExit(); void oe2_unk177(); @@ -1414,8 +1422,6 @@ protected: virtual bool loadTablesIntoMem(uint subr_id); - bool loadRoomItems(uint item); - virtual void moveDirn(Item *i, uint x); }; diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp index 3d8ec156ce..1e1eaaf7e9 100644 --- a/engines/agos/animation.cpp +++ b/engines/agos/animation.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/animation.h b/engines/agos/animation.h index cbd9909151..07b2ebcd93 100644 --- a/engines/agos/animation.h +++ b/engines/agos/animation.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/charset.cpp b/engines/agos/charset.cpp index c43bea640e..40b0a84390 100644 --- a/engines/agos/charset.cpp +++ b/engines/agos/charset.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -660,9 +662,10 @@ void AGOSEngine::windowPutChar(WindowBlock *window, byte c, byte b) { window->textLength++; window->textColumnOffset += 6; - if (c == 'i' || c == 'l') - window->textColumnOffset -= 2; - + if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) { + if (c == 'i' || c == 'l') + window->textColumnOffset -= 2; + } if (window->textColumnOffset >= 8) { window->textColumnOffset -= 8; window->textColumn++; @@ -716,17 +719,218 @@ void AGOSEngine::windowNewLine(WindowBlock *window) { } #ifdef PALMOS_68K -static const byte *czech_windowFont; -static const byte *russian_windowFont; -static const byte *polish_windowFont; -static const byte *french_windowFont; -static const byte *german_windowFont; -static const byte *hebrew_windowFont; -static const byte *italian_windowFont; -static const byte *spanish_windowFont; -static const byte *english_windowFont; +static const byte *feeble_windowFont; +static const byte *czech_simonFont; +static const byte *russian_simonFont; +static const byte *polish_simonFont; +static const byte *french_simonFont; +static const byte *german_simonFont; +static const byte *hebrew_simonFont; +static const byte *italian_simonFont; +static const byte *spanish_simonFont; +static const byte *english_simonFont; +static const byte *french_commonFont; +static const byte *english_commonFont; #else -static const byte czech_windowFont[] = { +static const byte feeble_windowFont[] = { + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 128,128,128,128,128,128,128,0,0,128,0,0,0, + 144,144,144,0,0,0,0,0,0,0,0,0,0, + 0,72,252,72,72,252,72,0,0,0,0,0,0, + 124,146,144,144,124,18,18,18,146,124,16,16,0, + 62,98,146,100,8,16,32,76,146,140,0,0,0, + 0,112,136,136,80,32,82,138,132,122,0,0,0, + 128,128,128,0,0,0,0,0,0,0,0,0,0, + 32,64,128,128,128,128,128,128,64,32,0,0,0, + 128,64,32,32,32,32,32,32,64,128,0,0,0, + 16,146,84,56,56,84,146,16,0,0,0,0,0, + 0,0,16,16,16,254,16,16,16,0,0,0,0, + 0,0,0,0,0,0,0,0,0,64,64,128,0, + 0,0,0,0,0,254,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,128,0,0,0, + 0,0,1,2,4,8,16,32,64,128,128,0,0, + 120,132,132,132,132,132,132,132,132,120,0,0,0, + 16,48,16,16,16,16,16,16,16,56,0,0,0, + 120,132,132,4,4,8,16,32,64,252,0,0,0, + 124,130,130,2,2,28,2,2,130,124,0,0,0, + 4,12,20,36,68,132,254,4,4,4,0,0,0, + 254,128,128,252,2,2,2,2,130,124,0,0,0, + 62,64,128,252,130,130,130,130,130,124,0,0,0, + 254,2,2,2,2,4,8,16,16,16,0,0,0, + 120,132,132,132,120,132,132,132,132,120,0,0,0, + 124,130,130,130,130,130,126,2,2,124,0,0,0, + 0,0,0,0,128,0,0,0,128,0,0,0,0, + 0,0,0,0,0,64,0,0,0,64,64,128,0, + 0,0,16,32,64,128,64,32,16,0,0,0,0, + 0,0,0,254,0,0,254,0,0,0,0,0,0, + 0,0,128,64,32,16,32,64,128,0,0,0,0, + 60,66,130,2,4,8,16,16,0,16,16,0,0, + 60,66,130,154,166,166,156,128,128,126,0,0,0, + 124,130,130,130,130,254,130,130,130,130,0,0,0, + 252,130,130,130,252,130,130,130,130,252,0,0,0, + 124,130,130,128,128,128,128,130,130,124,0,0,0, + 252,130,130,130,130,130,130,130,130,252,0,0,0, + 254,128,128,128,128,252,128,128,128,254,0,0,0, + 254,128,128,128,128,252,128,128,128,128,0,0,0, + 124,130,130,128,128,134,130,130,130,124,0,0,0, + 130,130,130,130,130,254,130,130,130,130,0,0,0, + 224,64,64,64,64,64,64,64,64,224,0,0,0, + 30,2,2,2,2,2,130,130,130,124,0,0,0, + 130,130,132,136,144,224,144,136,132,130,0,0,0, + 128,128,128,128,128,128,128,128,128,254,0,0,0, + 130,198,170,146,130,130,130,130,130,130,0,0,0, + 130,130,194,162,146,138,134,130,130,130,0,0,0, + 124,130,130,130,130,130,130,130,130,124,0,0,0, + 252,130,130,130,130,252,128,128,128,128,0,0,0, + 124,130,130,130,130,130,130,130,130,126,2,2,0, + 252,130,130,130,130,252,130,130,130,130,0,0,0, + 124,130,128,128,124,2,2,130,130,124,0,0,0, + 254,16,16,16,16,16,16,16,16,16,0,0,0, + 130,130,130,130,130,130,130,130,130,124,0,0,0, + 130,130,130,130,130,130,130,68,40,16,0,0,0, + 130,130,130,130,130,130,130,146,170,198,0,0,0, + 130,68,40,16,16,16,16,40,68,130,0,0,0, + 130,130,130,130,68,40,16,16,16,16,0,0,0, + 254,2,2,4,8,16,32,64,128,254,0,0,0, + 224,128,128,128,128,128,128,128,128,224,0,0,0, + 128,128,64,32,16,8,4,2,1,0,0,0,0, + 224,32,32,32,32,32,32,32,32,224,0,0,0, + 160,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,255,0,0,0, + 32,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,62,66,130,130,130,134,122,0,0,0, + 128,128,128,252,130,130,130,130,130,252,0,0,0, + 0,0,0,124,130,128,128,128,130,124,0,0,0, + 2,2,2,126,130,130,130,130,130,126,0,0,0, + 0,0,0,124,130,130,254,128,128,126,0,0,0, + 28,32,32,248,32,32,32,32,32,32,0,0,0, + 0,0,0,62,66,130,130,130,130,126,2,2,124, + 128,128,128,252,130,130,130,130,130,130,0,0,0, + 64,0,0,64,192,64,64,64,64,224,0,0,0, + 16,0,0,16,16,16,16,16,16,16,16,16,224, + 128,128,128,132,136,144,224,144,136,132,0,0,0, + 192,64,64,64,64,64,64,64,64,64,0,0,0, + 0,0,0,252,146,146,146,146,146,146,0,0,0, + 0,0,0,156,162,194,130,130,130,130,0,0,0, + 0,0,0,124,130,130,130,130,130,124,0,0,0, + 0,0,0,252,130,130,130,130,130,252,128,128,128, + 0,0,0,126,130,130,130,130,130,126,2,2,2, + 0,0,0,156,162,194,128,128,128,128,0,0,0, + 0,0,0,124,128,128,120,4,4,248,0,0,0, + 32,32,32,248,32,32,32,32,32,28,0,0,0, + 0,0,0,130,130,130,130,130,130,126,0,0,0, + 0,0,0,130,130,130,130,68,40,16,0,0,0, + 0,0,0,146,146,146,146,146,146,124,0,0,0, + 0,0,0,130,68,40,16,40,68,130,0,0,0, + 0,0,0,130,130,130,130,130,130,126,2,2,124, + 0,0,0,254,4,8,16,32,64,254,0,0,0, + 48,64,64,64,64,128,64,64,64,64,48,0,0, + 128,128,128,128,128,128,128,128,128,128,128,128,0, + 192,32,32,32,32,16,32,32,32,32,192,0,0, + 152,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,254,0,0, + 124,130,130,128,128,128,128,130,130,124,16,16,48, + 0,40,0,130,130,130,130,130,130,126,0,0,0, + 16,32,0,124,130,130,254,128,128,126,0,0,0, + 16,40,0,62,66,130,130,130,134,122,0,0,0, + 0,40,0,62,66,130,130,130,134,122,0,0,0, + 16,8,0,62,66,130,130,130,134,122,0,0,0, + 8,20,8,62,66,130,130,130,134,122,0,0,0, + 0,0,0,124,130,128,128,128,130,124,16,16,48, + 16,40,0,124,130,130,254,128,128,126,0,0,0, + 0,40,0,124,130,130,254,128,128,126,0,0,0, + 16,8,0,124,130,130,254,128,128,126,0,0,0, + 0,160,0,64,192,64,64,64,64,224,0,0,0, + 64,160,0,64,192,64,64,64,64,224,0,0,0, + 128,64,0,64,192,64,64,64,64,224,0,0,0, + 40,0,124,130,130,130,254,130,130,130,0,0,0, + 16,40,124,130,130,130,254,130,130,130,0,0,0, + 40,0,254,128,128,252,128,128,128,254,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 16,40,0,124,130,130,130,130,130,124,0,0,0, + 0,40,0,124,130,130,130,130,130,124,0,0,0, + 32,16,0,124,130,130,130,130,130,124,0,0,0, + 16,40,0,130,130,130,130,130,130,126,0,0,0, + 16,8,0,130,130,130,130,130,130,126,0,0,0, + 0,40,0,130,130,130,130,130,130,126,2,2,124, + 40,0,124,130,130,130,130,130,130,124,0,0,0, + 40,0,130,130,130,130,130,130,130,124,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 8,16,0,62,66,130,130,130,134,122,0,0,0, + 64,128,0,64,192,64,64,64,64,224,0,0,0, + 16,32,0,124,130,130,130,130,130,124,0,0,0, + 8,16,0,130,130,130,130,130,130,126,0,0,0, + 20,40,0,156,162,194,130,130,130,130,0,0,0, + 20,40,130,194,162,146,138,134,130,130,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 16,16,0,16,16,32,64,128,130,132,120,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 128,0,0,128,128,128,128,128,128,128,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0, + 60,66,130,130,130,132,132,130,130,130,156,128,128, + 0,0,0,0,0,0,0,0,0,0,0,0,0, +}; + +static const byte czech_simonFont[] = { 0, 0, 0, 0, 0, 0, 0, 0, 32, 112, 112, 32, 32, 0, 32, 0, 48, 48, 96, 0, 0, 0, 0, 0, @@ -827,7 +1031,7 @@ static const byte czech_windowFont[] = { 240, 240, 240, 240, 240, 240, 240, 240, }; -static const byte russian_windowFont[] = { +static const byte russian_simonFont[] = { 0, 0, 0, 0, 0, 0, 0, 0, 32, 112, 112, 32, 32, 0, 32, 0, 48, 48, 96, 0, 0, 0, 0, 0, @@ -928,7 +1132,7 @@ static const byte russian_windowFont[] = { 240, 240, 240, 240, 240, 240, 240, 240, }; -static const byte polish_windowFont[] = { +static const byte polish_simonFont[] = { 0, 0, 0, 0, 0, 0, 0, 0, 32, 112, 112, 32, 32, 0, 32, 0, 48, 48, 96, 0, 0, 0, 0, 0, @@ -1029,7 +1233,7 @@ static const byte polish_windowFont[] = { 240, 240, 240, 240, 240, 240, 240, 240, }; -static const byte french_windowFont[] = { +static const byte french_simonFont[] = { 0, 0, 0, 0, 0, 0, 0, 0, 32, 112, 112, 32, 32, 0, 32, 0, 48, 48, 96, 0, 0, 0, 0, 0, @@ -1130,7 +1334,7 @@ static const byte french_windowFont[] = { 240, 240, 240, 240, 240, 240, 240, 240, }; -static const byte german_windowFont[] = { +static const byte german_simonFont[] = { 0, 0, 0, 0, 0, 0, 0, 0, 32, 112, 112, 32, 32, 0, 32, 0, 48, 48, 96, 0, 0, 0, 0, 0, @@ -1231,7 +1435,7 @@ static const byte german_windowFont[] = { 240, 240, 240, 240, 240, 240, 240, 240, }; -static const byte hebrew_windowFont[] = { +static const byte hebrew_simonFont[] = { 0, 0, 0, 0, 0, 0, 0, 0, 32, 112, 112, 32, 32, 0, 32, 0, 48, 48, 96, 0, 0, 0, 0, 0, @@ -1332,7 +1536,7 @@ static const byte hebrew_windowFont[] = { 240, 240, 240, 240, 240, 240, 240, 240, }; -static const byte italian_windowFont[] = { +static const byte italian_simonFont[] = { 0, 0, 0, 0, 0, 0, 0, 0, 32, 112, 112, 32, 32, 0, 32, 0, 48, 48, 96, 0, 0, 0, 0, 0, @@ -1433,7 +1637,7 @@ static const byte italian_windowFont[] = { 240, 240, 240, 240, 240, 240, 240, 240, }; -static const byte spanish_windowFont[] = { +static const byte spanish_simonFont[] = { 0, 0, 0, 0, 0, 0, 0, 0, 32, 112, 112, 32, 32, 0, 32, 0, 48, 48, 96, 0, 0, 0, 0, 0, @@ -1534,7 +1738,7 @@ static const byte spanish_windowFont[] = { 240, 240, 240, 240, 240, 240, 240, 240, }; -static const byte english_windowFont[] = { +static const byte english_simonFont[] = { 0, 0, 0, 0, 0, 0, 0, 0, 32, 112, 112, 32, 32, 0, 32, 0, 48, 48, 96, 0, 0, 0, 0, 0, @@ -1634,206 +1838,210 @@ static const byte english_windowFont[] = { 252, 252, 252, 252, 252, 252, 252, 252, 240, 240, 240, 240, 240, 240, 240, 240, }; -#endif -static const byte feeble_windowFont[] = { - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 128,128,128,128,128,128,128,0,0,128,0,0,0, - 144,144,144,0,0,0,0,0,0,0,0,0,0, - 0,72,252,72,72,252,72,0,0,0,0,0,0, - 124,146,144,144,124,18,18,18,146,124,16,16,0, - 62,98,146,100,8,16,32,76,146,140,0,0,0, - 0,112,136,136,80,32,82,138,132,122,0,0,0, - 128,128,128,0,0,0,0,0,0,0,0,0,0, - 32,64,128,128,128,128,128,128,64,32,0,0,0, - 128,64,32,32,32,32,32,32,64,128,0,0,0, - 16,146,84,56,56,84,146,16,0,0,0,0,0, - 0,0,16,16,16,254,16,16,16,0,0,0,0, - 0,0,0,0,0,0,0,0,0,64,64,128,0, - 0,0,0,0,0,254,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,128,0,0,0, - 0,0,1,2,4,8,16,32,64,128,128,0,0, - 120,132,132,132,132,132,132,132,132,120,0,0,0, - 16,48,16,16,16,16,16,16,16,56,0,0,0, - 120,132,132,4,4,8,16,32,64,252,0,0,0, - 124,130,130,2,2,28,2,2,130,124,0,0,0, - 4,12,20,36,68,132,254,4,4,4,0,0,0, - 254,128,128,252,2,2,2,2,130,124,0,0,0, - 62,64,128,252,130,130,130,130,130,124,0,0,0, - 254,2,2,2,2,4,8,16,16,16,0,0,0, - 120,132,132,132,120,132,132,132,132,120,0,0,0, - 124,130,130,130,130,130,126,2,2,124,0,0,0, - 0,0,0,0,128,0,0,0,128,0,0,0,0, - 0,0,0,0,0,64,0,0,0,64,64,128,0, - 0,0,16,32,64,128,64,32,16,0,0,0,0, - 0,0,0,254,0,0,254,0,0,0,0,0,0, - 0,0,128,64,32,16,32,64,128,0,0,0,0, - 60,66,130,2,4,8,16,16,0,16,16,0,0, - 60,66,130,154,166,166,156,128,128,126,0,0,0, - 124,130,130,130,130,254,130,130,130,130,0,0,0, - 252,130,130,130,252,130,130,130,130,252,0,0,0, - 124,130,130,128,128,128,128,130,130,124,0,0,0, - 252,130,130,130,130,130,130,130,130,252,0,0,0, - 254,128,128,128,128,252,128,128,128,254,0,0,0, - 254,128,128,128,128,252,128,128,128,128,0,0,0, - 124,130,130,128,128,134,130,130,130,124,0,0,0, - 130,130,130,130,130,254,130,130,130,130,0,0,0, - 224,64,64,64,64,64,64,64,64,224,0,0,0, - 30,2,2,2,2,2,130,130,130,124,0,0,0, - 130,130,132,136,144,224,144,136,132,130,0,0,0, - 128,128,128,128,128,128,128,128,128,254,0,0,0, - 130,198,170,146,130,130,130,130,130,130,0,0,0, - 130,130,194,162,146,138,134,130,130,130,0,0,0, - 124,130,130,130,130,130,130,130,130,124,0,0,0, - 252,130,130,130,130,252,128,128,128,128,0,0,0, - 124,130,130,130,130,130,130,130,130,126,2,2,0, - 252,130,130,130,130,252,130,130,130,130,0,0,0, - 124,130,128,128,124,2,2,130,130,124,0,0,0, - 254,16,16,16,16,16,16,16,16,16,0,0,0, - 130,130,130,130,130,130,130,130,130,124,0,0,0, - 130,130,130,130,130,130,130,68,40,16,0,0,0, - 130,130,130,130,130,130,130,146,170,198,0,0,0, - 130,68,40,16,16,16,16,40,68,130,0,0,0, - 130,130,130,130,68,40,16,16,16,16,0,0,0, - 254,2,2,4,8,16,32,64,128,254,0,0,0, - 224,128,128,128,128,128,128,128,128,224,0,0,0, - 128,128,64,32,16,8,4,2,1,0,0,0,0, - 224,32,32,32,32,32,32,32,32,224,0,0,0, - 160,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,255,0,0,0, - 32,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,62,66,130,130,130,134,122,0,0,0, - 128,128,128,252,130,130,130,130,130,252,0,0,0, - 0,0,0,124,130,128,128,128,130,124,0,0,0, - 2,2,2,126,130,130,130,130,130,126,0,0,0, - 0,0,0,124,130,130,254,128,128,126,0,0,0, - 28,32,32,248,32,32,32,32,32,32,0,0,0, - 0,0,0,62,66,130,130,130,130,126,2,2,124, - 128,128,128,252,130,130,130,130,130,130,0,0,0, - 64,0,0,64,192,64,64,64,64,224,0,0,0, - 16,0,0,16,16,16,16,16,16,16,16,16,224, - 128,128,128,132,136,144,224,144,136,132,0,0,0, - 192,64,64,64,64,64,64,64,64,64,0,0,0, - 0,0,0,252,146,146,146,146,146,146,0,0,0, - 0,0,0,156,162,194,130,130,130,130,0,0,0, - 0,0,0,124,130,130,130,130,130,124,0,0,0, - 0,0,0,252,130,130,130,130,130,252,128,128,128, - 0,0,0,126,130,130,130,130,130,126,2,2,2, - 0,0,0,156,162,194,128,128,128,128,0,0,0, - 0,0,0,124,128,128,120,4,4,248,0,0,0, - 32,32,32,248,32,32,32,32,32,28,0,0,0, - 0,0,0,130,130,130,130,130,130,126,0,0,0, - 0,0,0,130,130,130,130,68,40,16,0,0,0, - 0,0,0,146,146,146,146,146,146,124,0,0,0, - 0,0,0,130,68,40,16,40,68,130,0,0,0, - 0,0,0,130,130,130,130,130,130,126,2,2,124, - 0,0,0,254,4,8,16,32,64,254,0,0,0, - 48,64,64,64,64,128,64,64,64,64,48,0,0, - 128,128,128,128,128,128,128,128,128,128,128,128,0, - 192,32,32,32,32,16,32,32,32,32,192,0,0, - 152,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,254,0,0, - 124,130,130,128,128,128,128,130,130,124,16,16,48, - 0,40,0,130,130,130,130,130,130,126,0,0,0, - 16,32,0,124,130,130,254,128,128,126,0,0,0, - 16,40,0,62,66,130,130,130,134,122,0,0,0, - 0,40,0,62,66,130,130,130,134,122,0,0,0, - 16,8,0,62,66,130,130,130,134,122,0,0,0, - 8,20,8,62,66,130,130,130,134,122,0,0,0, - 0,0,0,124,130,128,128,128,130,124,16,16,48, - 16,40,0,124,130,130,254,128,128,126,0,0,0, - 0,40,0,124,130,130,254,128,128,126,0,0,0, - 16,8,0,124,130,130,254,128,128,126,0,0,0, - 0,160,0,64,192,64,64,64,64,224,0,0,0, - 64,160,0,64,192,64,64,64,64,224,0,0,0, - 128,64,0,64,192,64,64,64,64,224,0,0,0, - 40,0,124,130,130,130,254,130,130,130,0,0,0, - 16,40,124,130,130,130,254,130,130,130,0,0,0, - 40,0,254,128,128,252,128,128,128,254,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 16,40,0,124,130,130,130,130,130,124,0,0,0, - 0,40,0,124,130,130,130,130,130,124,0,0,0, - 32,16,0,124,130,130,130,130,130,124,0,0,0, - 16,40,0,130,130,130,130,130,130,126,0,0,0, - 16,8,0,130,130,130,130,130,130,126,0,0,0, - 0,40,0,130,130,130,130,130,130,126,2,2,124, - 40,0,124,130,130,130,130,130,130,124,0,0,0, - 40,0,130,130,130,130,130,130,130,124,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 8,16,0,62,66,130,130,130,134,122,0,0,0, - 64,128,0,64,192,64,64,64,64,224,0,0,0, - 16,32,0,124,130,130,130,130,130,124,0,0,0, - 8,16,0,130,130,130,130,130,130,126,0,0,0, - 20,40,0,156,162,194,130,130,130,130,0,0,0, - 20,40,130,194,162,146,138,134,130,130,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 16,16,0,16,16,32,64,128,130,132,120,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 128,0,0,128,128,128,128,128,128,128,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 60,66,130,130,130,132,132,130,130,130,156,128,128, - 0,0,0,0,0,0,0,0,0,0,0,0,0, +static const byte french_commonFont[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x20, + 0x00, 0x50, 0x28, 0x28, 0x00, 0x00, 0x00, 0x00, + 0x20, 0x50, 0x00, 0x60, 0x90, 0x90, 0x60, 0x00, + 0x20, 0x50, 0x00, 0x60, 0x90, 0x90, 0x68, 0x00, + 0x30, 0x48, 0x80, 0x80, 0x48, 0x30, 0x10, 0x30, + 0x00, 0x10, 0x28, 0x10, 0x2A, 0x44, 0x3A, 0x00, + 0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x00, + 0x00, 0x20, 0x10, 0x10, 0x10, 0x10, 0x20, 0x00, + 0x00, 0x00, 0x14, 0x08, 0x3E, 0x08, 0x14, 0x00, + 0x00, 0x70, 0x88, 0xF0, 0x88, 0x88, 0xF0, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x10, + 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, + 0x10, 0x20, 0x00, 0x78, 0x70, 0x40, 0x38, 0x00, + 0x00, 0x70, 0x88, 0x88, 0x88, 0x88, 0x70, 0x00, + 0x00, 0x20, 0x60, 0x20, 0x20, 0x20, 0x70, 0x00, + 0x00, 0x70, 0x88, 0x10, 0x20, 0x48, 0xF8, 0x00, + 0x00, 0x70, 0x88, 0x30, 0x08, 0x88, 0x70, 0x00, + 0x00, 0x10, 0x20, 0x40, 0x90, 0xF8, 0x10, 0x00, + 0x00, 0xF8, 0x80, 0x70, 0x08, 0x88, 0x70, 0x00, + 0x00, 0x70, 0x88, 0x80, 0xF0, 0x88, 0x70, 0x00, + 0x00, 0xF8, 0x08, 0x10, 0x20, 0x40, 0x40, 0x00, + 0x00, 0x70, 0x88, 0x70, 0x88, 0x88, 0x70, 0x00, + 0x00, 0x70, 0x88, 0x78, 0x08, 0x88, 0x70, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x00, + 0x40, 0x20, 0x00, 0x60, 0x90, 0x90, 0x68, 0x00, + 0x20, 0x50, 0x00, 0x98, 0x90, 0x90, 0xE8, 0x00, + 0x20, 0x10, 0x00, 0x78, 0x70, 0x40, 0x38, 0x00, + 0x20, 0x50, 0x00, 0x78, 0x70, 0x40, 0x38, 0x00, + 0x00, 0x3C, 0x42, 0x04, 0x08, 0x00, 0x08, 0x00, + 0x20, 0x50, 0x00, 0x60, 0x20, 0x28, 0x30, 0x00, + 0x20, 0x50, 0x50, 0x70, 0x50, 0x50, 0x88, 0x00, + 0xF0, 0x48, 0x48, 0x70, 0x48, 0x48, 0xF0, 0x00, + 0x30, 0x48, 0x80, 0x80, 0x80, 0x48, 0x30, 0x00, + 0xF0, 0x48, 0x48, 0x48, 0x48, 0x48, 0xF0, 0x00, + 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xF8, 0x00, + 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xE0, 0x00, + 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00, + 0xC8, 0x48, 0x48, 0x78, 0x48, 0x48, 0xC8, 0x00, + 0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00, + 0x78, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60, 0x00, + 0xC8, 0x50, 0x60, 0x40, 0x60, 0x50, 0xC8, 0x00, + 0xE0, 0x40, 0x40, 0x40, 0x40, 0x48, 0xF8, 0x00, + 0x88, 0xD8, 0xA8, 0x88, 0x88, 0x88, 0x88, 0x00, + 0xC8, 0x48, 0x68, 0x58, 0x58, 0x48, 0xC8, 0x00, + 0x70, 0x88, 0x88, 0x88, 0x88, 0x88, 0x70, 0x00, + 0xF0, 0x48, 0x48, 0x70, 0x40, 0x40, 0xC0, 0x00, + 0x60, 0x90, 0x90, 0x90, 0xB0, 0x90, 0x68, 0x00, + 0xF0, 0x48, 0x48, 0x70, 0x50, 0x48, 0xC8, 0x00, + 0x70, 0x88, 0x80, 0x60, 0x10, 0x88, 0x70, 0x00, + 0xF8, 0xA8, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00, + 0x88, 0x50, 0x50, 0x50, 0x50, 0x50, 0x20, 0x00, + 0x88, 0x88, 0x88, 0x50, 0x50, 0x50, 0x20, 0x00, + 0x88, 0x88, 0x88, 0x88, 0xA8, 0xD8, 0x88, 0x00, + 0x88, 0x50, 0x70, 0x20, 0x70, 0x50, 0x88, 0x00, + 0x88, 0x48, 0x30, 0x20, 0x40, 0x80, 0xC0, 0x00, + 0xF8, 0x88, 0x10, 0x20, 0x40, 0x80, 0xF8, 0x00, + 0x00, 0x0E, 0x08, 0x08, 0x08, 0x08, 0x0E, 0x00, + 0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x00, + 0x00, 0x70, 0x10, 0x10, 0x10, 0x10, 0x70, 0x00, + 0x00, 0x30, 0x48, 0x40, 0x48, 0x30, 0x10, 0x30, + 0x00, 0x50, 0x00, 0x60, 0x20, 0x28, 0x30, 0x00, + 0x20, 0x10, 0x00, 0x98, 0x90, 0x90, 0xE8, 0x00, + 0x00, 0x00, 0x60, 0x90, 0x90, 0x90, 0x68, 0x00, + 0x40, 0x40, 0x50, 0x68, 0x48, 0x48, 0xF0, 0x00, + 0x00, 0x00, 0x30, 0x48, 0x40, 0x48, 0x30, 0x00, + 0x10, 0x10, 0x70, 0x90, 0x90, 0x90, 0x68, 0x00, + 0x00, 0x00, 0x70, 0x48, 0x70, 0x40, 0x38, 0x00, + 0x10, 0x38, 0x20, 0x70, 0x20, 0x20, 0x20, 0x40, + 0x00, 0x00, 0x78, 0x90, 0x90, 0x90, 0x70, 0x10, + 0xC0, 0x40, 0x58, 0x68, 0x48, 0x48, 0xC8, 0x00, + 0x20, 0x00, 0x60, 0x20, 0x20, 0x28, 0x30, 0x00, + 0x10, 0x18, 0x10, 0x10, 0x10, 0x10, 0x10, 0x60, + 0x40, 0x40, 0x70, 0x48, 0x70, 0x50, 0xC8, 0x00, + 0x40, 0x40, 0x40, 0x40, 0x40, 0x50, 0x60, 0x00, + 0x00, 0x00, 0xA8, 0xF8, 0xA8, 0xA8, 0xA8, 0x00, + 0x00, 0x00, 0xD8, 0x68, 0x48, 0x48, 0x48, 0x00, + 0x00, 0x00, 0x30, 0x48, 0x48, 0x48, 0x30, 0x00, + 0x00, 0x00, 0xF0, 0x48, 0x48, 0x70, 0x40, 0xC0, + 0x00, 0x00, 0x70, 0x90, 0x90, 0x70, 0x18, 0x10, + 0x00, 0x00, 0xD8, 0x68, 0x40, 0x40, 0xE0, 0x00, + 0x00, 0x00, 0x38, 0x40, 0x30, 0x08, 0x70, 0x00, + 0x20, 0x20, 0x70, 0x20, 0x20, 0x28, 0x30, 0x00, + 0x00, 0x00, 0x98, 0x90, 0x90, 0x90, 0xE8, 0x00, + 0x00, 0x00, 0x88, 0x88, 0x50, 0x50, 0x20, 0x00, + 0x00, 0x00, 0xA8, 0xA8, 0xA8, 0xF8, 0xA8, 0x00, + 0x00, 0x00, 0x88, 0x50, 0x20, 0x50, 0x88, 0x00, + 0x00, 0x00, 0x98, 0x90, 0x90, 0x70, 0x10, 0x60, + 0x00, 0x00, 0x78, 0x10, 0x20, 0x40, 0x78, 0x00, + 0x20, 0x50, 0x00, 0x60, 0x90, 0x90, 0x60, 0x00, + 0x00, 0x0E, 0x08, 0x30, 0x08, 0x08, 0x0E, 0x00, + 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, + 0x00, 0x70, 0x10, 0x0C, 0x10, 0x10, 0x70, 0x00, + 0x00, 0x14, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, + 0x00, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0x00, }; +static const byte english_commonFont[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x20, + 0x00, 0x50, 0x28, 0x28, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x90, 0x00, 0x60, 0x90, 0x90, 0x68, 0x00, + 0x00, 0x90, 0x00, 0x60, 0x90, 0x90, 0x60, 0x00, + 0x00, 0x90, 0x00, 0x90, 0x90, 0x90, 0x60, 0x00, + 0x00, 0x10, 0x28, 0x10, 0x2A, 0x44, 0x3A, 0x00, + 0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x00, + 0x00, 0x20, 0x10, 0x10, 0x10, 0x10, 0x20, 0x00, + 0x00, 0x00, 0x14, 0x08, 0x3E, 0x08, 0x14, 0x00, + 0x00, 0x70, 0x88, 0xF0, 0x88, 0x88, 0xF0, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x10, + 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, + 0x10, 0x20, 0x00, 0x78, 0x70, 0x40, 0x38, 0x00, + 0x00, 0x70, 0x88, 0x88, 0x88, 0x88, 0x70, 0x00, + 0x00, 0x20, 0x60, 0x20, 0x20, 0x20, 0x70, 0x00, + 0x00, 0x70, 0x88, 0x10, 0x20, 0x48, 0xF8, 0x00, + 0x00, 0x70, 0x88, 0x30, 0x08, 0x88, 0x70, 0x00, + 0x00, 0x10, 0x20, 0x40, 0x90, 0xF8, 0x10, 0x00, + 0x00, 0xF8, 0x80, 0x70, 0x08, 0x88, 0x70, 0x00, + 0x00, 0x70, 0x88, 0x80, 0xF0, 0x88, 0x70, 0x00, + 0x00, 0xF8, 0x08, 0x10, 0x20, 0x40, 0x40, 0x00, + 0x00, 0x70, 0x88, 0x70, 0x88, 0x88, 0x70, 0x00, + 0x00, 0x70, 0x88, 0x78, 0x08, 0x88, 0x70, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x00, + 0x40, 0x20, 0x00, 0x60, 0x90, 0x90, 0x68, 0x00, + 0x20, 0x50, 0x00, 0x98, 0x90, 0x90, 0xE8, 0x00, + 0x20, 0x10, 0x00, 0x78, 0x70, 0x40, 0x38, 0x00, + 0x20, 0x50, 0x00, 0x78, 0x70, 0x40, 0x38, 0x00, + 0x00, 0x3C, 0x42, 0x04, 0x08, 0x00, 0x08, 0x00, + 0x20, 0x50, 0x00, 0x60, 0x20, 0x28, 0x30, 0x00, + 0x20, 0x50, 0x50, 0x70, 0x50, 0x50, 0x88, 0x00, + 0xF0, 0x48, 0x48, 0x70, 0x48, 0x48, 0xF0, 0x00, + 0x30, 0x48, 0x80, 0x80, 0x80, 0x48, 0x30, 0x00, + 0xF0, 0x48, 0x48, 0x48, 0x48, 0x48, 0xF0, 0x00, + 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xF8, 0x00, + 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xE0, 0x00, + 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00, + 0xC8, 0x48, 0x48, 0x78, 0x48, 0x48, 0xC8, 0x00, + 0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00, + 0x78, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60, 0x00, + 0xC8, 0x50, 0x60, 0x40, 0x60, 0x50, 0xC8, 0x00, + 0xE0, 0x40, 0x40, 0x40, 0x40, 0x48, 0xF8, 0x00, + 0x88, 0xD8, 0xA8, 0x88, 0x88, 0x88, 0x88, 0x00, + 0xC8, 0x48, 0x68, 0x58, 0x58, 0x48, 0xC8, 0x00, + 0x70, 0x88, 0x88, 0x88, 0x88, 0x88, 0x70, 0x00, + 0xF0, 0x48, 0x48, 0x70, 0x40, 0x40, 0xC0, 0x00, + 0x60, 0x90, 0x90, 0x90, 0xB0, 0x90, 0x68, 0x00, + 0xF0, 0x48, 0x48, 0x70, 0x50, 0x48, 0xC8, 0x00, + 0x70, 0x88, 0x80, 0x60, 0x10, 0x88, 0x70, 0x00, + 0xF8, 0xA8, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00, + 0x88, 0x50, 0x50, 0x50, 0x50, 0x50, 0x20, 0x00, + 0x88, 0x88, 0x88, 0x50, 0x50, 0x50, 0x20, 0x00, + 0x88, 0x88, 0x88, 0x88, 0xA8, 0xD8, 0x88, 0x00, + 0x88, 0x50, 0x70, 0x20, 0x70, 0x50, 0x88, 0x00, + 0x88, 0x48, 0x30, 0x20, 0x40, 0x80, 0xC0, 0x00, + 0xF8, 0x88, 0x10, 0x20, 0x40, 0x80, 0xF8, 0x00, + 0x00, 0x0E, 0x08, 0x08, 0x08, 0x08, 0x0E, 0x00, + 0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x00, + 0x00, 0x70, 0x10, 0x10, 0x10, 0x10, 0x70, 0x00, + 0x00, 0x30, 0x48, 0x40, 0x48, 0x30, 0x10, 0x30, + 0x00, 0x50, 0x00, 0x60, 0x20, 0x28, 0x30, 0x00, + 0x20, 0x10, 0x00, 0x98, 0x90, 0x90, 0xE8, 0x00, + 0x00, 0x00, 0x60, 0x90, 0x90, 0x90, 0x68, 0x00, + 0x40, 0x40, 0x50, 0x68, 0x48, 0x48, 0xF0, 0x00, + 0x00, 0x00, 0x30, 0x48, 0x40, 0x48, 0x30, 0x00, + 0x10, 0x10, 0x70, 0x90, 0x90, 0x90, 0x68, 0x00, + 0x00, 0x00, 0x70, 0x48, 0x70, 0x40, 0x38, 0x00, + 0x10, 0x38, 0x20, 0x70, 0x20, 0x20, 0x20, 0x40, + 0x00, 0x00, 0x78, 0x90, 0x90, 0x90, 0x70, 0x10, + 0xC0, 0x40, 0x58, 0x68, 0x48, 0x48, 0xC8, 0x00, + 0x20, 0x00, 0x60, 0x20, 0x20, 0x28, 0x30, 0x00, + 0x10, 0x18, 0x10, 0x10, 0x10, 0x10, 0x10, 0x60, + 0x40, 0x40, 0x70, 0x48, 0x70, 0x50, 0xC8, 0x00, + 0x40, 0x40, 0x40, 0x40, 0x40, 0x50, 0x60, 0x00, + 0x00, 0x00, 0xA8, 0xF8, 0xA8, 0xA8, 0xA8, 0x00, + 0x00, 0x00, 0xD8, 0x68, 0x48, 0x48, 0x48, 0x00, + 0x00, 0x00, 0x30, 0x48, 0x48, 0x48, 0x30, 0x00, + 0x00, 0x00, 0xF0, 0x48, 0x48, 0x70, 0x40, 0xC0, + 0x00, 0x00, 0x70, 0x90, 0x90, 0x70, 0x18, 0x10, + 0x00, 0x00, 0xD8, 0x68, 0x40, 0x40, 0xE0, 0x00, + 0x00, 0x00, 0x38, 0x40, 0x30, 0x08, 0x70, 0x00, + 0x20, 0x20, 0x70, 0x20, 0x20, 0x28, 0x30, 0x00, + 0x00, 0x00, 0x98, 0x90, 0x90, 0x90, 0xE8, 0x00, + 0x00, 0x00, 0x88, 0x88, 0x50, 0x50, 0x20, 0x00, + 0x00, 0x00, 0xA8, 0xA8, 0xA8, 0xF8, 0xA8, 0x00, + 0x00, 0x00, 0x88, 0x50, 0x20, 0x50, 0x88, 0x00, + 0x00, 0x00, 0x98, 0x90, 0x90, 0x70, 0x10, 0x60, + 0x00, 0x00, 0x78, 0x10, 0x20, 0x40, 0x78, 0x00, + 0x20, 0x50, 0x00, 0x60, 0x90, 0x90, 0x60, 0x00, + 0x00, 0x0E, 0x08, 0x30, 0x08, 0x08, 0x0E, 0x00, + 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, + 0x00, 0x70, 0x10, 0x0C, 0x10, 0x10, 0x70, 0x00, + 0x00, 0x14, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, + 0x00, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0x00, +}; +#endif + void AGOSEngine::windowDrawChar(WindowBlock *window, uint x, uint y, byte chr) { const byte *src; byte color, *dst; @@ -1851,37 +2059,58 @@ void AGOSEngine::windowDrawChar(WindowBlock *window, uint x, uint y, byte chr) { w = feebleFontSize[chr - 0x20]; src = feeble_windowFont + (chr - 0x20) * 13; - } else { + } else if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) { h = 8; w = 6; switch (_language) { case Common::CZ_CZE: - src = czech_windowFont + (chr - 0x20) * 8; + src = czech_simonFont + (chr - 0x20) * 8; break; case Common::RU_RUS: - src = russian_windowFont + (chr - 0x20) * 8; + src = russian_simonFont + (chr - 0x20) * 8; break; case Common::PL_POL: - src = polish_windowFont + (chr - 0x20) * 8; + src = polish_simonFont + (chr - 0x20) * 8; break; case Common::HB_ISR: - src = hebrew_windowFont + (chr - 0x20) * 8; + src = hebrew_simonFont + (chr - 0x20) * 8; break; case Common::ES_ESP: - src = spanish_windowFont + (chr - 0x20) * 8; + src = spanish_simonFont + (chr - 0x20) * 8; break; case Common::IT_ITA: - src = italian_windowFont + (chr - 0x20) * 8; + src = italian_simonFont + (chr - 0x20) * 8; + break; + case Common::FR_FRA: + src = french_simonFont + (chr - 0x20) * 8; + break; + case Common::DE_DEU: + src = german_simonFont + (chr - 0x20) * 8; + break; + case Common::EN_ANY: + src = english_simonFont + (chr - 0x20) * 8; + break; + default: + error("windowDrawChar: Unknown language %d\n", _language); + } + } else { + h = 8; + w = 6; + + // TODO: Add font tables for German and Spanish + switch (_language) { + case Common::ES_ESP: + src = english_commonFont + (chr - 0x20) * 8; break; case Common::FR_FRA: - src = french_windowFont + (chr - 0x20) * 8; + src = french_commonFont + (chr - 0x20) * 8; break; case Common::DE_DEU: - src = german_windowFont + (chr - 0x20) * 8; + src = english_commonFont + (chr - 0x20) * 8; break; case Common::EN_ANY: - src = english_windowFont + (chr - 0x20) * 8; + src = english_commonFont + (chr - 0x20) * 8; break; default: error("windowDrawChar: Unknown language %d\n", _language); diff --git a/engines/agos/contain.cpp b/engines/agos/contain.cpp index 4b02017bea..b5ca344905 100644 --- a/engines/agos/contain.cpp +++ b/engines/agos/contain.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp index b6c7a52c24..c43e243bf3 100644 --- a/engines/agos/cursor.cpp +++ b/engines/agos/cursor.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -32,56 +34,102 @@ namespace AGOS { -static const uint16 _common_cursors[8][32] = { -// Mouse Info -{ 0xC000, 0x8000, 0xE000, 0xC000, 0xF000, 0xE000, 0xF800, 0xF000, +static const uint16 _common_mouseInfo[32] = { + 0xC000, 0x8000, 0xE000, 0xC000, 0xF000, 0xE000, 0xF800, 0xF000, 0xFC00, 0xF800, 0xFE00, 0xFC00, 0xFC00, 0xF000, 0x9800, 0x9000, 0x0C00, 0x0800, 0x0C00, 0x0800, 0x0600, 0x0400, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +}; -// Shield Info -{ 0x0000, 0x0000, 0x2184, 0x2004, 0x33CC, 0x300C, 0x3FFC, 0x3E7C, +static const uint16 _common_handInfo[32] = { + 0x01C0, 0x01C0, 0x07F0, 0x0770, 0x07F0, 0x0550, 0x07FC, 0x055C, + 0x07FC, 0x0554, 0x3FFC, 0x3D54, 0x3FFC, 0x2554, 0x3FFE, 0x2402, + 0x1FFC, 0x1204, 0x1FFC, 0x1004, 0x0FF8, 0x0808, 0x07F8, 0x0408, + 0x03F8, 0x03F8, 0x03F8, 0x0208, 0x03F8, 0x03F8, 0x0000, 0x0000 +}; + +static const uint16 _common_shieldInfo1[32] = { + 0x0000, 0x0000, 0x2184, 0x2004, 0x33CC, 0x300C, 0x3FFC, 0x3E7C, 0x3FFC, 0x3E7C, 0x3FFC, 0x3E7C, 0x3FFC, 0x0000, 0x3FFC, 0x3E7C, 0x3FFC, 0x3E7C, 0x1FF8, 0x1E78, 0x1FF8, 0x1E78, 0x0FF0, 0x0E70, - 0x07E0, 0x0660, 0x03C0, 0x0240, 0x0180, 0x0000, 0x0000, 0x0000 }, + 0x07E0, 0x0660, 0x03C0, 0x0240, 0x0180, 0x0000, 0x0000, 0x0000 +}; -// Hand Info -{ 0x01C0, 0x01C0, 0x07F0, 0x0770, 0x07F0, 0x0550, 0x07FC, 0x055C, - 0x07FC, 0x0554, 0x3FFC, 0x3D54, 0x3FFC, 0x2554, 0x3FFE, 0x2402, - 0x1FFC, 0x1204, 0x1FFC, 0x1004, 0x0FF8, 0x0808, 0x07F8, 0x0408, - 0x03F8, 0x03F8, 0x03F8, 0x0208, 0x03F8, 0x03F8, 0x0000, 0x0000 }, +static const uint16 _common_shieldInfo2[32] = { + 0x0000, 0x0000, 0x2184, 0x2004, 0x33CC, 0x300C, 0x3FFC, 0x3E7C, + 0x3FFC, 0x2004, 0x3FFC, 0x2004, 0x3FFC, 0x0000, 0x3FFC, 0x2000, + 0x3FFC, 0x2004, 0x1FF8, 0x1008, 0x1FF8, 0x1008, 0x0FF0, 0x0810, + 0x07E0, 0x0420, 0x03C0, 0x0240, 0x0180, 0x0000, 0x0000, 0x0000, +}; -// Sword Info -{ +static const uint16 _common_swordInfo1[32] = { 0x0000, 0x0000, 0xC000, 0x4000, 0xF000, 0x7000, 0x7800, 0x3800, 0x3C00, 0x1C00, 0x1E00, 0x0E00, 0x0F00, 0x0700, 0x0780, 0x0380, 0x03C6, 0x01C0, 0x01FF, 0x00E6, 0x00FE, 0x007C, 0x007C, 0x0038, - 0x00FC, 0x0078, 0x01FE, 0x00CC, 0x01CF, 0x0086, 0x0086, 0x0000 }, + 0x00FC, 0x0078, 0x01FE, 0x00CC, 0x01CF, 0x0086, 0x0086, 0x0000 +}; + +static const uint16 _common_swordInfo2[32] = { + 0x0000, 0x0000, 0x4000, 0x0000, 0x7000, 0x0000, 0x3800, 0x0000, + 0x1C00, 0x0000, 0x0E00, 0x0000, 0x0700, 0x0000, 0x0380, 0x0000, + 0x01C0, 0x0000, 0x00E6, 0x0000, 0x007C, 0x0000, 0x0038, 0x0000, + 0x0078, 0x0000, 0x00CC, 0x0000, 0x0086, 0x0000, 0x0000, 0x0000, +}; + +static const uint16 _common_lightningInfo1[32] = { + 0x0000, 0x0000, 0xC000, 0x4000, 0xE000, 0x6000, 0xF020, 0x7000, + 0x7860, 0x3820, 0x7CE0, 0x3C60, 0x3FF0, 0x1EF0, 0x3FF0, 0x1FF0, + 0x1FF8, 0x0FF8, 0x1FF8, 0x0FF8, 0x0F7C, 0x073C, 0x0E3C, 0x061C, + 0x061E, 0x020E, 0x040E, 0x0006, 0x0006, 0x0002, 0x0002, 0x0000, +}; + +static const uint16 _common_lightningInfo2[32] = { + 0x0000, 0x0000, 0xC000, 0x0000, 0xE000, 0x0000, 0xF020, 0x0000, + 0x7860, 0x0000, 0x7CE0, 0x0000, 0x3FF0, 0x0000, 0x3FF0, 0x0000, + 0x1FF8, 0x0000, 0x1FF8, 0x0000, 0x0F7C, 0x0000, 0x0E3C, 0x0000, + 0x061E, 0x0000, 0x040E, 0x0000, 0x0006, 0x0000, 0x0002, 0x0000, +}; -// Move Forward -{ 0x0180, 0x0100, 0x03C0, 0x0380, 0x07E0, 0x07C0, 0x0FF0, 0x0FE0, +static const uint16 _common_crossbowInfo1[32] = { + 0x0000, 0x0000, 0x03E0, 0x07C0, 0x1FF8, 0x1FF0, 0x3FFC, 0x3FF8, + 0x7FFE, 0x7FFC, 0x7FFE, 0x7FFC, 0xF39E, 0xF39E, 0xE38E, 0xE38E, + 0xC386, 0xC386, 0xC386, 0xC386, 0xC386, 0xC386, 0xC386, 0xC386, + 0x8002, 0x8002, 0x8002, 0x8002, 0x0000, 0x0000, 0x0000, 0x0000, +}; + +static const uint16 _common_crossbowInfo2[32] = { + 0x0000, 0x0000, 0x03E0, 0x0000, 0x1FF8, 0x0000, 0x3FFC, 0x0000, + 0x7FFE, 0x0000, 0x7FFE, 0x0000, 0xF39E, 0x0000, 0xE38E, 0x0000, + 0xC386, 0x0000, 0xC386, 0x0000, 0xC386, 0x0000, 0xC386, 0x0000, + 0x8002, 0x0000, 0x8002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, +}; + +static const uint16 _common_moveForward[32] = { + 0x0180, 0x0100, 0x03C0, 0x0380, 0x07E0, 0x07C0, 0x0FF0, 0x0FE0, 0x1FF8, 0x1FF0, 0x03C0, 0x0380, 0x03C0, 0x0380, 0x03C0, 0x0380, 0x03C0, 0x0380, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +}; -// Mouse Right -{ 0x00C0, 0x0080, 0x00E0, 0x00C0, 0x00F0, 0x00E0, 0x1FF8, 0x1FF0, +static const uint16 _common_moveRight[32] = { + 0x00C0, 0x0080, 0x00E0, 0x00C0, 0x00F0, 0x00E0, 0x1FF8, 0x1FF0, 0x3FFC, 0x3FF8, 0x3FF8, 0x3FF0, 0x3CF0, 0x38E0, 0x3CE0, 0x38C0, 0x3CC0, 0x3880, 0x3C00, 0x3800, 0x3C00, 0x3800, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +}; -// Mouse Back -{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, +static const uint16 _common_moveBack[32] = { + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x03C0, 0x0380, 0x03C0, 0x0380, 0x03C0, 0x0380, 0x03C0, 0x0380, 0x1FF8, 0x1FF0, 0x0FF0, 0x0FE0, 0x07E0, 0x07C0, 0x03C0, 0x0380, - 0x0180, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }, + 0x0180, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +}; -// Move Left -{ 0x0C00, 0x0800, 0x1C00, 0x1800, 0x3C00, 0x3800, 0x7FE0, 0x7FC0, +static const uint16 _common_moveLeft[32] = { + 0x0C00, 0x0800, 0x1C00, 0x1800, 0x3C00, 0x3800, 0x7FE0, 0x7FC0, 0xFFF0, 0xFFE0, 0x7FF0, 0x7FE0, 0x3CF0, 0x38E0, 0x1CF0, 0x18E0, 0x0CF0, 0x08E0, 0x00F0, 0x00E0, 0x00F0, 0x00E0, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }, - + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; static const byte _simon2_cursors[10][256] = { @@ -500,7 +548,7 @@ void AGOSEngine::initMouse() { if (getPlatform() == Common::kPlatformAmiga) color = (getFeatures() & GF_32COLOR) ? 17 : 241; - const uint16 *src = _common_cursors[0]; + const uint16 *src = _common_mouseInfo; for (int i = 0; i < 16; i++) { for (int j = 0; j < 16; j++) { if (src[0] & (1 << (15 - (j % 16)))) { @@ -631,14 +679,56 @@ void AGOSEngine::drawMousePointer() { const uint8 color = (getGameType() == GType_ELVIRA1) ? 15: 65; memset(_mouseData, 0xFF, _maxCursorWidth * _maxCursorHeight); - uint cursor = _mouseCursor; - if (getGameType() == GType_ELVIRA1 && cursor == 2) - cursor = 3; + if (getGameType() == GType_WW) { + if (_mouseCursor == 0) { + src = _common_mouseInfo; + } else if (_mouseCursor == 2) { + src = _common_handInfo; + } else if (_mouseCursor == 3) { + src = _common_swordInfo1; + } else if (_mouseCursor == 4) { + src = _common_moveForward; + } else if (_mouseCursor == 5) { + src = _common_moveRight; + } else if (_mouseCursor == 6) { + src = _common_moveBack; + } else if (_mouseCursor == 7) { + src = _common_moveLeft; + } else { + src = _common_mouseInfo; + } + } else if (getGameType() == GType_ELVIRA2) { + if (_mouseCursor == 0) { + src = _common_mouseInfo; + } else if (_mouseCursor == 1) { + src = _common_shieldInfo1; + } else if (_mouseCursor == 2) { + src = _common_shieldInfo2; + } else if (_mouseCursor == 3) { + src = _common_swordInfo1; + } else if (_mouseCursor == 4) { + src = _common_swordInfo2; + } else if (_mouseCursor == 5) { + src = _common_lightningInfo1; + } else if (_mouseCursor == 6) { + src = _common_lightningInfo2; + } else if (_mouseCursor == 7) { + src = _common_crossbowInfo1; + } else { + src = _common_crossbowInfo2; + } + } else { + if (_mouseCursor == 0) { + src = _common_mouseInfo; + } else if (_mouseCursor == 1) { + src = _common_shieldInfo1; + } else { + src = _common_swordInfo1; + } + } if (_dragFlag != 0) - cursor = 2; - - src = _common_cursors[cursor]; + src = _common_handInfo; for (i = 0; i < 16; i++) { for (j = 0; j < 16; j++) { diff --git a/engines/agos/debug.cpp b/engines/agos/debug.cpp index 507f0ae9e6..c074c3e43f 100644 --- a/engines/agos/debug.cpp +++ b/engines/agos/debug.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/debug.h b/engines/agos/debug.h index 0cd22b7797..89d43b5212 100644 --- a/engines/agos/debug.h +++ b/engines/agos/debug.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -603,7 +605,7 @@ static const char *const elvira2_opcodeNameTable[256] = { /* 172 */ "IWBJ|IF_EXIT_CLOSED", "IWBJ|IF_EXIT_LOCKED", - "W|UNK_174", + "W|PLAY_EFFECT", "|getDollar2", /* 176 */ "IWBB|SET_SUPER_ROOM_EXIT", diff --git a/engines/agos/debugger.cpp b/engines/agos/debugger.cpp index 336039a726..7a455fa0f9 100644 --- a/engines/agos/debugger.cpp +++ b/engines/agos/debugger.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/debugger.h b/engines/agos/debugger.h index 78791649de..0dc5d4fe18 100644 --- a/engines/agos/debugger.h +++ b/engines/agos/debugger.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp index e814625607..dbb4c8faf1 100644 --- a/engines/agos/detection.cpp +++ b/engines/agos/detection.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/agos/detection.cpp $ + * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h index b858cf3d5d..cfb795efbd 100644 --- a/engines/agos/detection_tables.h +++ b/engines/agos/detection_tables.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/agos/detection_tables.h $ + * $Id:detection_tables.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ @@ -441,6 +443,7 @@ static const AGOSGameDescription gameDescriptions[] = { { "icon.pkd", GAME_ICONFILE, "4822a91c18b1b2005ac17fc617f7dcbe", -1}, { "menus.dat", GAME_MENUFILE, "3409eeb8ca8b46fc04da99de67573f5e", -1}, { "start", GAME_RESTFILE, "b575b336e741dde1725edd4079d5ab67", -1}, + { "statelst", GAME_STATFILE, "469e98c69f00928a8366ba415d91902d", -1}, { "stripped.txt", GAME_STRFILE, "6faaebff2786216900061eeb978f10af", -1}, { "tbllist", GAME_TBLFILE, "95c44bfc380770a6b6dd0dfcc69e80a0", -1}, { "xtbllist", GAME_XTBLFILE, "6c7b3db345d46349a5226f695c03e20f", -1}, @@ -490,6 +493,7 @@ static const AGOSGameDescription gameDescriptions[] = { { "menus.dat", GAME_MENUFILE, "3409eeb8ca8b46fc04da99de67573f5e", -1}, { "roomslst", GAME_RMSLFILE, "e3758c46ab8f3c23a1ac012bd607108d", -1}, { "start", GAME_RESTFILE, "036b647973d6884cdfc2042a3d12df83", -1}, + { "statelst", GAME_STATFILE, "469e98c69f00928a8366ba415d91902d", -1}, { "stripped.txt", GAME_STRFILE, "f259e3e07a1cde8d0404a767d815e12c", -1}, { "tbllist", GAME_TBLFILE, "95c44bfc380770a6b6dd0dfcc69e80a0", -1}, { "xtbllist", GAME_XTBLFILE, "6c7b3db345d46349a5226f695c03e20f", -1}, @@ -517,6 +521,7 @@ static const AGOSGameDescription gameDescriptions[] = { { "menus.dat", GAME_MENUFILE, "3409eeb8ca8b46fc04da99de67573f5e", -1}, { "roomslst", GAME_RMSLFILE, "e3758c46ab8f3c23a1ac012bd607108d", -1}, { "start", GAME_RESTFILE, "036b647973d6884cdfc2042a3d12df83", -1}, + { "statelst", GAME_STATFILE, "469e98c69f00928a8366ba415d91902d", -1}, { "stripped.txt", GAME_STRFILE, "f259e3e07a1cde8d0404a767d815e12c", -1}, { "tbllist", GAME_TBLFILE, "95c44bfc380770a6b6dd0dfcc69e80a0", -1}, { "xtbllist", GAME_XTBLFILE, "6c7b3db345d46349a5226f695c03e20f", -1}, diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp index 5b5b42cbbb..f5f7161805 100644 --- a/engines/agos/draw.cpp +++ b/engines/agos/draw.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -306,6 +308,11 @@ void AGOSEngine::dirtyClips() { } void AGOSEngine::restoreBackGround() { + if (getGameType() == GType_ELVIRA1 && getPlatform() == Common::kPlatformAtariST && + (getFeatures() & GF_DEMO)) { + return; + } + AnimTable *animTable; uint images = 0; @@ -361,6 +368,11 @@ void AGOSEngine::restoreBackGround() { } void AGOSEngine::saveBackGround(VgaSprite *vsp) { + if (getGameType() == GType_ELVIRA1 && getPlatform() == Common::kPlatformAtariST && + (getFeatures() & GF_DEMO)) { + return; + } + if ((vsp->flags & kDFSkipStoreBG) || !vsp->image) return; diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp index 9fc8cb72e5..8570859bb8 100644 --- a/engines/agos/event.cpp +++ b/engines/agos/event.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -362,10 +364,11 @@ static const byte _image4[32] = { 0x3A, 0x3A, 0x3B, 0x3A, }; -void AGOSEngine::drawStuff(const byte *src, uint offs) { - byte *dst = getFrontBuf() + offs; +void AGOSEngine::drawStuff(const byte *src, uint xoffs) { + const uint8 y = (getPlatform() == Common::kPlatformAtariST) ? 132 : 135; + byte *dst = getFrontBuf() + y * _screenWidth + xoffs; - for (uint y = 0; y < 6; y++) { + for (uint h = 0; h < 6; h++) { memcpy(dst, src, 4); src += 4; dst += _screenWidth; @@ -373,11 +376,11 @@ void AGOSEngine::drawStuff(const byte *src, uint offs) { } void AGOSEngine::imageEvent2(VgaTimerEntry * vte, uint dx) { - // Draws damage indicator gauge + // Draws damage indicator gauge when player hit _nextVgaTimerToProcess = vte + 1; if (!_opcode177Var1) { - drawStuff(_image1, 43204 + _opcode177Var2 * 4); + drawStuff(_image1, 4 + _opcode177Var2 * 4); _opcode177Var2++; if (_opcode177Var2 == dx) { _opcode177Var1 = 1; @@ -387,7 +390,7 @@ void AGOSEngine::imageEvent2(VgaTimerEntry * vte, uint dx) { } } else if (_opcode177Var2) { _opcode177Var2--; - drawStuff(_image2, 43204 + _opcode177Var2 * 4); + drawStuff(_image2, 4 + _opcode177Var2 * 4); vte->delay = 3; } else { deleteVgaEvent(vte); @@ -395,10 +398,11 @@ void AGOSEngine::imageEvent2(VgaTimerEntry * vte, uint dx) { } void AGOSEngine::imageEvent3(VgaTimerEntry * vte, uint dx) { + // Draws damage indicator gauge when monster hit _nextVgaTimerToProcess = vte + 1; if (!_opcode178Var1) { - drawStuff(_image3, 43475 + _opcode178Var2 * 4); + drawStuff(_image3, 275 + _opcode178Var2 * 4); _opcode178Var2++; if (_opcode178Var2 >= 10 || _opcode178Var2 == dx) { _opcode178Var1 = 1; @@ -408,7 +412,7 @@ void AGOSEngine::imageEvent3(VgaTimerEntry * vte, uint dx) { } } else if (_opcode178Var2) { _opcode178Var2--; - drawStuff(_image4, 43475 + _opcode178Var2 * 4); + drawStuff(_image4, 275 + _opcode178Var2 * 4); vte->delay = 3; } else { deleteVgaEvent(vte); diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp index 68c405ba8c..6486cc8ca7 100644 --- a/engines/agos/gfx.cpp +++ b/engines/agos/gfx.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -630,7 +632,7 @@ void AGOSEngine_Simon1::drawImage(VC10_state *state) { if (getFeatures() & GF_32COLOR) state->palette = 0xC0; - uint16 xoffs = 0, yoffs = 0; + uint16 xoffs, yoffs; if (getGameType() == GType_SIMON2) { state->surf2_addr = getBackGround(); state->surf2_pitch = _screenWidth; @@ -667,7 +669,7 @@ void AGOSEngine_Simon1::drawImage(VC10_state *state) { xoffs = (vlut[0] * 2 + state->x) * 8; yoffs = vlut[1] + state->y; } - } else if (getGameType() == GType_SIMON1) { + } else { if (_windowNum == 3 || _windowNum == 4 || _windowNum >= 10) { if (_window3Flag == 1) { state->surf2_addr = getBackGround(); @@ -810,7 +812,7 @@ void AGOSEngine::drawImage(VC10_state *state) { if (!drawImage_clip(state)) return; - uint16 xoffs = 0, yoffs = 0; + uint16 xoffs, yoffs; if (getGameType() == GType_WW) { if (_windowNum == 4 || (_windowNum >= 10 && _windowNum <= 27)) { state->surf_addr = _window4BackScn; @@ -851,7 +853,7 @@ void AGOSEngine::drawImage(VC10_state *state) { xoffs = (vlut[0] * 2 + state->x) * 8; yoffs = vlut[1] + state->y; } - } else if (getGameType() == GType_ELVIRA1) { + } else { if (_windowNum == 6) { state->surf_addr = _window6BackScn; state->surf_pitch = 48; @@ -1301,8 +1303,8 @@ void AGOSEngine::setWindowImage(uint16 mode, uint16 vga_res_id) { uint height = _videoWindows[updateWindow * 4 + 3]; byte *dst = getBackGround() + xoffs + yoffs * _screenWidth; - byte *src = dst; - uint srcWidth = 0; + byte *src; + uint srcWidth; if (getGameType() == GType_SIMON2) { src = _window4BackScn + xoffs + yoffs * 320; @@ -1355,7 +1357,7 @@ void AGOSEngine::setWindowImage(uint16 mode, uint16 vga_res_id) { _lockWord &= ~0x20; return; } - } else if (getGameType() == GType_ELVIRA1) { + } else { if (updateWindow == 6) { _window6Flag = 1; src = _window6BackScn; diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp index 72afd25f43..9c8938bb97 100644 --- a/engines/agos/icons.cpp +++ b/engines/agos/icons.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp index 3c02018421..3f2efc86b4 100644 --- a/engines/agos/input.cpp +++ b/engines/agos/input.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/intern.h b/engines/agos/intern.h index d8273e4c43..f39ca7d3da 100644 --- a/engines/agos/intern.h +++ b/engines/agos/intern.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -225,11 +227,12 @@ enum GameFileTypes { GAME_MENUFILE = 1 << 3, GAME_STRFILE = 1 << 4, GAME_RMSLFILE = 1 << 5, - GAME_TBLFILE = 1 << 6, - GAME_XTBLFILE = 1 << 7, - GAME_RESTFILE = 1 << 8, + GAME_STATFILE = 1 << 6, + GAME_TBLFILE = 1 << 7, + GAME_XTBLFILE = 1 << 8, + GAME_RESTFILE = 1 << 9, - GAME_GFXIDXFILE = 1 << 9 + GAME_GFXIDXFILE = 1 << 10 }; enum GameIds { diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp index a7c8fa3aa5..165af6f797 100644 --- a/engines/agos/items.cpp +++ b/engines/agos/items.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/menus.cpp b/engines/agos/menus.cpp index 33023ce437..802752fad9 100644 --- a/engines/agos/menus.cpp +++ b/engines/agos/menus.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp index 0cec11033c..13b84c0cda 100644 --- a/engines/agos/midi.cpp +++ b/engines/agos/midi.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/midi.h b/engines/agos/midi.h index a28847a343..2994c49bb6 100644 --- a/engines/agos/midi.h +++ b/engines/agos/midi.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/midiparser_s1d.cpp b/engines/agos/midiparser_s1d.cpp index 43928d5e47..f5a1d5ff87 100644 --- a/engines/agos/midiparser_s1d.cpp +++ b/engines/agos/midiparser_s1d.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/oracle.cpp b/engines/agos/oracle.cpp index 9aa3a4bf87..c38ee8fa6d 100644 --- a/engines/agos/oracle.cpp +++ b/engines/agos/oracle.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp index a7da0fb8d7..f5936b7d85 100644 --- a/engines/agos/res.cpp +++ b/engines/agos/res.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -213,6 +215,26 @@ void AGOSEngine::loadGamePcFile() { in.close(); } + if (getFileName(GAME_STATFILE) != NULL) { + /* Read list of ROOM STATE resources */ + in.open(getFileName(GAME_STATFILE)); + if (in.isOpen() == false) { + error("loadGamePcFile: Can't load state resources file '%s'", getFileName(GAME_STATFILE)); + } + + _numRoomStates = in.size() / 8; + + _stateList = (byte *)malloc(_numRoomStates * 6); + if (_stateList == NULL) + error("loadGamePcFile: Out of memory for room state list"); + + _numRoomStates *= 3; + + // TODO Load room state resources + + in.close(); + } + if (getFileName(GAME_RMSLFILE) != NULL) { /* Read list of ROOM ITEMS resources */ in.open(getFileName(GAME_RMSLFILE)); diff --git a/engines/agos/res_ami.cpp b/engines/agos/res_ami.cpp index 713e1e1722..e298cf66e9 100644 --- a/engines/agos/res_ami.cpp +++ b/engines/agos/res_ami.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp index 41c3dce075..cc5ba2a793 100644 --- a/engines/agos/res_snd.cpp +++ b/engines/agos/res_snd.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -397,6 +399,38 @@ void AGOSEngine::loadSoundFile(const char* filename) { _sound->playSfxData(dst, 0, 0, 0); } +void AGOSEngine::loadSound(uint sound) { + byte *dst; + uint32 offs, size; + + if (_curSfxFile == NULL) + return; + + dst = _curSfxFile; + if (getGameType() == GType_WW) { + uint tmp = sound; + while (tmp--) + dst += READ_LE_UINT16(dst) + 4; + + size = READ_LE_UINT16(dst); + offs = 4; + } else if (getGameType() == GType_ELVIRA2) { + while (READ_BE_UINT32(dst + 4) != sound) + dst += 12; + + size = READ_BE_UINT32(dst); + offs = READ_BE_UINT32(dst + 8); + } else { + while (READ_BE_UINT16(dst + 6) != sound) + dst += 12; + + size = READ_BE_UINT16(dst + 2); + offs = READ_BE_UINT32(dst + 8); + } + + _sound->playRawData(dst + offs, sound, size); +} + void AGOSEngine::loadSound(uint sound, int pan, int vol, uint type) { byte *dst; diff --git a/engines/agos/rooms.cpp b/engines/agos/rooms.cpp index 3996b33839..f7c0254c4f 100644 --- a/engines/agos/rooms.cpp +++ b/engines/agos/rooms.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -349,7 +351,7 @@ void AGOSEngine_Elvira2::setSRExit(Item *i, int n, int d, uint16 s) { } // Waxworks specific -bool AGOSEngine_Waxworks::loadRoomItems(uint item) { +bool AGOSEngine::loadRoomItems(uint item) { byte *p; uint i, min_num, max_num; char filename[30]; @@ -359,6 +361,7 @@ bool AGOSEngine_Waxworks::loadRoomItems(uint item) { if (p == NULL) return 0; + _currentRoom = item; item -= 2; while (*p) { @@ -375,7 +378,6 @@ bool AGOSEngine_Waxworks::loadRoomItems(uint item) { max_num = READ_BE_UINT16(p); p += 2; if (item >= min_num && item <= max_num) { - in.open(filename); if (in.isOpen() == false) { error("loadRoomItems: Can't load rooms file '%s'", filename); diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp index de3a0f416a..1267e27daa 100644 --- a/engines/agos/saveload.cpp +++ b/engines/agos/saveload.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -247,7 +249,7 @@ void AGOSEngine::userGame(bool load) { name = buf + 192; for (;;) { - windowPutChar(window, 127); + windowPutChar(window, 128); _saveLoadEdit = true; @@ -980,6 +982,14 @@ bool AGOSEngine_Elvira2::loadGame(const char *filename, bool restartMode) { addTimeEvent(timeout, subroutine_id); } + if (getGameType() == GType_WW) { + // TODO Load room state data + for (uint s = 0; s <= _numRoomStates; s++) { + f->readUint16BE(); + } + f->readUint16BE(); + } + item_index = 1; for (num = _itemArrayInited - 1; num; num--) { Item *item = _itemArrayPtr[item_index++], *parent_item; @@ -1042,7 +1052,7 @@ bool AGOSEngine_Elvira2::loadGame(const char *filename, bool restartMode) { // read the items in item store for (i = 0; i != _numItemStore; i++) { - if (getGameType() == GType_ELVIRA2) { + if (getGameType() == GType_ELVIRA2 && getPlatform() == Common::kPlatformPC) { _itemStore[i] = derefItem(readItemID(f)); } else { _itemStore[i] = derefItem(f->readUint16BE()); @@ -1120,6 +1130,14 @@ bool AGOSEngine_Elvira2::saveGame(uint slot, const char *caption) { f->writeUint16BE(te->subroutine_id); } + if (getGameType() == GType_WW) { + // TODO Save room state data + for (uint s = 0; s <= _numRoomStates; s++) { + f->writeUint16BE(0); + } + f->writeUint16BE(_currentRoom); + } + item_index = 1; for (num_item = _itemArrayInited - 1; num_item; num_item--) { Item *item = _itemArrayPtr[item_index++]; @@ -1173,7 +1191,7 @@ bool AGOSEngine_Elvira2::saveGame(uint slot, const char *caption) { // write the items in item store for (i = 0; i != _numItemStore; i++) { - if (getGameType() == GType_ELVIRA2) { + if (getGameType() == GType_ELVIRA2 && getPlatform() == Common::kPlatformPC) { writeItemID(f, itemPtrToID(_itemStore[i])); } else { f->writeUint16BE(itemPtrToID(_itemStore[i])); diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp index 9961a3ff0b..8a4457faf2 100644 --- a/engines/agos/script.cpp +++ b/engines/agos/script.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/script_e1.cpp b/engines/agos/script_e1.cpp index 105f4ba16b..06c347f391 100644 --- a/engines/agos/script_e1.cpp +++ b/engines/agos/script_e1.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp index 3b2c1203df..13cb15a8b9 100644 --- a/engines/agos/script_e2.cpp +++ b/engines/agos/script_e2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -249,7 +251,7 @@ void AGOSEngine_Elvira2::setupOpcodes() { /* 172 */ OPCODE(oe2_ifExitClosed), OPCODE(oe2_ifExitLocked), - OPCODE(oe2_unk174), + OPCODE(oe2_playEffect), OPCODE(oe2_getDollar2), /* 176 */ OPCODE(oe2_setSRExit), @@ -498,6 +500,7 @@ void AGOSEngine_Elvira2::oe2_printStats() { // 161: print stats WindowBlock *window = _dummyWindow; int val; + const uint8 y = (getPlatform() == Common::kPlatformAtariST) ? 131 : 134; window->flags = 1; @@ -509,7 +512,7 @@ void AGOSEngine_Elvira2::oe2_printStats() { val = -99; if (val > 99) val = 99; - writeChar(window, 10, 134, 0, val); + writeChar(window, 10, y, 0, val); // PP val = _variableArray[22]; @@ -517,7 +520,7 @@ void AGOSEngine_Elvira2::oe2_printStats() { val = -99; if (val > 99) val = 99; - writeChar(window, 16, 134, 6, val); + writeChar(window, 16, y, 6, val); // HP val = _variableArray[23]; @@ -525,7 +528,7 @@ void AGOSEngine_Elvira2::oe2_printStats() { val = -99; if (val > 99) val = 99; - writeChar(window, 23, 134, 4, val); + writeChar(window, 23, y, 4, val); // Experience val = _variableArray[21]; @@ -533,8 +536,8 @@ void AGOSEngine_Elvira2::oe2_printStats() { val = -99; if (val > 9999) val = 9999; - writeChar(window, 30, 134, 6, val / 100); - writeChar(window, 32, 134, 2, val); + writeChar(window, 30, y, 6, val / 100); + writeChar(window, 32, y, 2, val / 10); mouseOn(); } @@ -597,10 +600,12 @@ void AGOSEngine_Elvira2::oe2_ifExitLocked() { setScriptCondition(getExitState(i, n, d) == 3); } -void AGOSEngine_Elvira2::oe2_unk174() { - // 174: - uint a = getVarOrWord(); - debug(0, "oe2_unk174: stub (%d)", a); +void AGOSEngine_Elvira2::oe2_playEffect() { + // 174: play sound + uint soundId = getVarOrWord(); + loadSound(soundId); + + debug(0, "oe2_playEffect: stub (%d)", soundId); } void AGOSEngine_Elvira2::oe2_getDollar2() { diff --git a/engines/agos/script_ff.cpp b/engines/agos/script_ff.cpp index 7dff2346cf..db36d6f736 100644 --- a/engines/agos/script_ff.cpp +++ b/engines/agos/script_ff.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/script_pp.cpp b/engines/agos/script_pp.cpp index 3038a48e0d..fd8ef9b859 100644 --- a/engines/agos/script_pp.cpp +++ b/engines/agos/script_pp.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp index b10013d186..e104013cae 100644 --- a/engines/agos/script_s1.cpp +++ b/engines/agos/script_s1.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/script_s2.cpp b/engines/agos/script_s2.cpp index 9d61f377a0..9041a99662 100644 --- a/engines/agos/script_s2.cpp +++ b/engines/agos/script_s2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/script_ww.cpp b/engines/agos/script_ww.cpp index 5edcf1621d..690a717acf 100644 --- a/engines/agos/script_ww.cpp +++ b/engines/agos/script_ww.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp index 1cfd465cd6..a4de624ec0 100644 --- a/engines/agos/sound.cpp +++ b/engines/agos/sound.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/sound.h b/engines/agos/sound.h index a10458534e..1e5a8a47d2 100644 --- a/engines/agos/sound.h +++ b/engines/agos/sound.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp index 2335d894ac..8c5e911c39 100644 --- a/engines/agos/string.cpp +++ b/engines/agos/string.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp index 8ab0c49110..a92f01db2b 100644 --- a/engines/agos/subroutine.cpp +++ b/engines/agos/subroutine.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/verb.cpp b/engines/agos/verb.cpp index 124065eaeb..ddb7398312 100644 --- a/engines/agos/verb.cpp +++ b/engines/agos/verb.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp index eb2d1391ce..1d2c280246 100644 --- a/engines/agos/vga.cpp +++ b/engines/agos/vga.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -606,6 +608,13 @@ void AGOSEngine::vc10_draw() { flags = vcReadNextWord(); } + if (getGameType() == GType_ELVIRA2 && getPlatform() == Common::kPlatformAtariST) { + if (((image >= 11 && image <= 16) || (image >= 195 && image <= 198)) && + _zoneNumber == 1) { + y += 75; + } + } + drawImage_init(image, palette, x, y, flags); } @@ -1065,37 +1074,14 @@ void AGOSEngine::vc27_resetSprite() { } void AGOSEngine::vc28_playSFX() { - byte *dst; - uint sound, channels, frequency, flags; - uint offs, size; + uint16 sound = vcReadNextWord(); + uint16 channels = vcReadNextWord(); + uint16 frequency = vcReadNextWord(); + uint16 flags = vcReadNextWord(); - sound = vcReadNextWord(); - channels = vcReadNextWord(); - frequency = vcReadNextWord(); - flags = vcReadNextWord(); + loadSound(sound); debug(0, "vc28_playSFX: (%d, %d, %d, %d)", sound, channels, frequency, flags); - - if (_curSfxFile == NULL) - return; - - dst = _curSfxFile; - if (getGameType() == GType_WW) { - uint tmp = sound; - while (tmp--) - dst += READ_LE_UINT16(dst) + 4; - - size = READ_LE_UINT16(dst); - offs = 4; - } else { - while (READ_BE_UINT16(dst + 6) != sound) - dst += 12; - - size = READ_BE_UINT16(dst + 2); - offs = READ_BE_UINT32(dst + 8); - } - - _sound->playRawData(dst + offs, sound, size); } void AGOSEngine::vc29_stopAllSounds() { @@ -1258,8 +1244,10 @@ void AGOSEngine::vc37_pokePalette() { palptr[2] = ((color & 0x00f) >> 0) * 32; palptr[3] = 0; - _paletteFlag = 2; - _vgaSpriteChanged++; + if (!(_lockWord & 0x20)) { + _paletteFlag = 1; + _displayScreen++; + } } void AGOSEngine::vc38_ifVarNotZero() { diff --git a/engines/agos/vga.h b/engines/agos/vga.h index 2daa0c02a6..37c5d37106 100644 --- a/engines/agos/vga.h +++ b/engines/agos/vga.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/vga_e2.cpp b/engines/agos/vga_e2.cpp index ee6afd09e6..ca1a3a4469 100644 --- a/engines/agos/vga_e2.cpp +++ b/engines/agos/vga_e2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -186,6 +188,8 @@ void AGOSEngine::vc52_playSound() { _sound->playEffects(sound); } else if (getGameId() == GID_SIMON1DOS) { playSting(sound); + } else { + loadSound(sound); } } diff --git a/engines/agos/vga_ff.cpp b/engines/agos/vga_ff.cpp index e5d85743e5..e1ee56002e 100644 --- a/engines/agos/vga_ff.cpp +++ b/engines/agos/vga_ff.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/vga_s1.cpp b/engines/agos/vga_s1.cpp index bbad846727..95e8e0a8b5 100644 --- a/engines/agos/vga_s1.cpp +++ b/engines/agos/vga_s1.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/vga_s2.cpp b/engines/agos/vga_s2.cpp index 6989e26b46..9e482e95f4 100644 --- a/engines/agos/vga_s2.cpp +++ b/engines/agos/vga_s2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/vga_ww.cpp b/engines/agos/vga_ww.cpp index 3c18fd5a08..60aeeaeebe 100644 --- a/engines/agos/vga_ww.cpp +++ b/engines/agos/vga_ww.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/agos/window.cpp b/engines/agos/window.cpp index d3b6c1b8cd..94436b0560 100644 --- a/engines/agos/window.cpp +++ b/engines/agos/window.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -123,6 +125,10 @@ void AGOSEngine::colorWindow(WindowBlock *window) { dst += _screenWidth; } } else { + dst = getFrontBuf() + _dxSurfacePitch * (window->y) + window->x * 8; + h = window->height * 8; + w = window->width * 8; + if (getGameType() == GType_ELVIRA2 && window->y == 146) { if (window->fill_color == 1) { _displayPalette[33 * 4 + 0] = 48 * 4; @@ -134,12 +140,11 @@ void AGOSEngine::colorWindow(WindowBlock *window) { _displayPalette[33 * 4 + 2] = 40 * 4; } - _paletteFlag = 2; - } + dst -= _dxSurfacePitch; + h += 2; - dst = getFrontBuf() + _dxSurfacePitch * window->y + window->x * 8; - h = window->height * 8; - w = window->width * 8; + _paletteFlag = 1; + } uint8 color = window->fill_color; if (getGameType() == GType_ELVIRA2 || getGameType() == GType_WW) diff --git a/engines/agos/zones.cpp b/engines/agos/zones.cpp index 630d85d145..05643a6e89 100644 --- a/engines/agos/zones.cpp +++ b/engines/agos/zones.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -63,7 +65,15 @@ void AGOSEngine::loadZone(uint zoneNum) { vpe->vgaFile1End = _blockEnd; vpe->sfxFile = NULL; - if (!(getFeatures() & GF_ZLIBCOMP)) { + + if ((getPlatform() == Common::kPlatformAmiga || getPlatform() == Common::kPlatformAtariST) && + getGameType() == GType_ELVIRA2) { + // A singe sound file is used for Amiga and AtariST versions + if (loadVGASoundFile(1, 3)) { + vpe->sfxFile = _block; + vpe->sfxFileEnd = _blockEnd; + } + } else if (!(getFeatures() & GF_ZLIBCOMP)) { if (loadVGASoundFile(zoneNum, 3)) { vpe->sfxFile = _block; vpe->sfxFileEnd = _blockEnd; diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp index a30c2bdff3..2829a31bc0 100644 --- a/engines/cine/anim.cpp +++ b/engines/cine/anim.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -45,7 +46,7 @@ struct animHeader2Struct { uint16 field_E; }; -uint16 frameVar0 = 0; +static uint16 animDataCount = 0; animHeaderStruct animHeader; @@ -183,7 +184,30 @@ animDataEntry animData[] = { {"FIN", 0x9}, }; -byte getAnimTransparentColor(const char *animName) { +static void freeAnimData(byte idx) { + assert(idx < NUM_MAX_ANIMDATA); + if (animDataTable[idx].ptr1) { + free(animDataTable[idx].ptr1); + free(animDataTable[idx].ptr2); + memset(&animDataTable[idx], 0, sizeof(AnimData)); + animDataTable[idx].fileIdx = -1; + animDataTable[idx].frameIdx = -1; + if (animDataCount > 0) + animDataCount--; + } +} + +void freeAnimDataRange(byte startIdx, byte numIdx) { + for (byte i = 0; i < numIdx; i++) { + freeAnimData(i + startIdx); + } +} + +void freeAnimDataTable() { + freeAnimDataRange(0, NUM_MAX_ANIMDATA); +} + +static byte getAnimTransparentColor(const char *animName) { char name[15]; removeExtention(name, animName); @@ -237,7 +261,7 @@ int16 allocFrame(uint16 width, uint16 height, int8 isMask) { animDataTable[i].frameIdx = -1; } - frameVar0++; + animDataCount++; return i; } @@ -287,7 +311,7 @@ int16 allocFrame2(uint16 width, uint16 height, uint16 type) { animDataTable[i].fileIdx = -1; animDataTable[i].frameIdx = -1; - frameVar0++; + animDataCount++; return i; } @@ -331,7 +355,7 @@ int16 reserveFrame(uint16 width, uint16 height, uint16 type, uint16 idx) { animDataTable[i].fileIdx = -1; animDataTable[i].frameIdx = -1; - frameVar0++; + animDataCount++; return i; } @@ -393,6 +417,8 @@ void loadSpl(const char *resourceName) { animDataTable[entry].fileIdx = foundFileIdx; animDataTable[entry].frameIdx = 0; strcpy(animDataTable[entry].name, currentPartName); + + free(dataPtr); } void loadSplAbs(const char *resourceName, uint16 idx) { @@ -405,6 +431,8 @@ void loadSplAbs(const char *resourceName, uint16 idx) { entry = reserveFrame((uint16) partBuffer[foundFileIdx].unpackedSize, 1, 0, idx); memcpy(animDataTable[entry].ptr1, dataPtr, partBuffer[foundFileIdx].unpackedSize); + + free(dataPtr); } void loadMsk(const char *resourceName) { @@ -452,6 +480,8 @@ void loadMsk(const char *resourceName) { animDataTable[entry].frameIdx = i; strcpy(animDataTable[entry].name, currentPartName); } + + free(dataPtr); } void loadAni(const char *resourceName) { @@ -532,6 +562,8 @@ void loadAni(const char *resourceName) { animDataTable[entry].frameIdx = i; strcpy(animDataTable[entry].name, currentPartName); } + + free(dataPtr); } void convert8BBP(byte * dest, byte * source, int16 width, int16 height) { @@ -731,6 +763,8 @@ void loadSet(const char *resourceName) { animDataTable[entry].frameIdx = i; strcpy(animDataTable[entry].name, currentPartName); } + + free(dataPtr); } void loadSetAbs(const char *resourceName, uint16 idx) { @@ -818,6 +852,8 @@ void loadSetAbs(const char *resourceName, uint16 idx) { animDataTable[entry].frameIdx = i; strcpy(animDataTable[entry].name, currentPartName); } + + free(dataPtr); } void loadSeq(const char *resourceName) { @@ -831,6 +867,8 @@ void loadSeq(const char *resourceName) { entry = allocFrame2((uint16) partBuffer[foundFileIdx].unpackedSize, 1, 0); memcpy(animDataTable[entry].ptr1, dataPtr + 0x16, (uint16) partBuffer[foundFileIdx].unpackedSize - 0x16); + + free(dataPtr); } void loadSeqAbs(const char *resourceName, uint16 idx) { @@ -844,6 +882,8 @@ void loadSeqAbs(const char *resourceName, uint16 idx) { entry = reserveFrame((uint16) partBuffer[foundFileIdx].unpackedSize, 1, 0, idx); memcpy(animDataTable[entry].ptr1, dataPtr + 0x16, (uint16) partBuffer[foundFileIdx].unpackedSize - 0x16); + + free(dataPtr); } void loadResource(const char *resourceName) { @@ -1037,6 +1077,7 @@ void loadResourcesFromSave() { } } + free(dataPtr); } } diff --git a/engines/cine/anim.h b/engines/cine/anim.h index 13100eec62..92b5a646a9 100644 --- a/engines/cine/anim.h +++ b/engines/cine/anim.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,8 +28,6 @@ namespace Cine { -extern uint16 frameVar0; - struct animHeaderStruct { byte field_0; byte field_1; @@ -57,6 +56,8 @@ struct animDataEntry { extern animDataEntry animData[]; +void freeAnimDataTable(void); +void freeAnimDataRange(byte startIdx, byte numIdx); void loadResource(const char *animName); void loadAbs(const char *resourceName, uint16 idx); void loadResourcesFromSave(); diff --git a/engines/cine/bg.cpp b/engines/cine/bg.cpp index 41291dea92..c368868113 100644 --- a/engines/cine/bg.cpp +++ b/engines/cine/bg.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -39,10 +40,11 @@ void loadCtHigh(byte * currentPtr) { byte loadCt(const char *ctName) { uint16 header[32]; + byte *ptr, *dataPtr; strcpy(currentCtName, ctName); - byte *ptr = readBundleFile(findFileInBundle(ctName)); + ptr = dataPtr = readBundleFile(findFileInBundle(ctName)); if (g_cine->getGameType() == Cine::GType_OS) { uint16 bpp = READ_BE_UINT16(ptr); ptr += 2; @@ -68,6 +70,7 @@ byte loadCt(const char *ctName) { gfxConvertSpriteToRaw(page3Raw, ptr + 0x80, 160, 200); } + free(dataPtr); return 0; } @@ -81,10 +84,12 @@ void loadBgHigh(const char *currentPtr) { } byte loadBg(const char *bgName) { + byte *ptr, *dataPtr; + strcpy(currentBgName[0], bgName); byte fileIdx = findFileInBundle(bgName); - byte *ptr = readBundleFile(fileIdx); + ptr = dataPtr = readBundleFile(fileIdx); uint16 bpp = READ_BE_UINT16(ptr); ptr += 2; if (bpp == 8) { @@ -102,6 +107,7 @@ byte loadBg(const char *bgName) { gfxResetRawPage(page2Raw); gfxConvertSpriteToRaw(page2Raw, ptr, 160, 200); } + free(dataPtr); return 0; } @@ -110,10 +116,12 @@ byte currentAdditionalBgIdx = 0; byte currentAdditionalBgIdx2 = 0; void addBackground(const char *bgName, uint16 bgIdx) { + byte *ptr, *dataPtr; + strcpy(currentBgName[bgIdx], bgName); byte fileIdx = findFileInBundle(bgName); - byte *ptr = readBundleFile(fileIdx); + ptr = dataPtr = readBundleFile(fileIdx); additionalBgTable[bgIdx] = (byte *) malloc(320 * 200); @@ -125,6 +133,7 @@ void addBackground(const char *bgName, uint16 bgIdx) { ptr += 32; gfxConvertSpriteToRaw(additionalBgTable[bgIdx], ptr, 160, 200); } + free(dataPtr); } } // End of namespace Cine diff --git a/engines/cine/bg.h b/engines/cine/bg.h index 88256f05fe..7145af467a 100644 --- a/engines/cine/bg.h +++ b/engines/cine/bg.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/bg_list.cpp b/engines/cine/bg_list.cpp index 9ba38663d9..c6d85e5909 100644 --- a/engines/cine/bg_list.cpp +++ b/engines/cine/bg_list.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/bg_list.h b/engines/cine/bg_list.h index a1aa942a51..3abbf15c08 100644 --- a/engines/cine/bg_list.h +++ b/engines/cine/bg_list.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp index 97af6d2df8..bd5b82fec2 100644 --- a/engines/cine/cine.cpp +++ b/engines/cine/cine.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,7 +25,6 @@ #include "common/stdafx.h" #include "common/file.h" -//#include "common/fs.h" #include "common/savefile.h" #include "common/config-manager.h" #include "common/system.h" @@ -69,12 +69,6 @@ CineEngine::~CineEngine() { freePoldatDat(); freeErrmessDat(); } - - if (palFileHandleP); - delete palFileHandleP; - - if (partFileHandleP); - delete partFileHandleP; } int CineEngine::init() { @@ -83,9 +77,6 @@ int CineEngine::init() { GUIErrorMessage("No valid games were found in the specified directory."); return -1; } - - palFileHandleP = new Common::File(); - partFileHandleP = new Common::File(); // Initialize backend _system->beginGFXTransaction(); diff --git a/engines/cine/cine.h b/engines/cine/cine.h index 061e9ab66b..eef54bb737 100644 --- a/engines/cine/cine.h +++ b/engines/cine/cine.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,6 +28,7 @@ #include "common/stdafx.h" #include "common/scummsys.h" +#include "common/file.h" #include "common/util.h" #include "engines/engine.h" @@ -81,6 +83,7 @@ public: void makeSystemMenu(void); const CINEGameDescription *_gameDescription; + Common::File _partFileHandle; private: void initialize(void); diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index 7edb196d02..f24fe488d1 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp index 71aa33b28b..ffe6439d04 100644 --- a/engines/cine/gfx.cpp +++ b/engines/cine/gfx.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/gfx.h b/engines/cine/gfx.h index d46a033363..049e17d127 100644 --- a/engines/cine/gfx.h +++ b/engines/cine/gfx.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp index 5f601b8aa7..b55ee361c2 100644 --- a/engines/cine/main_loop.cpp +++ b/engines/cine/main_loop.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -146,7 +147,6 @@ void manageEvents(int count) { } int i; - for (i = 0; i < count; i++) { //FIXME(?): Maybe there's a better way to "fix" this? // diff --git a/engines/cine/main_loop.h b/engines/cine/main_loop.h index 2ff3ba1ad8..e76eb2cf31 100644 --- a/engines/cine/main_loop.h +++ b/engines/cine/main_loop.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/msg.cpp b/engines/cine/msg.cpp index 691c024259..3f5f33fc40 100644 --- a/engines/cine/msg.cpp +++ b/engines/cine/msg.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -34,7 +35,7 @@ uint16 messageCount; void loadMsg(char *pMsgName) { uint16 i; - byte *ptr; + byte *ptr, *dataPtr; checkDataDisk(-1); @@ -42,17 +43,13 @@ void loadMsg(char *pMsgName) { for (i = 0; i < NUM_MAX_MESSAGE; i++) { messageTable[i].len = 0; - if (messageTable[i].ptr) { - assert(messageTable[i].ptr); - free(messageTable[i].ptr); + messageTable[i].ptr = NULL; } - - messageTable[i].ptr = NULL; } - ptr = readBundleFile(findFileInBundle(pMsgName)); + ptr = dataPtr = readBundleFile(findFileInBundle(pMsgName)); setMouseCursor(MOUSE_CURSOR_DISK); @@ -74,6 +71,8 @@ void loadMsg(char *pMsgName) { ptr += messageTable[i].len; } } + + free(dataPtr); } } // End of namespace Cine diff --git a/engines/cine/msg.h b/engines/cine/msg.h index bbba935466..9828da8bab 100644 --- a/engines/cine/msg.h +++ b/engines/cine/msg.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp index 980bcfe5d7..1e92234e04 100644 --- a/engines/cine/object.cpp +++ b/engines/cine/object.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -61,11 +62,11 @@ void loadObject(char *pObjectName) { uint16 numEntry; uint16 entrySize; uint16 i; - byte *ptr; + byte *ptr, *dataPtr; checkDataDisk(-1); - ptr = readBundleFile(findFileInBundle(pObjectName)); + ptr = dataPtr = readBundleFile(findFileInBundle(pObjectName)); setMouseCursor(MOUSE_CURSOR_DISK); @@ -95,6 +96,8 @@ void loadObject(char *pObjectName) { objectTable[i].costume = 0; } } + + free(dataPtr); } int8 removeOverlayElement(uint16 objIdx, uint16 param) { @@ -133,12 +136,11 @@ int8 removeOverlayElement(uint16 objIdx, uint16 param) { int16 freeOverlay(uint16 objIdx, uint16 param) { overlayHeadElement *currentHeadPtr = overlayHead.next; - overlayHeadElement *tempHead = &overlayHead; - overlayHeadElement *tempPtr2; + overlayHeadElement *previousPtr = &overlayHead; while (currentHeadPtr && ((currentHeadPtr->objIdx != objIdx) || (currentHeadPtr->type != param))) { - tempHead = currentHeadPtr; - currentHeadPtr = tempHead->next; + previousPtr = currentHeadPtr; + currentHeadPtr = previousPtr->next; } if (!currentHeadPtr) { @@ -149,8 +151,8 @@ int16 freeOverlay(uint16 objIdx, uint16 param) { return -1; } - tempHead->next = currentHeadPtr->next; - tempPtr2 = currentHeadPtr->next; + previousPtr->next = currentHeadPtr->next; + overlayHeadElement *tempPtr2 = currentHeadPtr->next; if (!tempPtr2) { tempPtr2 = &overlayHead; @@ -158,9 +160,7 @@ int16 freeOverlay(uint16 objIdx, uint16 param) { tempPtr2->previous = currentHeadPtr->previous; - //TODO: fix ! - //free(currentHeadPtr); - + free(currentHeadPtr); return 0; } diff --git a/engines/cine/object.h b/engines/cine/object.h index 0141bcf21c..7d4d492bf2 100644 --- a/engines/cine/object.h +++ b/engines/cine/object.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/pal.cpp b/engines/cine/pal.cpp index 6d3845ad78..f6754f9195 100644 --- a/engines/cine/pal.cpp +++ b/engines/cine/pal.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -34,9 +35,7 @@ byte palette256[256 * 3]; uint16 palEntriesCount; -Common::File *palFileHandleP = NULL; - -PalEntry *palPtr; +PalEntry *palPtr = NULL; byte paletteBuffer1[16]; byte paletteBuffer2[16]; @@ -48,8 +47,6 @@ void loadPal(const char *fileName) { strcat(buffer, ".PAL"); - palFileHandle.close(); - if (palPtr) { free(palPtr); palPtr = NULL; @@ -57,9 +54,9 @@ void loadPal(const char *fileName) { palEntriesCount = 0; - palFileHandle.open(buffer); - - assert(palFileHandle.isOpen()); + Common::File palFileHandle; + if (!palFileHandle.open(buffer)) + error("loadPal(): Cannot open file %s", fileName); palEntriesCount = palFileHandle.readUint16LE(); palFileHandle.readUint16LE(); // entry size @@ -71,6 +68,7 @@ void loadPal(const char *fileName) { palFileHandle.read(palPtr[i].pal1, 16); palFileHandle.read(palPtr[i].pal2, 16); } + palFileHandle.close(); } int16 findPaletteFromName(const char *fileName) { diff --git a/engines/cine/pal.h b/engines/cine/pal.h index 4e34675d5d..89392e6ae6 100644 --- a/engines/cine/pal.h +++ b/engines/cine/pal.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/part.cpp b/engines/cine/part.cpp index 7ef81f5069..c27240169e 100644 --- a/engines/cine/part.cpp +++ b/engines/cine/part.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -36,65 +37,37 @@ PartBuffer *partBuffer; void loadPart(const char *partName) { uint16 i; - for (i = 0; i < NUM_MAX_PARTDATA; i++) { - partBuffer[i].partName[0] = 0; - partBuffer[i].offset = 0; - partBuffer[i].packedSize = 0; - partBuffer[i].unpackedSize = 0; - } - + memset(partBuffer, 0, sizeof(PartBuffer) * NUM_MAX_PARTDATA); numElementInPart = 0; - partFileHandle.close(); + g_cine->_partFileHandle.close(); checkDataDisk(-1); - partFileHandle.open(partName); - - assert(partFileHandle.isOpen()); + if (!g_cine->_partFileHandle.open(partName)) + error("loadPart(): Cannot open file %s", partName); setMouseCursor(MOUSE_CURSOR_DISK); - numElementInPart = partFileHandle.readUint16BE(); - partFileHandle.readUint16BE(); // entry size + numElementInPart = g_cine->_partFileHandle.readUint16BE(); + g_cine->_partFileHandle.readUint16BE(); // entry size strcpy(currentPartName, partName); for (i = 0; i < numElementInPart; i++) { - partFileHandle.read(partBuffer[i].partName, 14); - partBuffer[i].offset = partFileHandle.readUint32BE(); - partBuffer[i].packedSize = partFileHandle.readUint32BE(); - partBuffer[i].unpackedSize = partFileHandle.readUint32BE(); - partFileHandle.readUint32BE(); // unused + g_cine->_partFileHandle.read(partBuffer[i].partName, 14); + partBuffer[i].offset = g_cine->_partFileHandle.readUint32BE(); + partBuffer[i].packedSize = g_cine->_partFileHandle.readUint32BE(); + partBuffer[i].unpackedSize = g_cine->_partFileHandle.readUint32BE(); + g_cine->_partFileHandle.readUint32BE(); // unused } if (g_cine->getGameType() == Cine::GType_FW && g_cine->getPlatform() == Common::kPlatformPC && strcmp(partName, "BASESON.SND") != 0) loadPal(partName); } -void freePartEntry(byte idx) { - if (animDataTable[idx].ptr1) { - //free(animDataTable[idx].ptr1); - - animDataTable[idx].ptr1 = NULL; - animDataTable[idx].ptr2 = NULL; - - // TODO: finish - - if (frameVar0 > 0) - frameVar0--; - } -} - -void freePartRange(byte startIdx, byte numIdx) { - byte i; - - for (i = 0; i < numIdx; i++) { - freePartEntry(i + startIdx); - } -} - void closePart(void) { + // TODO } static const char *bundleNamesDOSEN[] = { @@ -397,8 +370,8 @@ int16 findFileInBundle(const char *fileName) { void readFromPart(int16 idx, byte *dataPtr) { setMouseCursor(MOUSE_CURSOR_DISK); - partFileHandle.seek(partBuffer[idx].offset, SEEK_SET); - partFileHandle.read(dataPtr, partBuffer[idx].packedSize); + g_cine->_partFileHandle.seek(partBuffer[idx].offset, SEEK_SET); + g_cine->_partFileHandle.read(dataPtr, partBuffer[idx].packedSize); } byte *readBundleFile(int16 foundFileIdx) { @@ -450,10 +423,9 @@ byte *readFile(const char *filename) { if (!in.isOpen()) error("readFile(): Cannot open file %s", filename); - byte *dataPtr; uint32 size = in.size(); - dataPtr = (byte *)malloc(size); + byte *dataPtr = (byte *)malloc(size); in.read(dataPtr, size); return dataPtr; @@ -471,12 +443,15 @@ void dumpBundle(const char *fileName) { for (int i = 0; i < numElementInPart; i++) { byte *data = readBundleFile(i); + debug(0, "%s", partBuffer[i].partName); + Common::File out; + if (out.open(Common::String("dumps/") + partBuffer[i].partName, Common::File::kFileWriteMode)) { + out.write(data, partBuffer[i].unpackedSize); + out.close(); + } - debug(0, "%s", partBuffer[i].partName); - out.open(Common::String("dumps/") + partBuffer[i].partName, Common::File::kFileWriteMode); - out.write(data, partBuffer[i].unpackedSize); - out.close(); + free(data); } loadPart(tmpPart); diff --git a/engines/cine/part.h b/engines/cine/part.h index b8abd7620c..fae044afb1 100644 --- a/engines/cine/part.h +++ b/engines/cine/part.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -57,7 +58,6 @@ extern AnimData *animDataTable; extern PartBuffer *partBuffer; void loadPart(const char *partName); -void freePartRange(byte startIdx, byte numIdx); void closePart(void); int16 findFileInBundle(const char *fileName); diff --git a/engines/cine/prc.cpp b/engines/cine/prc.cpp index bb7fbfc9d0..685f5780d0 100644 --- a/engines/cine/prc.cpp +++ b/engines/cine/prc.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -63,7 +64,7 @@ void freePrcLinkedList(void) { void loadPrc(const char *pPrcName) { byte i; uint16 numScripts; - const byte *scriptPtr; + byte *scriptPtr, *dataPtr; assert(pPrcName); @@ -85,9 +86,9 @@ void loadPrc(const char *pPrcName) { checkDataDisk(-1); if ((g_cine->getGameType() == Cine::GType_FW) && (!scumm_stricmp(pPrcName, BOOT_PRC_NAME) || !scumm_stricmp(pPrcName, "demo.prc"))) { - scriptPtr = readFile(pPrcName); + scriptPtr = dataPtr = readFile(pPrcName); } else { - scriptPtr = readBundleFile(findFileInBundle(pPrcName)); + scriptPtr = dataPtr = readBundleFile(findFileInBundle(pPrcName)); } assert(scriptPtr); @@ -113,6 +114,8 @@ void loadPrc(const char *pPrcName) { } } + free(dataPtr); + #ifdef DUMP_SCRIPTS { diff --git a/engines/cine/prc.h b/engines/cine/prc.h index c41d87e8e8..4bed589c0b 100644 --- a/engines/cine/prc.h +++ b/engines/cine/prc.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/rel.cpp b/engines/cine/rel.cpp index 2586882ff8..03ab5e44b2 100644 --- a/engines/cine/rel.cpp +++ b/engines/cine/rel.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -58,7 +59,7 @@ void releaseObjectScripts(void) { void loadRel(char *pRelName) { uint16 numEntry; uint16 i; - byte *ptr; + byte *ptr, *dataPtr; checkDataDisk(-1); @@ -70,7 +71,7 @@ void loadRel(char *pRelName) { } } - ptr = readBundleFile(findFileInBundle(pRelName)); + ptr = dataPtr = readBundleFile(findFileInBundle(pRelName)); setMouseCursor(MOUSE_CURSOR_DISK); @@ -95,6 +96,8 @@ void loadRel(char *pRelName) { ptr += relTable[i].size; } } + + free(dataPtr); #ifdef DUMP_SCRIPTS diff --git a/engines/cine/rel.h b/engines/cine/rel.h index b1b3cf7812..dbdab7e8af 100644 --- a/engines/cine/rel.h +++ b/engines/cine/rel.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/script.cpp b/engines/cine/script.cpp index 738ade2834..ca8eebe35d 100644 --- a/engines/cine/script.cpp +++ b/engines/cine/script.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1434,7 +1435,7 @@ void o1_freePartRange() { assert(startIdx + numIdx <= NUM_MAX_ANIMDATA); debugC(5, kCineDebugScript, "Line: %d: freePartRange(%d,%d)", _currentLine, startIdx, numIdx); - freePartRange(startIdx, numIdx); + freeAnimDataRange(startIdx, numIdx); } void o1_unloadAllMasks() { diff --git a/engines/cine/script.h b/engines/cine/script.h index 91e403d701..c3b3794cd2 100644 --- a/engines/cine/script.h +++ b/engines/cine/script.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp index a17433f176..4746e87a66 100644 --- a/engines/cine/sound.cpp +++ b/engines/cine/sound.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cine/sound.cpp $ + * $Id:sound.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cine/sound.h b/engines/cine/sound.h index 584cdab62f..4ebda2c236 100644 --- a/engines/cine/sound.h +++ b/engines/cine/sound.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cine/sound.h $ + * $Id:sound.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cine/texte.cpp b/engines/cine/texte.cpp index 226dda2eb6..3090392301 100644 --- a/engines/cine/texte.cpp +++ b/engines/cine/texte.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -52,9 +53,8 @@ void loadTextData(const char *pFileName, byte *pDestinationBuffer) { assert(pFileName); assert(pDestinationBuffer); - pFileHandle.open(pFileName); - - assert(pFileHandle.isOpen()); + if (!pFileHandle.open(pFileName)) + error("loadTextData(): Cannot open file %s", pFileName); entrySize = pFileHandle.readUint16BE(); numEntry = pFileHandle.readUint16BE(); diff --git a/engines/cine/texte.h b/engines/cine/texte.h index 87b9c4b6d5..801220cdf0 100644 --- a/engines/cine/texte.h +++ b/engines/cine/texte.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/unpack.cpp b/engines/cine/unpack.cpp index f15c46a84e..2c45566dec 100644 --- a/engines/cine/unpack.cpp +++ b/engines/cine/unpack.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/unpack.h b/engines/cine/unpack.h index 5a57f836a0..23e2cad4b3 100644 --- a/engines/cine/unpack.h +++ b/engines/cine/unpack.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp index f6bf1197ea..f33476facf 100644 --- a/engines/cine/various.cpp +++ b/engines/cine/various.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -56,14 +57,9 @@ int16 buildObjectListCommand(void); void drawString(const char *string, byte param) { } -Common::File *partFileHandleP = NULL; - void waitPlayerInput(void) { } -void freeAnimDataTable(void) { -} - void setTextWindow(uint16 param1, uint16 param2, uint16 param3, uint16 param4) { } @@ -1002,15 +998,14 @@ void CineEngine::makeSystemMenu(void) { if (!makeMenuChoice(confirmMenu, 2, mouseX, mouseY + 8, 100)) { char saveString[256], tmp[80]; - Common::OutSaveFile *fHandle; - snprintf(tmp, 80, "%s.dir", _targetName.c_str()); - fHandle = g_saveFileMan->openForSaving(tmp); - // FIXME: Properly handle openForSaving failures instead of - // just crashing silently! - assert(fHandle); - + Common::OutSaveFile *fHandle = g_saveFileMan->openForSaving(tmp); + if (!fHandle) { + warning("Unable to open file %s for saving", tmp); + break; + } + fHandle->write(currentSaveName, 200); delete fHandle; @@ -1034,7 +1029,7 @@ void CineEngine::makeSystemMenu(void) { } } -const int16 choiceResultTable[] = { +static const int16 choiceResultTable[] = { 1, 1, 1, @@ -1044,7 +1039,7 @@ const int16 choiceResultTable[] = { 1 }; -const int16 subObjectUseTable[] = { +static const int16 subObjectUseTable[] = { 3, 3, 3, @@ -1054,7 +1049,7 @@ const int16 subObjectUseTable[] = { 0 }; -const int16 canUseOnItemTable[] = { +static const int16 canUseOnItemTable[] = { 1, 0, 0, diff --git a/engines/cine/various.h b/engines/cine/various.h index bb95657f1c..31d8cfdc84 100644 --- a/engines/cine/various.h +++ b/engines/cine/various.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -79,14 +80,6 @@ extern uint16 var3; extern uint16 var4; extern uint16 var5; -extern Common::File *palFileHandleP; -extern Common::File *partFileHandleP; - -#define palFileHandle (*palFileHandleP) -#define partFileHandle (*partFileHandleP) - - -void freeAnimDataTable(void); void mainLoopSub1(void); void setTextWindow(uint16 param1, uint16 param2, uint16 param3, uint16 param4); diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp index cf7ef4b176..dd38e15838 100644 --- a/engines/cruise/actor.cpp +++ b/engines/cruise/actor.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/actor.cpp $ + * $Id:actor.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/actor.h b/engines/cruise/actor.h index 0485fcc003..072eef9581 100644 --- a/engines/cruise/actor.h +++ b/engines/cruise/actor.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/actor.h $ + * $Id:actor.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/background.cpp b/engines/cruise/background.cpp index 0d5b8d4fbb..ebf0b78934 100644 --- a/engines/cruise/background.cpp +++ b/engines/cruise/background.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/background.cpp $ + * $Id:background.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/background.h b/engines/cruise/background.h index 07364a947f..b8b9e623c6 100644 --- a/engines/cruise/background.h +++ b/engines/cruise/background.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/background.h $ + * $Id:background.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/backgroundIncrust.cpp b/engines/cruise/backgroundIncrust.cpp index 99c2fda8c3..edaa68b490 100644 --- a/engines/cruise/backgroundIncrust.cpp +++ b/engines/cruise/backgroundIncrust.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/backgroundIncrust.cpp $ + * $Id:backgroundIncrust.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/backgroundIncrust.h b/engines/cruise/backgroundIncrust.h index abbe837ad7..3f61faadae 100644 --- a/engines/cruise/backgroundIncrust.h +++ b/engines/cruise/backgroundIncrust.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/backgroundIncrust.h $ + * $Id:backgroundIncrust.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/cell.cpp b/engines/cruise/cell.cpp index 2c9589f744..8a7b524a7b 100644 --- a/engines/cruise/cell.cpp +++ b/engines/cruise/cell.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/cell.cpp $ + * $Id:cell.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/cell.h b/engines/cruise/cell.h index 2664d3421f..ea2fb7e777 100644 --- a/engines/cruise/cell.h +++ b/engines/cruise/cell.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/cell.h $ + * $Id:cell.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/cruise.cpp b/engines/cruise/cruise.cpp index 3704842019..b427498c6f 100644 --- a/engines/cruise/cruise.cpp +++ b/engines/cruise/cruise.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,14 +18,13 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/cruise.cpp $ + * $Id:cruise.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ #include "common/stdafx.h" #include "common/file.h" -#include "common/fs.h" #include "common/savefile.h" #include "common/config-manager.h" #include "common/system.h" diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h index 144a7fdd12..cf768d8d57 100644 --- a/engines/cruise/cruise.h +++ b/engines/cruise/cruise.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CruisE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/cruise.h $ + * $Id:cruise.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp index dcc8777bad..79a699433f 100644 --- a/engines/cruise/cruise_main.cpp +++ b/engines/cruise/cruise_main.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/cruise_main.cpp $ + * $Id:cruise_main.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ @@ -477,7 +478,7 @@ int initAllData(void) { resetActorPtr(&actorHead); resetBackgroundIncrustList(&backgroundIncrustHead); - bootOverlayNumber = loadOverlay((uint8 *) "AUTO00"); + bootOverlayNumber = loadOverlay((const uint8 *) "AUTO00"); #ifdef DUMP_SCRIPT loadOverlay("TITRE"); diff --git a/engines/cruise/cruise_main.h b/engines/cruise/cruise_main.h index a36d8a066e..324d99f024 100644 --- a/engines/cruise/cruise_main.h +++ b/engines/cruise/cruise_main.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/cruise_main.h $ + * $Id:cruise_main.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ @@ -86,7 +87,7 @@ void changeScriptParamInList(int param1, int param2, scriptInstanceStruct * pScriptInstance, int newValue, int param3); uint8 *getDataFromData3(ovlData3Struct * ptr, int param); int32 prepareWordRender(int32 param, int32 var1, int16 * out2, uint8 * ptr3, - uint8 * string); + const uint8 * string); void removeExtention(const char *name, char *buffer); void resetRaster(uint8 * rasterPtr, int32 rasterSize); void changeCursor(uint16 cursorType); diff --git a/engines/cruise/ctp.cpp b/engines/cruise/ctp.cpp index a3acbef944..07df6029b2 100644 --- a/engines/cruise/ctp.cpp +++ b/engines/cruise/ctp.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/ctp.cpp $ + * $Id:ctp.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/ctp.h b/engines/cruise/ctp.h index f6a31d387d..b35523a3a7 100644 --- a/engines/cruise/ctp.h +++ b/engines/cruise/ctp.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/ctp.h $ + * $Id:ctp.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp index 92d830418c..2212a3bde2 100644 --- a/engines/cruise/dataLoader.cpp +++ b/engines/cruise/dataLoader.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/dataLoader.cpp $ + * $Id:dataLoader.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/dataLoader.h b/engines/cruise/dataLoader.h index 8c8e6bd301..6b6bf52cf6 100644 --- a/engines/cruise/dataLoader.h +++ b/engines/cruise/dataLoader.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/dataLoader.h $ + * $Id:dataLoader.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/decompiler.cpp b/engines/cruise/decompiler.cpp index 072fa171fd..68beab0846 100644 --- a/engines/cruise/decompiler.cpp +++ b/engines/cruise/decompiler.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/decompiler.cpp $ + * $Id:decompiler.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/delphine-unpack.cpp b/engines/cruise/delphine-unpack.cpp index 611d1573fd..db4188fbfe 100644 --- a/engines/cruise/delphine-unpack.cpp +++ b/engines/cruise/delphine-unpack.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/delphine-unpack.cpp $ + * $Id:delphine-unpack.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index d875cc4943..80890de1ea 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/detection.cpp $ + * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/font.cpp b/engines/cruise/font.cpp index 22f358033e..92064acc53 100644 --- a/engines/cruise/font.cpp +++ b/engines/cruise/font.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/font.cpp $ + * $Id:font.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ @@ -50,15 +51,15 @@ int32 getLineHeight(int16 charCount, uint8 * fontPtr, uint8 * fontPrt_Desc) { // this function determins how many lines the text will have (old: fontProc2(int32 param1, int32 param2, uint8* ptr, uint8* string)) int32 getTextLineCount(int32 rightBorder_X, int32 wordSpacingWidth, - uint8 *ptr, uint8 *textString) { - uint8 *localString = textString; - uint8 *currentStringPtr; + uint8 *ptr, const uint8 *textString) { + const uint8 *localString = textString; + const uint8 *currentStringPtr; uint8 character; int32 var_6 = 0; int32 lineLength = 0; - uint8 *tempPtr = 0; + const uint8 *tempPtr = 0; if (!*localString) { return (0); @@ -111,16 +112,16 @@ void loadFNT(const void *fileNameChar) { int32 fontSize; int32 data2; uint8 data3[6]; - uint8 *fileName = (uint8 *) fileNameChar; + const uint8 *fileName = (const uint8 *)fileNameChar; _systemFNT = NULL; Common::File fontFileHandle; - if (!fontFileHandle.exists((char *)fileName)) { + if (!fontFileHandle.exists((const char *)fileName)) { return; } - fontFileHandle.open((char *)fileName); + fontFileHandle.open((const char *)fileName); fontFileHandle.read(header, 4); @@ -134,7 +135,7 @@ void loadFNT(const void *fileNameChar) { fontFileHandle.read(data3, 6); // may need an endian flip ? flipGen(&data3, 6); - _systemFNT = (uint8 *) mallocAndZero(fontSize); + _systemFNT = (uint8 *)mallocAndZero(fontSize); if (_systemFNT != NULL) { int32 i; @@ -151,8 +152,8 @@ void loadFNT(const void *fileNameChar) { currentPtr = _systemFNT + 14; - for (i = 0; i < *(int16 *) (_systemFNT + 8); i++) { - flipLong((int32 *) currentPtr); + for (i = 0; i < *(int16 *)(_systemFNT + 8); i++) { + flipLong((int32 *)currentPtr); currentPtr += 4; flipGen(currentPtr, 8); @@ -277,8 +278,8 @@ void renderWord(uint8 * fontPtr_Data, uint8 * outBufferPtr, // returns character count and pixel size (via pointer) per line of the string (old: prepareWordRender(int32 param, int32 var1, int16* out2, uint8* ptr3, uint8* string)) int32 prepareWordRender(int32 inRightBorder_X, int32 wordSpacingWidth, - int16 * strPixelLength, uint8 * ptr3, uint8 * textString) { - uint8 *localString = textString; + int16 * strPixelLength, uint8 * ptr3, const uint8 * textString) { + const uint8 *localString = textString; int32 counter = 0; int32 finish = 0; @@ -518,7 +519,7 @@ void drawString(int32 x, int32 y, uint8 *string, uint8 *buffer, uint8 color, } // calculates all necessary datas and renders text -gfxEntryStruct *renderText(int inRightBorder_X, uint8 *string) { +gfxEntryStruct *renderText(int inRightBorder_X, const uint8 *string) { uint8 *fontPtr; uint8 *fontPtr_Data; // pt2 uint8 *fontPtr_Desc; // ptr3 @@ -600,7 +601,7 @@ gfxEntryStruct *renderText(int inRightBorder_X, uint8 *string) { int spacesCount = 0; // si unsigned char character = *string; short int strPixelLength; // var_16 - uint8 *ptrStringEnd; // var_4 //ok + const uint8 *ptrStringEnd; // var_4 //ok int drawPosPixel_X; // di // find first letter in string, skip all spaces diff --git a/engines/cruise/font.h b/engines/cruise/font.h index b4533f2e43..2a75cf28dd 100644 --- a/engines/cruise/font.h +++ b/engines/cruise/font.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/font.h $ + * $Id:font.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ @@ -38,12 +39,12 @@ void flipLong(uint32 * var); // TODO: move away void flipGen(void *var, int32 length); int32 getLineHeight(int16 charCount, uint8 * fontPtr, uint8 * fontPrt_Desc); // fontProc1 -int32 getTextLineCount(int32 rightBorder_X, int32 wordSpacingWidth, uint8 * ptr, uint8 * textString); // fontProc2 +int32 getTextLineCount(int32 rightBorder_X, int32 wordSpacingWidth, uint8 * ptr, const uint8 *textString); // fontProc2 void renderWord(uint8 * fontPtr_Data, uint8 * outBufferPtr, int32 drawPosPixel_X, int32 heightOff, int32 height, int32 param4, int32 stringRenderBufferSize, int32 width, int32 charWidth); -gfxEntryStruct *renderText(int inRightBorder_X, uint8 * string); +gfxEntryStruct *renderText(int inRightBorder_X, const uint8 *string); void drawString(int32 x, int32 y, uint8 * string, uint8 * buffer, uint8 color, int32 inRightBorder_X); diff --git a/engines/cruise/fontCharacterTable.cpp b/engines/cruise/fontCharacterTable.cpp index 20badd7953..ce0bec0f0f 100644 --- a/engines/cruise/fontCharacterTable.cpp +++ b/engines/cruise/fontCharacterTable.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/fontCharacterTable.cpp $ + * $Id:fontCharacterTable.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/fontCharacterTable.h b/engines/cruise/fontCharacterTable.h index b45a47e89d..f7956968ec 100644 --- a/engines/cruise/fontCharacterTable.h +++ b/engines/cruise/fontCharacterTable.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/fontCharacterTable.h $ + * $Id:fontCharacterTable.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp index 73e1bd9084..092425bfc7 100644 --- a/engines/cruise/function.cpp +++ b/engines/cruise/function.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/function.cpp $ + * $Id:function.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/function.h b/engines/cruise/function.h index 68fdfed6d0..76100e41ba 100644 --- a/engines/cruise/function.h +++ b/engines/cruise/function.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/function.h $ + * $Id:function.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/gfxModule.cpp b/engines/cruise/gfxModule.cpp index 23d80a47b0..119f99739e 100644 --- a/engines/cruise/gfxModule.cpp +++ b/engines/cruise/gfxModule.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/gfxModule.cpp $ + * $Id:gfxModule.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/gfxModule.h b/engines/cruise/gfxModule.h index 46b8ee4c37..7339113f4c 100644 --- a/engines/cruise/gfxModule.h +++ b/engines/cruise/gfxModule.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/gfxModule.h $ + * $Id:gfxModule.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/linker.cpp b/engines/cruise/linker.cpp index 914a571394..0057625e81 100644 --- a/engines/cruise/linker.cpp +++ b/engines/cruise/linker.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/linker.cpp $ + * $Id:linker.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/linker.h b/engines/cruise/linker.h index 1f3cd045f2..975ed0f322 100644 --- a/engines/cruise/linker.h +++ b/engines/cruise/linker.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/linker.h $ + * $Id:linker.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp index 3d9064cf59..3d409d0ba5 100644 --- a/engines/cruise/mainDraw.cpp +++ b/engines/cruise/mainDraw.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/mainDraw.cpp $ + * $Id:mainDraw.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/mainDraw.h b/engines/cruise/mainDraw.h index ae6194a568..7ff6ffdc8f 100644 --- a/engines/cruise/mainDraw.h +++ b/engines/cruise/mainDraw.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/mainDraw.h $ + * $Id:mainDraw.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/menu.cpp b/engines/cruise/menu.cpp index d76934439b..e30542cc1b 100644 --- a/engines/cruise/menu.cpp +++ b/engines/cruise/menu.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/menu.cpp $ + * $Id:menu.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ @@ -39,7 +40,7 @@ menuStruct *createMenu(int X, int Y, const char *menuName) { entry->stringPtr = menuName; entry->numElements = 0; entry->ptrNextElement = NULL; - entry->gfx = renderText(160, (uint8 *) menuName); + entry->gfx = renderText(160, (const uint8 *)menuName); return entry; } @@ -117,7 +118,7 @@ void addSelectableMenuEntry(int param0, int param1, menuStruct *pMenu, pNewElement->next = NULL; pNewElement->varC = 0; pNewElement->color = color; - pNewElement->gfx = renderText(160, (uint8 *) menuText); + pNewElement->gfx = renderText(160, (const uint8 *)menuText); if (var_6 == NULL) { pMenu->ptrNextElement = pNewElement; diff --git a/engines/cruise/menu.h b/engines/cruise/menu.h index cf4941c96b..9a33545224 100644 --- a/engines/cruise/menu.h +++ b/engines/cruise/menu.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/menu.h $ + * $Id:menu.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/mouse.cpp b/engines/cruise/mouse.cpp index 9d296b9c77..c9cec8f72a 100644 --- a/engines/cruise/mouse.cpp +++ b/engines/cruise/mouse.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/mouse.cpp $ + * $Id:mouse.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/mouse.h b/engines/cruise/mouse.h index 12d3ba2ba0..c7ef2a69c5 100644 --- a/engines/cruise/mouse.h +++ b/engines/cruise/mouse.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/mouse.h $ + * $Id:mouse.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/object.cpp b/engines/cruise/object.cpp index 2014ab1e4d..ce4de2a12b 100644 --- a/engines/cruise/object.cpp +++ b/engines/cruise/object.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/object.cpp $ + * $Id:object.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/object.h b/engines/cruise/object.h index 439cdcf3a2..feec666687 100644 --- a/engines/cruise/object.h +++ b/engines/cruise/object.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/object.h $ + * $Id:object.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/overlay.cpp b/engines/cruise/overlay.cpp index 10e807380a..c1b35f61f6 100644 --- a/engines/cruise/overlay.cpp +++ b/engines/cruise/overlay.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/overlay.cpp $ + * $Id:overlay.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ @@ -42,7 +43,7 @@ void initOverlayTable(void) { numOfLoadedOverlay = 1; } -int loadOverlay(uint8 *scriptName) { +int loadOverlay(const uint8 *scriptName) { int newNumberOfScript; bool scriptNotLoadedBefore; int scriptIdx; @@ -59,7 +60,7 @@ int loadOverlay(uint8 *scriptName) { scriptNotLoadedBefore = false; - scriptIdx = findOverlayByName((char *)scriptName); + scriptIdx = findOverlayByName((const char *)scriptName); if (scriptIdx == -4) { scriptIdx = numOfLoadedOverlay; @@ -723,7 +724,7 @@ int releaseOverlay(const char *name) { return 0; } -int32 findOverlayByName2(uint8 *name) { +int32 findOverlayByName2(const uint8 *name) { int i; for (i = 1; i < numOfLoadedOverlay; i++) { diff --git a/engines/cruise/overlay.h b/engines/cruise/overlay.h index 07f814701c..03db06fada 100644 --- a/engines/cruise/overlay.h +++ b/engines/cruise/overlay.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/overlay.h $ + * $Id:overlay.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ @@ -181,8 +182,8 @@ extern overlayStruct overlayTable[90]; extern int numOfLoadedOverlay; void initOverlayTable(void); -int loadOverlay(uint8 * scriptName); -int32 findOverlayByName2(uint8 * name); +int loadOverlay(const uint8 * scriptName); +int32 findOverlayByName2(const uint8 * name); int findOverlayByName(const char *overlayName); int releaseOverlay(const char *name); diff --git a/engines/cruise/perso.cpp b/engines/cruise/perso.cpp index e8f8c91743..a95607a2f1 100644 --- a/engines/cruise/perso.cpp +++ b/engines/cruise/perso.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/perso.cpp $ + * $Id:perso.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/perso.h b/engines/cruise/perso.h index 5a600e2d7f..0d5676a4c8 100644 --- a/engines/cruise/perso.h +++ b/engines/cruise/perso.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/perso.h $ + * $Id:perso.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/polys.cpp b/engines/cruise/polys.cpp index a28ff52d15..83192b0dda 100644 --- a/engines/cruise/polys.cpp +++ b/engines/cruise/polys.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/polys.cpp $ + * $Id:polys.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/polys.h b/engines/cruise/polys.h index f8d192fae0..b5da8dd241 100644 --- a/engines/cruise/polys.h +++ b/engines/cruise/polys.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/polys.h $ + * $Id:polys.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/saveload.cpp b/engines/cruise/saveload.cpp index 21882a096d..d6b2c9ec93 100644 --- a/engines/cruise/saveload.cpp +++ b/engines/cruise/saveload.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/saveload.cpp $ + * $Id:saveload.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/saveload.h b/engines/cruise/saveload.h index 179c0a78f1..de97f24b64 100644 --- a/engines/cruise/saveload.h +++ b/engines/cruise/saveload.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/saveload.h $ + * $Id:saveload.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/script.cpp b/engines/cruise/script.cpp index f690530a09..dc1b12f736 100644 --- a/engines/cruise/script.cpp +++ b/engines/cruise/script.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/script.cpp $ + * $Id:script.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/script.h b/engines/cruise/script.h index 668fcaae74..ca7d812836 100644 --- a/engines/cruise/script.h +++ b/engines/cruise/script.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/script.h $ + * $Id:script.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/stack.cpp b/engines/cruise/stack.cpp index 6cce7579ed..7622564503 100644 --- a/engines/cruise/stack.cpp +++ b/engines/cruise/stack.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/stack.cpp $ + * $Id:stack.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/stack.h b/engines/cruise/stack.h index c7635d6d1a..1adb3540cb 100644 --- a/engines/cruise/stack.h +++ b/engines/cruise/stack.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/stack.h $ + * $Id:stack.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/stringSupport.cpp b/engines/cruise/stringSupport.cpp index 1343ba146d..54747104ff 100644 --- a/engines/cruise/stringSupport.cpp +++ b/engines/cruise/stringSupport.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/stringSupport.cpp $ + * $Id:stringSupport.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ @@ -35,7 +36,7 @@ void strcatuint8(void *dest, const void *source) { } uint8 strcmpuint8(const void *string1, const void *string2) { - return strcmp((char *)string1, (char *)string2); + return strcmp((const char *)string1, (const char *)string2); } } // End of namespace Cruise diff --git a/engines/cruise/stringSupport.h b/engines/cruise/stringSupport.h index bd4c66fff1..531fe56aca 100644 --- a/engines/cruise/stringSupport.h +++ b/engines/cruise/stringSupport.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/stringSupport.h $ + * $Id:stringSupport.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/various.cpp b/engines/cruise/various.cpp index 2b3aa6855f..e4c908af5f 100644 --- a/engines/cruise/various.cpp +++ b/engines/cruise/various.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/various.cpp $ + * $Id:various.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/various.h b/engines/cruise/various.h index 6b1e589b54..f6e07e00e7 100644 --- a/engines/cruise/various.h +++ b/engines/cruise/various.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/various.h $ + * $Id:various.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/vars.cpp b/engines/cruise/vars.cpp index c6cb068306..1a3d5f0a27 100644 --- a/engines/cruise/vars.cpp +++ b/engines/cruise/vars.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/vars.cpp $ + * $Id:vars.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/vars.h b/engines/cruise/vars.h index 71368218ad..63a15f24e4 100644 --- a/engines/cruise/vars.h +++ b/engines/cruise/vars.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/vars.h $ + * $Id:vars.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/volume.cpp b/engines/cruise/volume.cpp index e4a00945e9..901ac4a7a5 100644 --- a/engines/cruise/volume.cpp +++ b/engines/cruise/volume.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/volume.cpp $ + * $Id:volume.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/volume.h b/engines/cruise/volume.h index 1399bc46ab..7881f6c872 100644 --- a/engines/cruise/volume.h +++ b/engines/cruise/volume.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/volume.h $ + * $Id:volume.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/engine.cpp b/engines/engine.cpp index 5eca4cfa25..05e2235cc9 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/engine.h b/engines/engine.h index 37cf63e88b..7b40a377ef 100644 --- a/engines/engine.h +++ b/engines/engine.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/cdrom.cpp b/engines/gob/cdrom.cpp index 050c1f8318..6b32720cff 100644 --- a/engines/gob/cdrom.cpp +++ b/engines/gob/cdrom.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/cdrom.h b/engines/gob/cdrom.h index 1120f3b11b..e977adcd6d 100644 --- a/engines/gob/cdrom.h +++ b/engines/gob/cdrom.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/dataio.cpp b/engines/gob/dataio.cpp index 63c25b4659..7ded953427 100644 --- a/engines/gob/dataio.cpp +++ b/engines/gob/dataio.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/dataio.h b/engines/gob/dataio.h index f581aeae63..3ea29c0efe 100644 --- a/engines/gob/dataio.h +++ b/engines/gob/dataio.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp index 246ffa3b44..6b37d05e98 100644 --- a/engines/gob/detection.cpp +++ b/engines/gob/detection.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/draw.cpp b/engines/gob/draw.cpp index 3ccc520992..bc5b205bd1 100644 --- a/engines/gob/draw.cpp +++ b/engines/gob/draw.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/draw.h b/engines/gob/draw.h index 62a4984267..e37ecda334 100644 --- a/engines/gob/draw.h +++ b/engines/gob/draw.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/draw_bargon.cpp b/engines/gob/draw_bargon.cpp index 8c21b41dde..b6e71ce652 100644 --- a/engines/gob/draw_bargon.cpp +++ b/engines/gob/draw_bargon.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/draw_v1.cpp b/engines/gob/draw_v1.cpp index bba9c790d6..9c4708f187 100644 --- a/engines/gob/draw_v1.cpp +++ b/engines/gob/draw_v1.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/draw_v2.cpp b/engines/gob/draw_v2.cpp index 67b8eb3c13..c45bd0de27 100644 --- a/engines/gob/draw_v2.cpp +++ b/engines/gob/draw_v2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/driver_vga.cpp b/engines/gob/driver_vga.cpp index 4923387ef8..13e6aca4a8 100644 --- a/engines/gob/driver_vga.cpp +++ b/engines/gob/driver_vga.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/driver_vga.h b/engines/gob/driver_vga.h index 54f577ffe8..d26e6ca01a 100644 --- a/engines/gob/driver_vga.h +++ b/engines/gob/driver_vga.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/game.cpp b/engines/gob/game.cpp index 43eac76928..795484ef0e 100644 --- a/engines/gob/game.cpp +++ b/engines/gob/game.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -78,6 +80,7 @@ Game::Game(GobEngine *vm) : _vm(vm) { _forceHandleMouse = 0; _menuLevel = 0; _noScroll = true; + _preventScroll = false; _scrollHandleMouse = false; _tempStr[0] = 0; @@ -291,7 +294,7 @@ void Game::freeSoundSlot(int16 slot) { } void Game::evaluateScroll(int16 x, int16 y) { - if (!_scrollHandleMouse || (_menuLevel > 0)) + if (_preventScroll || !_scrollHandleMouse || (_menuLevel > 0)) return; if (_noScroll || (_vm->_global->_videoMode != 0x14)) @@ -538,6 +541,13 @@ void Game::switchTotSub(int16 index, int16 skipPlay) { if ((_backupedCount - index) < 1) return; + int16 newPos = _curBackupPos - index - ((index >= 0) ? 1 : 0); + // WORKAROUND: Some versions don't make the MOVEMENT menu item unselectable + // in the dreamland screen, resulting in a crash when it's clicked. + if ((_vm->_features & GF_GOB2) && (index == -1) && (skipPlay == 7) && + !scumm_stricmp(_curTotFileArray[newPos], "gob06.tot")) + return; + curBackupPos = _curBackupPos; backupedCount = _backupedCount; if (_curBackupPos == _backupedCount) { diff --git a/engines/gob/game.h b/engines/gob/game.h index 66fa0179fd..4a1796c6d9 100644 --- a/engines/gob/game.h +++ b/engines/gob/game.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -129,6 +131,7 @@ public: int16 _mouseButtons; bool _noScroll; + bool _preventScroll; bool _scrollHandleMouse; Game(GobEngine *vm); diff --git a/engines/gob/game_v1.cpp b/engines/gob/game_v1.cpp index 6de1165470..6ba68553c7 100644 --- a/engines/gob/game_v1.cpp +++ b/engines/gob/game_v1.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/game_v2.cpp b/engines/gob/game_v2.cpp index d10c599ddd..245c1f4544 100644 --- a/engines/gob/game_v2.cpp +++ b/engines/gob/game_v2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/global.cpp b/engines/gob/global.cpp index 82903ee5f8..ec2fa6b043 100644 --- a/engines/gob/global.cpp +++ b/engines/gob/global.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/global.h b/engines/gob/global.h index 089fcbadac..6dab0c0bc6 100644 --- a/engines/gob/global.h +++ b/engines/gob/global.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index 6452ae279f..32caca31d8 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -25,7 +28,6 @@ #include "base/plugins.h" #include "common/config-manager.h" -//#include "common/fs.h" #include "common/md5.h" #include "sound/mididrv.h" diff --git a/engines/gob/gob.h b/engines/gob/gob.h index c3151b9e7e..97ee312bff 100644 --- a/engines/gob/gob.h +++ b/engines/gob/gob.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/goblin.cpp b/engines/gob/goblin.cpp index 4620afabaa..418b31e2ee 100644 --- a/engines/gob/goblin.cpp +++ b/engines/gob/goblin.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/goblin.h b/engines/gob/goblin.h index a18213fcf7..61ac9dff5e 100644 --- a/engines/gob/goblin.h +++ b/engines/gob/goblin.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/goblin_v1.cpp b/engines/gob/goblin_v1.cpp index 4c39cb399f..f8ffb15257 100644 --- a/engines/gob/goblin_v1.cpp +++ b/engines/gob/goblin_v1.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/goblin_v2.cpp b/engines/gob/goblin_v2.cpp index 29401837a7..67e9f65444 100644 --- a/engines/gob/goblin_v2.cpp +++ b/engines/gob/goblin_v2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/goblin_v3.cpp b/engines/gob/goblin_v3.cpp index 1a3a34fcec..002ef7b749 100644 --- a/engines/gob/goblin_v3.cpp +++ b/engines/gob/goblin_v3.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/imd.cpp b/engines/gob/imd.cpp index d2fa69e067..395fb01f9b 100644 --- a/engines/gob/imd.cpp +++ b/engines/gob/imd.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/imd.h b/engines/gob/imd.h index 92db3ebbac..3d04f18c6d 100644 --- a/engines/gob/imd.h +++ b/engines/gob/imd.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/init.cpp b/engines/gob/init.cpp index ec82d05bda..2f1dbe5326 100644 --- a/engines/gob/init.cpp +++ b/engines/gob/init.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/init.h b/engines/gob/init.h index 6d8d71ae59..b71be5ca39 100644 --- a/engines/gob/init.h +++ b/engines/gob/init.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/init_v1.cpp b/engines/gob/init_v1.cpp index 48c425d301..679c20e380 100644 --- a/engines/gob/init_v1.cpp +++ b/engines/gob/init_v1.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/init_v2.cpp b/engines/gob/init_v2.cpp index bd5be11987..175d82fda0 100644 --- a/engines/gob/init_v2.cpp +++ b/engines/gob/init_v2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/init_v3.cpp b/engines/gob/init_v3.cpp index 5e10240257..6f1af258ca 100644 --- a/engines/gob/init_v3.cpp +++ b/engines/gob/init_v3.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/gob/init_v3.cpp $ + * $Id:init_v3.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/gob/inter.cpp b/engines/gob/inter.cpp index fccf8e70b9..1f529b7634 100644 --- a/engines/gob/inter.cpp +++ b/engines/gob/inter.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/inter.h b/engines/gob/inter.h index 90d0f7158e..fe84741eed 100644 --- a/engines/gob/inter.h +++ b/engines/gob/inter.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/inter_bargon.cpp b/engines/gob/inter_bargon.cpp index de52eb270e..ffbe9e45ea 100644 --- a/engines/gob/inter_bargon.cpp +++ b/engines/gob/inter_bargon.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index 822c96d749..fcf825b4c3 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp index 78ea9cab7a..d69b6fda97 100644 --- a/engines/gob/inter_v2.cpp +++ b/engines/gob/inter_v2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1492,6 +1494,7 @@ void Inter_v2::o2_playImd() { close = false; } + _vm->_game->_preventScroll = true; for (int i = startFrame; i <= lastFrame; i++) { _vm->_imdPlayer->play(i, palCmd, palStart, palEnd, 0, lastFrame); WRITE_VAR(11, i); @@ -1507,10 +1510,12 @@ void Inter_v2::o2_playImd() { if (VAR(0) == (unsigned) breakKey) { if (_vm->_imdPlayer->_soundStage == 2) _vm->_snd->stopSound(0); + _vm->_game->_preventScroll = false; return; } } } + _vm->_game->_preventScroll = false; if (close) _vm->_imdPlayer->closeImd(); diff --git a/engines/gob/inter_v3.cpp b/engines/gob/inter_v3.cpp index f34953b40f..d3389f2671 100644 --- a/engines/gob/inter_v3.cpp +++ b/engines/gob/inter_v3.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/map.cpp b/engines/gob/map.cpp index e628163c53..3c1895d099 100644 --- a/engines/gob/map.cpp +++ b/engines/gob/map.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/map.h b/engines/gob/map.h index 5dc0dbe626..9b45c5c04e 100644 --- a/engines/gob/map.h +++ b/engines/gob/map.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/map_v1.cpp b/engines/gob/map_v1.cpp index ffed717614..c5a2622e44 100644 --- a/engines/gob/map_v1.cpp +++ b/engines/gob/map_v1.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/map_v2.cpp b/engines/gob/map_v2.cpp index 2240d7799e..e1ed11c607 100644 --- a/engines/gob/map_v2.cpp +++ b/engines/gob/map_v2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/mult.cpp b/engines/gob/mult.cpp index d407c41292..49f36a0d21 100644 --- a/engines/gob/mult.cpp +++ b/engines/gob/mult.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/mult.h b/engines/gob/mult.h index 4be1290a87..194126cd8b 100644 --- a/engines/gob/mult.h +++ b/engines/gob/mult.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/mult_v1.cpp b/engines/gob/mult_v1.cpp index 85f70b1207..45ce9aa8a0 100644 --- a/engines/gob/mult_v1.cpp +++ b/engines/gob/mult_v1.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp index 8b158ab314..38810e8c05 100644 --- a/engines/gob/mult_v2.cpp +++ b/engines/gob/mult_v2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1016,6 +1018,8 @@ void Mult_v2::playImd(const char *imdFile, Mult::Mult_ImdKey &key, int16 dir, int16 baseFrame, palFrame, lastFrame; uint16 flags; + _vm->_game->_preventScroll = true; + if (_vm->_draw->_renderFlags & 0x100) { x = VAR(55); y = VAR(56); @@ -1024,6 +1028,7 @@ void Mult_v2::playImd(const char *imdFile, Mult::Mult_ImdKey &key, int16 dir, if (key.imdFile == -1) { _vm->_imdPlayer->closeImd(); + _vm->_game->_preventScroll = false; return; } diff --git a/engines/gob/music.cpp b/engines/gob/music.cpp index b12284a05f..6e678c103e 100644 --- a/engines/gob/music.cpp +++ b/engines/gob/music.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project - * Original ADL-Player source Copyright (C) 2004 by Patrick Combet aka Dorian Gray +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/music.h b/engines/gob/music.h index 6073e1388d..579d0d74d0 100644 --- a/engines/gob/music.h +++ b/engines/gob/music.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project - * Original ADL-Player source Copyright (C) 2004 by Patrick Combet aka Dorian Gray +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/palanim.cpp b/engines/gob/palanim.cpp index 50686beb6f..2be8e55790 100644 --- a/engines/gob/palanim.cpp +++ b/engines/gob/palanim.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/palanim.h b/engines/gob/palanim.h index 81c480cd3e..911e8645e5 100644 --- a/engines/gob/palanim.h +++ b/engines/gob/palanim.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/parse.cpp b/engines/gob/parse.cpp index a603fd164e..35b17e5543 100644 --- a/engines/gob/parse.cpp +++ b/engines/gob/parse.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/parse.h b/engines/gob/parse.h index 22853e24f0..8c21a80b6b 100644 --- a/engines/gob/parse.h +++ b/engines/gob/parse.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/parse_v1.cpp b/engines/gob/parse_v1.cpp index 8373e94f47..b4c8555743 100644 --- a/engines/gob/parse_v1.cpp +++ b/engines/gob/parse_v1.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/parse_v2.cpp b/engines/gob/parse_v2.cpp index cb72d1866e..dacdcc917f 100644 --- a/engines/gob/parse_v2.cpp +++ b/engines/gob/parse_v2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/saveload.cpp b/engines/gob/saveload.cpp index d8119cf461..f4cb7bcf7a 100644 --- a/engines/gob/saveload.cpp +++ b/engines/gob/saveload.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/saveload.h b/engines/gob/saveload.h index 6f867e30ec..b8c9e730dd 100644 --- a/engines/gob/saveload.h +++ b/engines/gob/saveload.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/saveload_v2.cpp b/engines/gob/saveload_v2.cpp index b8aa0ec804..35c3429ab6 100644 --- a/engines/gob/saveload_v2.cpp +++ b/engines/gob/saveload_v2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/saveload_v3.cpp b/engines/gob/saveload_v3.cpp index fdd31f2d37..3f8aeb81bd 100644 --- a/engines/gob/saveload_v3.cpp +++ b/engines/gob/saveload_v3.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/scenery.cpp b/engines/gob/scenery.cpp index 68faf039b2..17f3af646a 100644 --- a/engines/gob/scenery.cpp +++ b/engines/gob/scenery.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/scenery.h b/engines/gob/scenery.h index 365bbd326c..32ff727c46 100644 --- a/engines/gob/scenery.h +++ b/engines/gob/scenery.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/scenery_v1.cpp b/engines/gob/scenery_v1.cpp index c88ad8d0ec..8d73be4194 100644 --- a/engines/gob/scenery_v1.cpp +++ b/engines/gob/scenery_v1.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/scenery_v2.cpp b/engines/gob/scenery_v2.cpp index d8067f3347..577bf1a87a 100644 --- a/engines/gob/scenery_v2.cpp +++ b/engines/gob/scenery_v2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/sound.cpp b/engines/gob/sound.cpp index baee878f4d..e3a4715920 100644 --- a/engines/gob/sound.cpp +++ b/engines/gob/sound.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/sound.h b/engines/gob/sound.h index 8f05fcf2e1..76b9f2b159 100644 --- a/engines/gob/sound.h +++ b/engines/gob/sound.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp index ad10381dac..d7c3ab5337 100644 --- a/engines/gob/util.cpp +++ b/engines/gob/util.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/util.h b/engines/gob/util.h index 3adc26385a..09fe668518 100644 --- a/engines/gob/util.h +++ b/engines/gob/util.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/video.cpp b/engines/gob/video.cpp index 93b9f9b470..0bc87f42d5 100644 --- a/engines/gob/video.cpp +++ b/engines/gob/video.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/video.h b/engines/gob/video.h index 21c3e7d0f2..faa9555abb 100644 --- a/engines/gob/video.h +++ b/engines/gob/video.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/video_v1.cpp b/engines/gob/video_v1.cpp index c77098e790..15b561b584 100644 --- a/engines/gob/video_v1.cpp +++ b/engines/gob/video_v1.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/gob/video_v2.cpp b/engines/gob/video_v2.cpp index e20c900180..bdc4767445 100644 --- a/engines/gob/video_v2.cpp +++ b/engines/gob/video_v2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 Ivan Dubrov - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/animator.cpp b/engines/kyra/animator.cpp index ba6ded002c..7683bb6417 100644 --- a/engines/kyra/animator.cpp +++ b/engines/kyra/animator.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/animator.h b/engines/kyra/animator.h index e21a2b52fd..e817be86d5 100644 --- a/engines/kyra/animator.h +++ b/engines/kyra/animator.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp index 48f1787ceb..d5909bd8b0 100644 --- a/engines/kyra/debugger.cpp +++ b/engines/kyra/debugger.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/debugger.h b/engines/kyra/debugger.h index 7e1e613433..2d0e82c220 100644 --- a/engines/kyra/debugger.h +++ b/engines/kyra/debugger.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index 3bd1021e5d..026f40eda8 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/kyra/detection.cpp $ + * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $ */ #include "kyra/kyra.h" @@ -160,7 +163,7 @@ PluginError Engine_KYRA_create(OSystem *syst, Engine **engine) { } else if (!scumm_stricmp("kyra3", gameid)) { *engine = new Kyra::KyraEngine_v3(syst, flags); } else - error("Kyra engine created with invalid gameid"); + error("Kyra engine created with invalid gameid ('%s')", gameid); return kNoError; } diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp index 7d6a881ba0..18fdd4436d 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/items.cpp b/engines/kyra/items.cpp index 9e0330583d..2a1a08b7de 100644 --- a/engines/kyra/items.cpp +++ b/engines/kyra/items.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp index fd3b32c2f8..7b3251f878 100644 --- a/engines/kyra/kyra.cpp +++ b/engines/kyra/kyra.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/kyra.h b/engines/kyra/kyra.h index fe0067a5b4..9d891ee511 100644 --- a/engines/kyra/kyra.h +++ b/engines/kyra/kyra.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index f0c0c1200d..7fc13a6c38 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v1.cpp $ + * $Id:kyra_v1.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 1bf18298e9..03d8f58cac 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v1.h $ + * $Id:kyra_v1.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 4f72b1378c..8482dc5aa2 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v2.cpp $ + * $Id:kyra_v2.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index 65c9f32c1b..49a4e5c09a 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v2.h $ + * $Id:kyra_v2.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/kyra/kyra_v3.cpp b/engines/kyra/kyra_v3.cpp index 2301697d61..eee901598e 100644 --- a/engines/kyra/kyra_v3.cpp +++ b/engines/kyra/kyra_v3.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v3.cpp $ + * $Id:kyra_v3.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/kyra/kyra_v3.h b/engines/kyra/kyra_v3.h index 009788a5f6..eda382d89a 100644 --- a/engines/kyra/kyra_v3.h +++ b/engines/kyra/kyra_v3.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v3.h $ + * $Id:kyra_v3.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index ca56ed0f02..7c15cee2f9 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index 1e8eddcc4f..19855ed9c9 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index c857bcc765..95693684a1 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/scene.cpp b/engines/kyra/scene.cpp index 1cba2e3e68..2ba1870fcd 100644 --- a/engines/kyra/scene.cpp +++ b/engines/kyra/scene.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index d160b35736..17c6b2219b 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h index 8f8dd1702d..5e3869d278 100644 --- a/engines/kyra/screen.h +++ b/engines/kyra/screen.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp index 2f7973f5a2..c2ec984d5c 100644 --- a/engines/kyra/script.cpp +++ b/engines/kyra/script.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/script.h b/engines/kyra/script.h index 67aef8361c..dfca7700a1 100644 --- a/engines/kyra/script.h +++ b/engines/kyra/script.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp index 4882a4a948..8e604b972b 100644 --- a/engines/kyra/script_v1.cpp +++ b/engines/kyra/script_v1.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp index 591eb29f9b..ba221bf35a 100644 --- a/engines/kyra/seqplayer.cpp +++ b/engines/kyra/seqplayer.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/seqplayer.h b/engines/kyra/seqplayer.h index 9f2b846297..0fba0403e4 100644 --- a/engines/kyra/seqplayer.h +++ b/engines/kyra/seqplayer.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/sequences_v1.cpp b/engines/kyra/sequences_v1.cpp index 56e946a526..1b4c0f680a 100644 --- a/engines/kyra/sequences_v1.cpp +++ b/engines/kyra/sequences_v1.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/sequences_v2.cpp b/engines/kyra/sequences_v2.cpp index d5ea1da655..27b6064fb9 100644 --- a/engines/kyra/sequences_v2.cpp +++ b/engines/kyra/sequences_v2.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 3b7234709f..8deed22091 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h index 3f2e2efc80..28a9521112 100644 --- a/engines/kyra/sound.h +++ b/engines/kyra/sound.h @@ -1,10 +1,8 @@ -/* ScummVM - Scumm Interpreter +/* ScummVM - Graphic Adventure Engine * - * This file is licensed under both GPL and LGPL - * Copyright (C) 2004-2006 The ScummVM project - * Copyright (C) 2006 Torbjorn Andersson and Johannes Schickel - * - * GPL License + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp index 765a20a558..86f9f718ba 100644 --- a/engines/kyra/sound_adlib.cpp +++ b/engines/kyra/sound_adlib.cpp @@ -1,10 +1,8 @@ -/* ScummVM - Scumm Interpreter +/* ScummVM - Graphic Adventure Engine * - * This file is licensed under both GPL and LGPL - * Copyright (C) 2006 The ScummVM project - * Copyright (C) 2006 Torbjorn Andersson and Johannes Schickel - * - * GPL License + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/sound_digital.cpp b/engines/kyra/sound_digital.cpp index e046335131..e2f92c9925 100644 --- a/engines/kyra/sound_digital.cpp +++ b/engines/kyra/sound_digital.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index 539017b20b..dea869d4c0 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/sprites.cpp b/engines/kyra/sprites.cpp index 18620471db..0a3f243df2 100644 --- a/engines/kyra/sprites.cpp +++ b/engines/kyra/sprites.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/sprites.h b/engines/kyra/sprites.h index 8f6db3fd64..179942d519 100644 --- a/engines/kyra/sprites.h +++ b/engines/kyra/sprites.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 1be5895e75..16e3f98791 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/text.cpp b/engines/kyra/text.cpp index dd536a87ae..c187959476 100644 --- a/engines/kyra/text.cpp +++ b/engines/kyra/text.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/text.h b/engines/kyra/text.h index 1b7ce46c32..7ffcbf0d06 100644 --- a/engines/kyra/text.h +++ b/engines/kyra/text.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp index 70d20cd102..a35b701697 100644 --- a/engines/kyra/timer.cpp +++ b/engines/kyra/timer.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index f60a7296c8..16b40cd06e 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/vqa.h b/engines/kyra/vqa.h index 98ec060437..35f7d78004 100644 --- a/engines/kyra/vqa.h +++ b/engines/kyra/vqa.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp index b2b43b86aa..f0119101fd 100644 --- a/engines/kyra/wsamovie.cpp +++ b/engines/kyra/wsamovie.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/kyra/wsamovie.h b/engines/kyra/wsamovie.h index 3e35fcb47d..a3af9f16b7 100644 --- a/engines/kyra/wsamovie.h +++ b/engines/kyra/wsamovie.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/animseq.cpp b/engines/lure/animseq.cpp index dfcdefc374..7b65d2cf0b 100644 --- a/engines/lure/animseq.cpp +++ b/engines/lure/animseq.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/animseq.h b/engines/lure/animseq.h index 86f4c8e35c..665d638e48 100644 --- a/engines/lure/animseq.h +++ b/engines/lure/animseq.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/debug-input.cpp b/engines/lure/debug-input.cpp index 7a061aea03..9ec520e11d 100644 --- a/engines/lure/debug-input.cpp +++ b/engines/lure/debug-input.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/debug-input.h b/engines/lure/debug-input.h index 032543b352..aad2e58232 100644 --- a/engines/lure/debug-input.h +++ b/engines/lure/debug-input.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/debug-methods.cpp b/engines/lure/debug-methods.cpp index 52487da303..520b29add6 100644 --- a/engines/lure/debug-methods.cpp +++ b/engines/lure/debug-methods.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/debug-methods.h b/engines/lure/debug-methods.h index aa61793662..43b77d9191 100644 --- a/engines/lure/debug-methods.h +++ b/engines/lure/debug-methods.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/debugger.cpp b/engines/lure/debugger.cpp index f9d94d4c1d..953e5643b7 100644 --- a/engines/lure/debugger.cpp +++ b/engines/lure/debugger.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/debugger.h b/engines/lure/debugger.h index 2e0951fcd8..55a381cca0 100644 --- a/engines/lure/debugger.h +++ b/engines/lure/debugger.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/decode.cpp b/engines/lure/decode.cpp index c32223edc3..dc4bdb95e1 100644 --- a/engines/lure/decode.cpp +++ b/engines/lure/decode.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/decode.h b/engines/lure/decode.h index 2c40c6ff83..8e4e87a07d 100644 --- a/engines/lure/decode.h +++ b/engines/lure/decode.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index 211874690d..4b2da03aa9 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/lure/detection.cpp $ + * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/lure/disk.cpp b/engines/lure/disk.cpp index f23490272b..8f0714c42e 100644 --- a/engines/lure/disk.cpp +++ b/engines/lure/disk.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/disk.h b/engines/lure/disk.h index 84374bf194..47ff7901c5 100644 --- a/engines/lure/disk.h +++ b/engines/lure/disk.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/events.cpp b/engines/lure/events.cpp index 707263ccbc..dd96123256 100644 --- a/engines/lure/events.cpp +++ b/engines/lure/events.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/events.h b/engines/lure/events.h index 45a664d572..fcdfc343d7 100644 --- a/engines/lure/events.h +++ b/engines/lure/events.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp index 62425ae926..26d9c71edd 100644 --- a/engines/lure/game.cpp +++ b/engines/lure/game.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/game.h b/engines/lure/game.h index 7164346dc7..43a146f2be 100644 --- a/engines/lure/game.h +++ b/engines/lure/game.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp index f3b1c01d3d..6cc863469a 100644 --- a/engines/lure/hotspots.cpp +++ b/engines/lure/hotspots.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -867,7 +870,7 @@ HotspotPrecheckResult Hotspot::actionPrecheck(HotspotData *hotspot) { setDelayCtr(4); } - hotspot->talkGate = 0x2A; + hotspot->talkGate = GENERAL_MAGIC_ID; hotspot->talkDestCharacterId = _hotspotId; return PC_WAIT; } @@ -2024,6 +2027,7 @@ void Hotspot::startTalk(HotspotData *charHotspot, uint16 id) { // Signal the character that they're being talked to charHotspot->talkDestCharacterId = _hotspotId; + charHotspot->talkGate = 0; _data->talkDestCharacterId = charHotspot->hotspotId; _data->talkGate = 0; @@ -2067,6 +2071,7 @@ void Hotspot::saveToStream(Common::WriteStream *stream) { stream->writeUint16LE(_blockedOffset); stream->writeUint16LE(_exitCtr); stream->writeByte(_walkFlag); + stream->writeByte(_persistant); stream->writeUint16LE(_startRoomNumber); stream->writeUint16LE(_supportValue); } @@ -2103,6 +2108,7 @@ void Hotspot::loadFromStream(Common::ReadStream *stream) { _blockedOffset = stream->readUint16LE(); _exitCtr = stream->readUint16LE(); _walkFlag = stream->readByte() != 0; + _persistant = stream->readByte() != 0; _startRoomNumber = stream->readUint16LE(); _supportValue = stream->readUint16LE(); } @@ -2214,7 +2220,7 @@ void HotspotTickHandlers::standardCharacterAnimHandler(Hotspot &h) { if (h.resource()->talkDestCharacterId != 0) { debugC(ERROR_DETAILED, kLureDebugAnimations, "Use Hotspot Id = %xh, talk_gate = %d", h.resource()->talkDestCharacterId, h.talkGate()); - if (h.talkGate() == 0x2A) { + if (h.talkGate() == GENERAL_MAGIC_ID) { fields.setField(ACTIVE_HOTSPOT_ID, h.talkGate()); fields.setField(USE_HOTSPOT_ID, h.resource()->talkDestCharacterId); Script::execute(h.talkScript()); @@ -2784,17 +2790,6 @@ void HotspotTickHandlers::playerAnimHandler(Hotspot &h) { debugC(ERROR_DETAILED, kLureDebugAnimations, "Hotspot player anim handler end"); } -struct RoomTranslationRecord { - uint8 srcRoom; - uint8 destRoom; -}; - -RoomTranslationRecord roomTranslations[] = { - {0x1E, 0x13}, {0x07, 0x08}, {0x1C, 0x12}, {0x26, 0x0F}, - {0x27, 0x0F}, {0x28, 0x0F}, {0x29, 0x0F}, {0x22, 0x0A}, - {0x23, 0x13}, {0x24, 0x14}, {0x31, 0x2C}, {0x2F, 0x2C}, - {0, 0}}; - void HotspotTickHandlers::followerAnimHandler(Hotspot &h) { static int countdownCtr = 0; Resources &res = Resources::getReference(); @@ -3142,9 +3137,13 @@ void HotspotTickHandlers::talkAnimHandler(Hotspot &h) { if ((entry->preSequenceId & 0x8000) != 0) break; } - if (showSelections && (numLines > 1)) + if (showSelections && (numLines > 1)) { res.setTalkState(TALK_SELECT); - else { + + // Make sure the dest character holds still while an option is selected + HotspotData *destHotspot = res.getHotspot(talkDestCharacter); + destHotspot->talkDestCharacterId = h.hotspotId(); + } else { res.setTalkState(TALK_RESPOND); res.setTalkSelection(1); } @@ -4457,17 +4456,21 @@ void HotspotList::loadFromStream(ReadStream *stream) { Hotspot *destHotspot = res.getActiveHotspot(destHotspotId); assert(destHotspot); hotspot = new Hotspot(destHotspot, hotspotId); - res.addHotspot(hotspot); } else { - hotspot = res.activateHotspot(hotspotId); + HotspotData *hotspotData = res.getHotspot(hotspotId); + assert(hotspotData); + hotspot = new Hotspot(hotspotData); } - assert(hotspot); + res.addHotspot(hotspot); + assert(hotspot); hotspot->loadFromStream(stream); + debugC(ERROR_DETAILED, kLureDebugAnimations, "Loaded hotspot %xh", hotspotId); + // Get the next hotspot hotspotId = stream->readUint16LE(); } } diff --git a/engines/lure/hotspots.h b/engines/lure/hotspots.h index 5bf7f1e310..970f05414c 100644 --- a/engines/lure/hotspots.h +++ b/engines/lure/hotspots.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/intro.cpp b/engines/lure/intro.cpp index c50c5bd8ef..e8107e2f1a 100644 --- a/engines/lure/intro.cpp +++ b/engines/lure/intro.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/intro.h b/engines/lure/intro.h index 1a14ae1ec1..769081fdda 100644 --- a/engines/lure/intro.h +++ b/engines/lure/intro.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp index f28dc00954..6b28753fd1 100644 --- a/engines/lure/lure.cpp +++ b/engines/lure/lure.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -141,8 +144,8 @@ bool LureEngine::saveGame(uint8 slotNumber, Common::String &caption) { f->writeString(caption); f->writeByte(0); // End of string terminator - Room::getReference().saveToStream(f); Resources::getReference().saveToStream(f); + Room::getReference().saveToStream(f); delete f; return true; @@ -182,8 +185,8 @@ bool LureEngine::loadGame(uint8 slotNumber) { while (f->readByte() != 0) ; // Load in the data - Room::getReference().loadFromStream(f); Resources::getReference().loadFromStream(f); + Room::getReference().loadFromStream(f); delete f; return true; diff --git a/engines/lure/lure.h b/engines/lure/lure.h index 40405ae7a3..010361573a 100644 --- a/engines/lure/lure.h +++ b/engines/lure/lure.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/luredefs.h b/engines/lure/luredefs.h index 1419c1b4cb..62c5490c8c 100644 --- a/engines/lure/luredefs.h +++ b/engines/lure/luredefs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -259,6 +262,7 @@ enum Action { #define TALK_RESPONSE_MAGIC_ID 0x1092 // Misc constants +#define GENERAL_MAGIC_ID 42 #define VOICE_ANIM_ID 0x5810 #define PUZZLED_ANIM_ID 0x8001 #define EXCLAMATION_ANIM_ID 0x8002 diff --git a/engines/lure/memory.cpp b/engines/lure/memory.cpp index 8580aaed9e..43b6519b11 100644 --- a/engines/lure/memory.cpp +++ b/engines/lure/memory.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/memory.h b/engines/lure/memory.h index 7a7bb5e120..0bbefadec7 100644 --- a/engines/lure/memory.h +++ b/engines/lure/memory.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp index 739e475f48..9c8a26a3f2 100644 --- a/engines/lure/menu.cpp +++ b/engines/lure/menu.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/menu.h b/engines/lure/menu.h index ce87bc7227..6a639f7ec5 100644 --- a/engines/lure/menu.h +++ b/engines/lure/menu.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/palette.cpp b/engines/lure/palette.cpp index e4d8db0a41..7191acd133 100644 --- a/engines/lure/palette.cpp +++ b/engines/lure/palette.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/palette.h b/engines/lure/palette.h index 274df607e6..fedb3b9570 100644 --- a/engines/lure/palette.h +++ b/engines/lure/palette.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp index 5782ccdecb..3c183ebafc 100644 --- a/engines/lure/res.cpp +++ b/engines/lure/res.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -315,7 +318,7 @@ void Resources::reloadData() { delete mb; // Initialise delay list - _delayList.clear(); + _delayList.clear(true); // Load miscellaneous data _cursors = d.getEntry(CURSOR_RESOURCE_ID); @@ -651,6 +654,7 @@ void Resources::saveToStream(Common::WriteStream *stream) _barmanLists.saveToStream(stream); _exitJoins.saveToStream(stream); _roomData.saveToStream(stream); + _delayList.saveToStream(stream); } void Resources::loadFromStream(Common::ReadStream *stream) { @@ -668,6 +672,8 @@ void Resources::loadFromStream(Common::ReadStream *stream) { _exitJoins.loadFromStream(stream); debugC(ERROR_DETAILED, kLureDebugScripts, "Loading walkable paths"); _roomData.loadFromStream(stream); + debugC(ERROR_DETAILED, kLureDebugScripts, "Loading delay list"); + _delayList.loadFromStream(stream); debugC(ERROR_DETAILED, kLureDebugScripts, "Finished loading"); } diff --git a/engines/lure/res.h b/engines/lure/res.h index 7ee89f57b9..7c9970f27f 100644 --- a/engines/lure/res.h +++ b/engines/lure/res.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp index 8c68462bf6..1ca4394ad3 100644 --- a/engines/lure/res_struct.cpp +++ b/engines/lure/res_struct.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -67,6 +70,12 @@ BarEntry barList[3] = { &ewanExtraGraphic1[0], &ewanExtraGraphic2[0]}, 16, NULL} }; +RoomTranslationRecord roomTranslations[] = { + {0x1E, 0x13}, {0x07, 0x08}, {0x1C, 0x12}, {0x26, 0x0F}, + {0x27, 0x0F}, {0x28, 0x0F}, {0x29, 0x0F}, {0x22, 0x0A}, + {0x23, 0x13}, {0x24, 0x14}, {0x31, 0x2C}, {0x2F, 0x2C}, + {0, 0}}; + // Room data holding class RoomData::RoomData(RoomResource *rec, MemoryBlock *pathData) { @@ -701,12 +710,20 @@ RoomExitCoordinateData &RoomExitCoordinates::getData(uint16 destRoomNumber) { SequenceDelayData::SequenceDelayData(uint16 delay, uint16 seqOffset, bool canClearFlag) { OSystem &system = *g_system; - // The delay is in number of ticks (1/18th of a second) - convert to milliseconds - timeoutCtr = system.getMillis() + (delay * 1000 / 18); + // The delay is in number of seconds + timeoutCtr = system.getMillis() + delay * 1000; sequenceOffset = seqOffset; canClear = canClearFlag; } +SequenceDelayData *SequenceDelayData::load(uint32 delay, uint16 seqOffset, bool canClearFlag) { + SequenceDelayData *result = new SequenceDelayData(); + result->sequenceOffset = seqOffset; + result->timeoutCtr = delay; + result->canClear = canClearFlag; + return result; +} + void SequenceDelayList::add(uint16 delay, uint16 seqOffset, bool canClear) { SequenceDelayData *entry = new SequenceDelayData(delay, seqOffset, canClear); push_front(entry); @@ -728,18 +745,45 @@ void SequenceDelayList::tick() { } } -void SequenceDelayList::clear() { +void SequenceDelayList::clear(bool forceClear) { SequenceDelayList::iterator i = begin(); while (i != end()) { SequenceDelayData *entry = *i; - if (entry->canClear) + if (entry->canClear || forceClear) i = erase(i); else ++i; } } +void SequenceDelayList::saveToStream(WriteStream *stream) { + uint32 currTime = g_system->getMillis(); + SequenceDelayList::iterator i; + + for (i = begin(); i != end(); ++i) { + SequenceDelayData *entry = *i; + stream->writeUint16LE(entry->sequenceOffset); + stream->writeUint32LE((currTime > entry->timeoutCtr ) ? 0 : + entry->timeoutCtr - currTime); + stream->writeByte(entry->canClear); + } + + stream->writeUint16LE(0); +} + +void SequenceDelayList::loadFromStream(ReadStream *stream) { + clear(true); + uint16 seqOffset; + uint32 currTime = g_system->getMillis(); + + while ((seqOffset = stream->readUint16LE()) != 0) { + uint32 delay = currTime + stream->readUint32LE(); + bool canClear = stream->readByte() != 0; + push_back(SequenceDelayData::load(delay, seqOffset, canClear)); + } +} + // The following classes hold the NPC schedule classes CharacterScheduleEntry::CharacterScheduleEntry(Action theAction, ...) { diff --git a/engines/lure/res_struct.h b/engines/lure/res_struct.h index f53f8dd9a0..55907e4c12 100644 --- a/engines/lure/res_struct.h +++ b/engines/lure/res_struct.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -589,8 +592,11 @@ public: // The following classes hold any sequence offsets that are being delayed class SequenceDelayData { +private: + SequenceDelayData() {}; public: SequenceDelayData(uint16 delay, uint16 seqOffset, bool canClearFlag); + static SequenceDelayData *load(uint32 delay, uint16 seqOffset, bool canClearFlag); uint32 timeoutCtr; uint16 sequenceOffset; @@ -601,7 +607,10 @@ class SequenceDelayList: public ManagedList<SequenceDelayData *> { public: void add(uint16 delay, uint16 seqOffset, bool canClear); void tick(); - void clear(); + void clear(bool forceClear = false); + + void saveToStream(WriteStream *stream); + void loadFromStream(ReadStream *stream); }; // The following classes holds the data for NPC schedules @@ -732,6 +741,13 @@ public: enum BarmanAction {WALK_AROUND = 1, POLISH_BAR = 2, WAIT = 3, WAIT_DIALOG = 4, SERVE_BEER = 5}; +struct RoomTranslationRecord { + uint8 srcRoom; + uint8 destRoom; +}; + +extern RoomTranslationRecord roomTranslations[]; + enum StringEnum {S_CREDITS = 25, S_RESTART_GAME = 26, S_SAVE_GAME = 27, S_RESTORE_GAME = 28, S_QUIT = 29, S_FAST_TEXT = 30, S_SLOW_TEXT = 31, S_SOUND_ON = 32, S_SOUND_OFF = 33, S_NOTHING = 34, S_FOR = 35, S_TO = 36, S_ON = 37, S_AND_THEN = 38, diff --git a/engines/lure/room.cpp b/engines/lure/room.cpp index f0da874987..a2abd3565d 100644 --- a/engines/lure/room.cpp +++ b/engines/lure/room.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/room.h b/engines/lure/room.h index 9094de722d..d991f36c92 100644 --- a/engines/lure/room.h +++ b/engines/lure/room.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/screen.cpp b/engines/lure/screen.cpp index ad84c9e838..8477c0def4 100644 --- a/engines/lure/screen.cpp +++ b/engines/lure/screen.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/screen.h b/engines/lure/screen.h index 8accfaeea1..9197f64a8d 100644 --- a/engines/lure/screen.h +++ b/engines/lure/screen.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/scripts.cpp b/engines/lure/scripts.cpp index 6e651fbc68..b3856e5ce3 100644 --- a/engines/lure/scripts.cpp +++ b/engines/lure/scripts.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -463,6 +466,34 @@ void Script::decreaseNumGroats(uint16 characterId, uint16 numGroats, uint16 v3) fields.numGroats() -= numGroats; } +// Sets a character moving to the player's room (if they're not already there) + +void Script::moveCharacterToPlayer(uint16 characterId, uint16 v2, uint16 v3) { + Resources &res = Resources::getReference(); + Hotspot *playerHotspot = res.getActiveHotspot(PLAYER_ID); + Hotspot *charHotspot = res.getActiveHotspot(characterId); + assert(charHotspot); + + // If character in same room as player, then no need to do anything + if (!charHotspot->currentActions().isEmpty() && + (charHotspot->currentActions().top().roomNumber() == playerHotspot->roomNumber())) + return; + + uint16 destRoom = playerHotspot->roomNumber(); + RoomTranslationRecord *rec; + for (rec = &roomTranslations[0]; rec->srcRoom != 0; ++rec) { + if (rec->srcRoom == destRoom) { + destRoom = rec->destRoom; + break; + } + } + + if (charHotspot->currentActions().isEmpty()) + charHotspot->currentActions().addFront(DISPATCH_ACTION, destRoom); + else + charHotspot->currentActions().top().setRoomNumber(destRoom); +} + // Sets the tick handler for the village Skorl to an alternate handler void Script::setVillageSkorlTickProc(uint16 v1, uint16 v2, uint16 v3) { @@ -510,6 +541,13 @@ void Script::enableGargoylesTalk(uint16 v1, uint16 v2, uint16 v3) { g2->actions = 1 << (TALK_TO - 1); } +// Flags the player as dead + +void Script::killPlayer(uint16 v1, uint16 v2, uint16 v3) { + Game &game = Game::getReference(); + game.setState(GS_RESTORE_RESTART); +} + // Loads the specified animation, completely bypassing the standard process // of checking for a load proc/sequence @@ -600,11 +638,13 @@ SequenceMethodRecord scriptMethods[] = { {49, Script::setSupportData}, {50, Script::givePlayerItem}, {51, Script::decreaseNumGroats}, + {53, Script::moveCharacterToPlayer}, {54, Script::setVillageSkorlTickProc}, {55, Script::freeGoewin}, {56, Script::barmanServe}, {57, Script::getNumGroats}, {59, Script::enableGargoylesTalk}, + {61, Script::killPlayer}, {62, Script::animationLoad}, {63, Script::addActions}, {64, Script::randomToGeneral}, diff --git a/engines/lure/scripts.h b/engines/lure/scripts.h index e964328130..b0cda0b74b 100644 --- a/engines/lure/scripts.h +++ b/engines/lure/scripts.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -118,11 +121,13 @@ public: static void setSupportData(uint16 hotspotId, uint16 index, uint16 v3); static void givePlayerItem(uint16 hotspotId, uint16 v2, uint16 v3); static void decreaseNumGroats(uint16 characterId, uint16 numGroats, uint16 v3); + static void moveCharacterToPlayer(uint16 characterId, uint16 v2, uint16 v3); static void setVillageSkorlTickProc(uint16 v1, uint16 v2, uint16 v3); static void freeGoewin(uint16 v1, uint16 v2, uint16 v3); static void barmanServe(uint16 v1, uint16 v2, uint16 v3); static void getNumGroats(uint16 v1, uint16 v2, uint16 v3); static void enableGargoylesTalk(uint16 v1, uint16 v2, uint16 v3); + static void killPlayer(uint16 v1, uint16 v2, uint16 v3); static void animationLoad(uint16 hotspotId, uint16 v2, uint16 v3); static void addActions(uint16 hotspotId, uint16 actions, uint16 v3); static void randomToGeneral(uint16 maxVal, uint16 minVal, uint16 v3); diff --git a/engines/lure/strings.cpp b/engines/lure/strings.cpp index 77f1471379..51840a7e9c 100644 --- a/engines/lure/strings.cpp +++ b/engines/lure/strings.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/strings.h b/engines/lure/strings.h index 1947a14b82..29e851a641 100644 --- a/engines/lure/strings.h +++ b/engines/lure/strings.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp index d0444391d7..b7baf53a76 100644 --- a/engines/lure/surface.cpp +++ b/engines/lure/surface.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/lure/surface.h b/engines/lure/surface.h index 2155f1b820..f97666d1e7 100644 --- a/engines/lure/surface.h +++ b/engines/lure/surface.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/animation.cpp b/engines/parallaction/animation.cpp index 67dc25994e..33caaa1b58 100644 --- a/engines/parallaction/animation.cpp +++ b/engines/parallaction/animation.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/archive.cpp b/engines/parallaction/archive.cpp index 3f9d0098cf..c534fea207 100644 --- a/engines/parallaction/archive.cpp +++ b/engines/parallaction/archive.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/callables.cpp b/engines/parallaction/callables.cpp index ffd7a844e4..e78c1ef594 100644 --- a/engines/parallaction/callables.cpp +++ b/engines/parallaction/callables.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/commands.cpp b/engines/parallaction/commands.cpp index d53763dfa8..15acdd2d86 100644 --- a/engines/parallaction/commands.cpp +++ b/engines/parallaction/commands.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/commands.h b/engines/parallaction/commands.h index dee063de66..64510afc13 100644 --- a/engines/parallaction/commands.h +++ b/engines/parallaction/commands.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/debug.cpp b/engines/parallaction/debug.cpp index 9b48a187cc..95091789a9 100644 --- a/engines/parallaction/debug.cpp +++ b/engines/parallaction/debug.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/defs.h b/engines/parallaction/defs.h index d2b8f049d9..d7dc3388e7 100644 --- a/engines/parallaction/defs.h +++ b/engines/parallaction/defs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp index 931f740b58..63ab893641 100644 --- a/engines/parallaction/detection.cpp +++ b/engines/parallaction/detection.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp index 6d2e3cec51..ba7ada3acd 100644 --- a/engines/parallaction/dialogue.cpp +++ b/engines/parallaction/dialogue.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/disk.cpp b/engines/parallaction/disk.cpp index 35b97b64c7..0119dfce82 100644 --- a/engines/parallaction/disk.cpp +++ b/engines/parallaction/disk.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h index 14c671b02b..bfef6d81df 100644 --- a/engines/parallaction/disk.h +++ b/engines/parallaction/disk.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp index ad06b2000b..56c26b7b4f 100644 --- a/engines/parallaction/font.cpp +++ b/engines/parallaction/font.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/parallaction/font.cpp $ + * $Id:font.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp index e11edf06c0..420ca6b681 100644 --- a/engines/parallaction/graphics.cpp +++ b/engines/parallaction/graphics.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h index ff9fed4b32..1f0c467293 100644 --- a/engines/parallaction/graphics.h +++ b/engines/parallaction/graphics.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/intro.cpp b/engines/parallaction/intro.cpp index 059555e862..7dd3dbc848 100644 --- a/engines/parallaction/intro.cpp +++ b/engines/parallaction/intro.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/inventory.cpp b/engines/parallaction/inventory.cpp index 52dbd50db0..0486dcfe63 100644 --- a/engines/parallaction/inventory.cpp +++ b/engines/parallaction/inventory.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/inventory.h b/engines/parallaction/inventory.h index 36ea39ed03..0f798ca502 100644 --- a/engines/parallaction/inventory.h +++ b/engines/parallaction/inventory.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/location.cpp b/engines/parallaction/location.cpp index 012e351ab5..ce5a16ce89 100644 --- a/engines/parallaction/location.cpp +++ b/engines/parallaction/location.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/menu.cpp b/engines/parallaction/menu.cpp index ecd5f0157e..c11c6216c5 100644 --- a/engines/parallaction/menu.cpp +++ b/engines/parallaction/menu.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/menu.h b/engines/parallaction/menu.h index 8f9c870a84..a0b8b95371 100644 --- a/engines/parallaction/menu.h +++ b/engines/parallaction/menu.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 1cf285ba57..ba97a43c6b 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index 6a64ced769..d632c57c6d 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/parser.cpp b/engines/parallaction/parser.cpp index f913e4abd0..f044e6c3c7 100644 --- a/engines/parallaction/parser.cpp +++ b/engines/parallaction/parser.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/parser.h b/engines/parallaction/parser.h index e5a2577ca2..e27095bd16 100644 --- a/engines/parallaction/parser.h +++ b/engines/parallaction/parser.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp index 251f35a24e..f1dc53539d 100644 --- a/engines/parallaction/saveload.cpp +++ b/engines/parallaction/saveload.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/sound.cpp b/engines/parallaction/sound.cpp index fec03e9291..13b989e202 100644 --- a/engines/parallaction/sound.cpp +++ b/engines/parallaction/sound.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/parallaction/sound.cpp $ + * $Id:sound.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/parallaction/sound.h b/engines/parallaction/sound.h index ae2f9c8716..f244bd4070 100644 --- a/engines/parallaction/sound.h +++ b/engines/parallaction/sound.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/parallaction/sound.h $ + * $Id:sound.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/parallaction/staticres.cpp b/engines/parallaction/staticres.cpp index 00317521a2..e6cbc303b0 100644 --- a/engines/parallaction/staticres.cpp +++ b/engines/parallaction/staticres.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/walk.cpp b/engines/parallaction/walk.cpp index aae5233e61..43ded244c5 100644 --- a/engines/parallaction/walk.cpp +++ b/engines/parallaction/walk.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/walk.h b/engines/parallaction/walk.h index eb0aa3643f..476f5cc47a 100644 --- a/engines/parallaction/walk.h +++ b/engines/parallaction/walk.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/zone.cpp b/engines/parallaction/zone.cpp index 16581e9174..7d74a6a59f 100644 --- a/engines/parallaction/zone.cpp +++ b/engines/parallaction/zone.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/parallaction/zone.h b/engines/parallaction/zone.h index a2a852f31c..9cc0fd6767 100644 --- a/engines/parallaction/zone.h +++ b/engines/parallaction/zone.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/bankman.cpp b/engines/queen/bankman.cpp index 3769d2c908..f43af18285 100644 --- a/engines/queen/bankman.cpp +++ b/engines/queen/bankman.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/bankman.h b/engines/queen/bankman.h index bdc9847d31..f196268f7b 100644 --- a/engines/queen/bankman.h +++ b/engines/queen/bankman.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/command.cpp b/engines/queen/command.cpp index be6e1638bb..4d1ec53e09 100644 --- a/engines/queen/command.cpp +++ b/engines/queen/command.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/command.h b/engines/queen/command.h index 659b67f8ed..e0a6cef80a 100644 --- a/engines/queen/command.h +++ b/engines/queen/command.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/credits.cpp b/engines/queen/credits.cpp index 4f663cc66e..5e411f4408 100644 --- a/engines/queen/credits.cpp +++ b/engines/queen/credits.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/credits.h b/engines/queen/credits.h index 1cf81a3856..0aafe010f4 100644 --- a/engines/queen/credits.h +++ b/engines/queen/credits.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/cutaway.cpp b/engines/queen/cutaway.cpp index 5ff852dff6..1f34128820 100644 --- a/engines/queen/cutaway.cpp +++ b/engines/queen/cutaway.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/cutaway.h b/engines/queen/cutaway.h index bbec1406ad..c395aa4fa2 100644 --- a/engines/queen/cutaway.h +++ b/engines/queen/cutaway.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/debug.cpp b/engines/queen/debug.cpp index 508e6f077d..22481d377d 100644 --- a/engines/queen/debug.cpp +++ b/engines/queen/debug.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/debug.h b/engines/queen/debug.h index 688486af88..1b2d7582b3 100644 --- a/engines/queen/debug.h +++ b/engines/queen/debug.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/defs.h b/engines/queen/defs.h index b6c21b38f9..1212f6926d 100644 --- a/engines/queen/defs.h +++ b/engines/queen/defs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/display.cpp b/engines/queen/display.cpp index 2a59d32739..a8c2747753 100644 --- a/engines/queen/display.cpp +++ b/engines/queen/display.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/display.h b/engines/queen/display.h index a23716f873..23316f880a 100644 --- a/engines/queen/display.h +++ b/engines/queen/display.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/graphics.cpp b/engines/queen/graphics.cpp index b3c0542592..4beca6556d 100644 --- a/engines/queen/graphics.cpp +++ b/engines/queen/graphics.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/graphics.h b/engines/queen/graphics.h index a1714bc59c..3963224069 100644 --- a/engines/queen/graphics.h +++ b/engines/queen/graphics.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/grid.cpp b/engines/queen/grid.cpp index e23ec6c59f..be0871b71d 100644 --- a/engines/queen/grid.cpp +++ b/engines/queen/grid.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/grid.h b/engines/queen/grid.h index 3e5ea02f0a..3ad3670eae 100644 --- a/engines/queen/grid.h +++ b/engines/queen/grid.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index 7f74a66734..5154b04dbe 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/input.h b/engines/queen/input.h index 8f5e58302d..9afb7472b1 100644 --- a/engines/queen/input.h +++ b/engines/queen/input.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp index 36f59fecb6..3db7ce82f0 100644 --- a/engines/queen/journal.cpp +++ b/engines/queen/journal.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/journal.h b/engines/queen/journal.h index 23110d8879..123299c6e9 100644 --- a/engines/queen/journal.h +++ b/engines/queen/journal.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp index ebd31abd83..1a196ddc09 100644 --- a/engines/queen/logic.cpp +++ b/engines/queen/logic.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/logic.h b/engines/queen/logic.h index bdb98c4ad7..b55fc3f626 100644 --- a/engines/queen/logic.h +++ b/engines/queen/logic.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/music.cpp b/engines/queen/music.cpp index 63ed42e810..7d37513a9f 100644 --- a/engines/queen/music.cpp +++ b/engines/queen/music.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/music.h b/engines/queen/music.h index 117bb5a662..22b8490367 100644 --- a/engines/queen/music.h +++ b/engines/queen/music.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/musicdata.cpp b/engines/queen/musicdata.cpp index 39acdf8ab4..bfb843766c 100644 --- a/engines/queen/musicdata.cpp +++ b/engines/queen/musicdata.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index 148e40af80..bbb186d0ae 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/queen.h b/engines/queen/queen.h index 8678ba1274..33a1830105 100644 --- a/engines/queen/queen.h +++ b/engines/queen/queen.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp index cd122717fe..999a86d432 100644 --- a/engines/queen/resource.cpp +++ b/engines/queen/resource.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/resource.h b/engines/queen/resource.h index bb6cd4ceb5..16094193d9 100644 --- a/engines/queen/resource.h +++ b/engines/queen/resource.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/restables.cpp b/engines/queen/restables.cpp index 8cebaccf49..721bde626f 100644 --- a/engines/queen/restables.cpp +++ b/engines/queen/restables.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index 378fc04e92..6184060132 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/sound.h b/engines/queen/sound.h index 8c2c9100d9..145a2d1384 100644 --- a/engines/queen/sound.h +++ b/engines/queen/sound.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/state.cpp b/engines/queen/state.cpp index 5709bb07c6..273208718f 100644 --- a/engines/queen/state.cpp +++ b/engines/queen/state.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/state.h b/engines/queen/state.h index 0cb1fd5e3b..62d941c345 100644 --- a/engines/queen/state.h +++ b/engines/queen/state.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/structs.h b/engines/queen/structs.h index 0bcd802037..6b852aaa9c 100644 --- a/engines/queen/structs.h +++ b/engines/queen/structs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp index 2bb45a243a..a47584a003 100644 --- a/engines/queen/talk.cpp +++ b/engines/queen/talk.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/talk.h b/engines/queen/talk.h index d1469e2fe8..1548d0ba27 100644 --- a/engines/queen/talk.h +++ b/engines/queen/talk.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/walk.cpp b/engines/queen/walk.cpp index 1d34fed639..6943ca1214 100644 --- a/engines/queen/walk.cpp +++ b/engines/queen/walk.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/queen/walk.h b/engines/queen/walk.h index 531bd84e8a..c64397e9c4 100644 --- a/engines/queen/walk.h +++ b/engines/queen/walk.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/actor.cpp b/engines/saga/actor.cpp index c26f06b33a..6ea8674e8e 100644 --- a/engines/saga/actor.cpp +++ b/engines/saga/actor.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1406,10 +1407,16 @@ void Actor::handleActions(int msec, bool setup) { } } - speed = (ACTOR_LMULT * 2 * actor->_screenScale + 63) / 256; - if (speed < 1) { + if(_vm->getGameType() == GType_ITE) + speed = (ACTOR_LMULT * 2 * actor->_screenScale + 63) / 256; + else + speed = (ACTOR_SPEED * actor->_screenScale + 128) >> 8; + + if (speed < 1) speed = 1; - } + + if(_vm->getGameType() == GType_IHNM) + speed = speed / 2; if ((actor->_actionDirection == kDirUp) || (actor->_actionDirection == kDirDown)) { addDelta.y = clamp(-speed, delta.y, speed); diff --git a/engines/saga/actor.h b/engines/saga/actor.h index d6ca4c4f41..d4d7a0957d 100644 --- a/engines/saga/actor.h +++ b/engines/saga/actor.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -50,6 +51,8 @@ class HitZone; #define ACTOR_LMULT 4 +#define ACTOR_SPEED 72 + #define ACTOR_CLIMB_SPEED 8 #define ACTOR_COLLISION_WIDTH 32 diff --git a/engines/saga/animation.cpp b/engines/saga/animation.cpp index 0b939e1bfb..3ea6b112f0 100644 --- a/engines/saga/animation.cpp +++ b/engines/saga/animation.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/animation.h b/engines/saga/animation.h index 76e3a90566..c850fdec83 100644 --- a/engines/saga/animation.h +++ b/engines/saga/animation.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/console.cpp b/engines/saga/console.cpp index 6aa7c60de9..69e73d771b 100644 --- a/engines/saga/console.cpp +++ b/engines/saga/console.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/console.h b/engines/saga/console.h index 30f222c0dc..3a730e0815 100644 --- a/engines/saga/console.h +++ b/engines/saga/console.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index 15c6a47682..60d8a59d3b 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/saga/detection.cpp $ + * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/saga/detection_tables.h b/engines/saga/detection_tables.h index 404ef783c1..dc531f5798 100644 --- a/engines/saga/detection_tables.h +++ b/engines/saga/detection_tables.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/saga/detection_tables.h $ + * $Id:detection_tables.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/saga/displayinfo.h b/engines/saga/displayinfo.h index 6bf58eca9b..ac691c0549 100644 --- a/engines/saga/displayinfo.h +++ b/engines/saga/displayinfo.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/saga/displayinfo.h $ + * $Id:displayinfo.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ @@ -283,16 +284,14 @@ static const GameDisplayInfo ITE_DisplayInfo = { #define IHNM_CONVERSE_TEXT_LINES 10 static PanelButton IHNM_MainPanelButtons[] = { - // TODO: The +2's are needed here to fix the verbs, investigate why - // The computation of textid in Interface::drawVerbPanelText has also been changed accordingly - {kPanelButtonVerb, 106,12, 114,30, kVerbIHNMWalk + 2,'w',0, 0,1,0}, - {kPanelButtonVerb, 106,44, 114,30, kVerbIHNMLookAt + 2,'l',0, 2,3,0}, - {kPanelButtonVerb, 106,76, 114,30, kVerbIHNMTake + 2,'k',0, 4,5,0}, - {kPanelButtonVerb, 106,108, 114,30, kVerbIHNMUse + 2,'u',0, 6,7,0}, - {kPanelButtonVerb, 223,12, 114,30, kVerbIHNMTalkTo + 2,'t',0, 8,9,0}, - {kPanelButtonVerb, 223,44, 114,30, kVerbIHNMSwallow + 2,'s',0, 10,11,0}, - {kPanelButtonVerb, 223,76, 114,30, kVerbIHNMGive + 2,'g',0, 12,13,0}, - {kPanelButtonVerb, 223,108, 114,30, kVerbIHNMPush + 2,'p',0, 14,15,0}, + {kPanelButtonVerb, 106,12, 114,30, kVerbIHNMWalk,'w',0, 0,1,0}, + {kPanelButtonVerb, 106,44, 114,30, kVerbIHNMLookAt,'l',0, 2,3,0}, + {kPanelButtonVerb, 106,76, 114,30, kVerbIHNMTake,'k',0, 4,5,0}, + {kPanelButtonVerb, 106,108, 114,30, kVerbIHNMUse,'u',0, 6,7,0}, + {kPanelButtonVerb, 223,12, 114,30, kVerbIHNMTalkTo,'t',0, 8,9,0}, + {kPanelButtonVerb, 223,44, 114,30, kVerbIHNMSwallow,'s',0, 10,11,0}, + {kPanelButtonVerb, 223,76, 114,30, kVerbIHNMGive,'g',0, 12,13,0}, + {kPanelButtonVerb, 223,108, 114,30, kVerbIHNMPush,'p',0, 14,15,0}, {kPanelButtonArrow, 606,22, 20,25, -1,'[',0, 0,0,0}, //TODO: arrow Sprite Numbers {kPanelButtonArrow, 606,108, 20,25, 1,']',0, 0,0,0}, diff --git a/engines/saga/events.cpp b/engines/saga/events.cpp index f58b17ca17..0c5830c583 100644 --- a/engines/saga/events.cpp +++ b/engines/saga/events.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/events.h b/engines/saga/events.h index 2e4d9cf987..dbd2382a27 100644 --- a/engines/saga/events.h +++ b/engines/saga/events.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/font.cpp b/engines/saga/font.cpp index fa8416bd5e..ece48512df 100644 --- a/engines/saga/font.cpp +++ b/engines/saga/font.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/font.h b/engines/saga/font.h index 73934b27e9..5823513e0f 100644 --- a/engines/saga/font.h +++ b/engines/saga/font.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/font_map.cpp b/engines/saga/font_map.cpp index 04e3400b2e..2c27c4a5af 100644 --- a/engines/saga/font_map.cpp +++ b/engines/saga/font_map.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/gfx.cpp b/engines/saga/gfx.cpp index bb85bd9b5f..a9c6801714 100644 --- a/engines/saga/gfx.cpp +++ b/engines/saga/gfx.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -215,6 +216,10 @@ void Gfx::setPalette(const PalEntry *pal, bool full) { ppal[3] = 0; } + // Color 0 should always be black in IHNM + if (_vm->getGameType() == GType_IHNM) + memset(&_currentPal[0 * 4], 0, 4); + // Make 256th color black. See bug #1256368 if ((_vm->getPlatform() == Common::kPlatformMacintosh) && !_vm->_scene->isInIntro()) memset(&_currentPal[255 * 4], 0, 4); @@ -320,6 +325,10 @@ void Gfx::palToBlack(PalEntry *srcPal, double percent) { ppal[3] = 0; } + // Color 0 should always be black in IHNM + if (_vm->getGameType() == GType_IHNM) + memset(&_currentPal[0 * 4], 0, 4); + // Make 256th color black. See bug #1256368 if ((_vm->getPlatform() == Common::kPlatformMacintosh) && !_vm->_scene->isInIntro()) memset(&_currentPal[255 * 4], 0, 4); @@ -385,6 +394,10 @@ void Gfx::blackToPal(PalEntry *srcPal, double percent) { ppal[3] = 0; } + // Color 0 should always be black in IHNM + if (_vm->getGameType() == GType_IHNM) + memset(&_currentPal[0 * 4], 0, 4); + // Make 256th color black. See bug #1256368 if ((_vm->getPlatform() == Common::kPlatformMacintosh) && !_vm->_scene->isInIntro()) memset(&_currentPal[255 * 4], 0, 4); diff --git a/engines/saga/gfx.h b/engines/saga/gfx.h index ab161a9420..4751589330 100644 --- a/engines/saga/gfx.h +++ b/engines/saga/gfx.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/ihnm_introproc.cpp b/engines/saga/ihnm_introproc.cpp index 881625c170..69ffa2620e 100644 --- a/engines/saga/ihnm_introproc.cpp +++ b/engines/saga/ihnm_introproc.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/image.cpp b/engines/saga/image.cpp index 40e0392d3b..f76258c565 100644 --- a/engines/saga/image.cpp +++ b/engines/saga/image.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/input.cpp b/engines/saga/input.cpp index e0216ba2fa..64bb222efb 100644 --- a/engines/saga/input.cpp +++ b/engines/saga/input.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp index 2d15db80ee..f9f22161ec 100644 --- a/engines/saga/interface.cpp +++ b/engines/saga/interface.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1972,9 +1973,8 @@ void Interface::drawVerbPanelText(Surface *ds, PanelButton *panelButton, KnownCo if (_vm->getGameType() == GType_ITE) { textId = verbTypeToTextStringsIdLUT[0][panelButton->id]; text = _vm->getTextString(textId); - } else { - // This -2 has been placed because of the changes in the ids in IHNM_MainPanelButtons - textId = verbTypeToTextStringsIdLUT[1][panelButton->id - 2]; + } else { + textId = verbTypeToTextStringsIdLUT[1][panelButton->id]; text = _vm->_script->_mainStrings.getString(textId + 1); textShadowKnownColor = kKnownColorTransparent; } diff --git a/engines/saga/interface.h b/engines/saga/interface.h index a69d94b6b9..b537d49424 100644 --- a/engines/saga/interface.h +++ b/engines/saga/interface.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/isomap.cpp b/engines/saga/isomap.cpp index 0f728c4ee7..124242204b 100644 --- a/engines/saga/isomap.cpp +++ b/engines/saga/isomap.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/isomap.h b/engines/saga/isomap.h index 5325feee95..99365f63af 100644 --- a/engines/saga/isomap.h +++ b/engines/saga/isomap.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/ite_introproc.cpp b/engines/saga/ite_introproc.cpp index d32aa359de..ec4d07c069 100644 --- a/engines/saga/ite_introproc.cpp +++ b/engines/saga/ite_introproc.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/itedata.cpp b/engines/saga/itedata.cpp index 603efac46f..60082561e2 100644 --- a/engines/saga/itedata.cpp +++ b/engines/saga/itedata.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/itedata.h b/engines/saga/itedata.h index 45d045356d..dc36e0e89b 100644 --- a/engines/saga/itedata.h +++ b/engines/saga/itedata.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/list.h b/engines/saga/list.h index c69d173617..28159475c3 100644 --- a/engines/saga/list.h +++ b/engines/saga/list.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index 0126e79b6b..27729247ef 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/music.h b/engines/saga/music.h index 4e14f3fc01..125c85aa9b 100644 --- a/engines/saga/music.h +++ b/engines/saga/music.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/objectmap.cpp b/engines/saga/objectmap.cpp index 5bfdade011..fd9e7197b7 100644 --- a/engines/saga/objectmap.cpp +++ b/engines/saga/objectmap.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/objectmap.h b/engines/saga/objectmap.h index 654ade174b..e65edb9ccf 100644 --- a/engines/saga/objectmap.h +++ b/engines/saga/objectmap.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/palanim.cpp b/engines/saga/palanim.cpp index 4cfaf5e0fd..19c2fc4d40 100644 --- a/engines/saga/palanim.cpp +++ b/engines/saga/palanim.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/palanim.h b/engines/saga/palanim.h index e2ca695eb6..40d6cea4a1 100644 --- a/engines/saga/palanim.h +++ b/engines/saga/palanim.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/puzzle.cpp b/engines/saga/puzzle.cpp index de519e4062..c2bfec4ebd 100644 --- a/engines/saga/puzzle.cpp +++ b/engines/saga/puzzle.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/puzzle.h b/engines/saga/puzzle.h index 59c5b69299..92bf73e2a0 100644 --- a/engines/saga/puzzle.h +++ b/engines/saga/puzzle.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/render.cpp b/engines/saga/render.cpp index 33e49a4653..4e5d98bbf9 100644 --- a/engines/saga/render.cpp +++ b/engines/saga/render.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/render.h b/engines/saga/render.h index 1eb0a56d80..c97de8efc9 100644 --- a/engines/saga/render.h +++ b/engines/saga/render.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/rscfile.cpp b/engines/saga/rscfile.cpp index 225963df64..33e8a7d603 100644 --- a/engines/saga/rscfile.cpp +++ b/engines/saga/rscfile.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/rscfile.h b/engines/saga/rscfile.h index 0ab6b18741..f8b6ddc3be 100644 --- a/engines/saga/rscfile.h +++ b/engines/saga/rscfile.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index 264863d043..3ce0e08d9c 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/saga.h b/engines/saga/saga.h index 0d9a464e19..1a8da5533a 100644 --- a/engines/saga/saga.h +++ b/engines/saga/saga.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/sagaresnames.h b/engines/saga/sagaresnames.h index d5e1cfbfec..6527510910 100644 --- a/engines/saga/sagaresnames.h +++ b/engines/saga/sagaresnames.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp index 2977990a9d..cf493a7c84 100644 --- a/engines/saga/saveload.cpp +++ b/engines/saga/saveload.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp index 74cae1f4cf..9b7e7fb331 100644 --- a/engines/saga/scene.cpp +++ b/engines/saga/scene.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/scene.h b/engines/saga/scene.h index ce76bde4a2..5b19e5d654 100644 --- a/engines/saga/scene.h +++ b/engines/saga/scene.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/script.cpp b/engines/saga/script.cpp index 8a1e61cd46..2df5c4da14 100644 --- a/engines/saga/script.cpp +++ b/engines/saga/script.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -287,7 +288,10 @@ void Script::showVerb(int statusColor) { return; } - verbName = _mainStrings.getString(_leftButtonVerb - 1); + if (_vm->getGameType() == GType_ITE) + verbName = _mainStrings.getString(_leftButtonVerb - 1); + else + verbName = _mainStrings.getString(_leftButtonVerb + 1); if (objectTypeId(_currentObject[0]) == kGameObjectNone) { _vm->_interface->setStatusText(verbName, statusColor); @@ -355,27 +359,29 @@ int Script::getVerbType(VerbTypes verbType) { } } else { + // TODO: This is ugly and needs rewriting, but + // it works for now switch (verbType) { case kVerbNone: return kVerbIHNMNone; case kVerbWalkTo: return kVerbIHNMWalk; - case kVerbGive: - return kVerbIHNMGive; - case kVerbUse: - return kVerbIHNMUse; - case kVerbEnter: - return kVerbIHNMEnter; case kVerbLookAt: return kVerbIHNMLookAt; case kVerbPickUp: return kVerbIHNMTake; - case kVerbOpen: - return -2; - case kVerbClose: - return -2; + case kVerbUse: + return kVerbIHNMUse; case kVerbTalkTo: return kVerbIHNMTalkTo; + case kVerbOpen: + return kVerbIHNMSwallow; + case kVerbGive: + return kVerbIHNMGive; + case kVerbClose: + return kVerbIHNMPush; + case kVerbEnter: + return kVerbIHNMEnter; case kVerbWalkOnly: return kVerbIHNMWalkOnly; case kVerbLookOnly: diff --git a/engines/saga/script.h b/engines/saga/script.h index 1d922013ec..a8a0cd762b 100644 --- a/engines/saga/script.h +++ b/engines/saga/script.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/sfuncs.cpp b/engines/saga/sfuncs.cpp index 5ae7bba621..d759c9c2e7 100644 --- a/engines/saga/sfuncs.cpp +++ b/engines/saga/sfuncs.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1115,7 +1116,7 @@ void Script::sfPlaceActor(SCRIPTFUNC_PARAMS) { frameRange = _vm->_actor->getActorFrameRange(actorId, frameType); if (frameRange->frameCount <= frameOffset) { - error("Wrong frameOffset 0x%X", frameOffset); + warning("Wrong frameOffset 0x%X", frameOffset); } actor->_frameNumber = frameRange->frameIndex + frameOffset; diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp index 3901999eab..0e3db65898 100644 --- a/engines/saga/sndres.cpp +++ b/engines/saga/sndres.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/sndres.h b/engines/saga/sndres.h index c660029358..bd30ae7d4f 100644 --- a/engines/saga/sndres.h +++ b/engines/saga/sndres.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp index d528db5add..a4ce79b9c4 100644 --- a/engines/saga/sound.cpp +++ b/engines/saga/sound.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/sound.h b/engines/saga/sound.h index e02c38a598..3abea583ba 100644 --- a/engines/saga/sound.h +++ b/engines/saga/sound.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/sprite.cpp b/engines/saga/sprite.cpp index 89baf3c0de..607e7d0a0b 100644 --- a/engines/saga/sprite.cpp +++ b/engines/saga/sprite.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/sprite.h b/engines/saga/sprite.h index 8e96618dba..4b44bb9134 100644 --- a/engines/saga/sprite.h +++ b/engines/saga/sprite.h @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/sthread.cpp b/engines/saga/sthread.cpp index 74310e2a09..4249584941 100644 --- a/engines/saga/sthread.cpp +++ b/engines/saga/sthread.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/saga/stream.h b/engines/saga/stream.h index 146ac63758..2564f097e1 100644 --- a/engines/saga/stream.h +++ b/engines/saga/stream.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index c3384ff2ce..187a45b836 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -796,6 +798,11 @@ void Actor::setDirection(int direction) { int i; uint16 vald; + // HACK to fix bug #774783 + // If Hitler's direction is being set to anything other than 90, set it to 90 + if ((_vm->_game.id == GID_INDY3) && _vm->_roomResource == 46 && _number == 9 && direction != 90) + direction = 90; + // Do nothing if actor is already facing in the given direction if (_facing == direction) return; @@ -2348,6 +2355,7 @@ void ScummEngine_v71he::postProcessAuxQueue() { a->_auxBlock.r.top = (int16)READ_LE_UINT16(axer + 2) + dy; a->_auxBlock.r.right = (int16)READ_LE_UINT16(axer + 4) + dx; a->_auxBlock.r.bottom = (int16)READ_LE_UINT16(axer + 6) + dy; + adjustRect(a->_auxBlock.r); } } } diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h index 2beccf3a72..30dc7789d6 100644 --- a/engines/scumm/actor.h +++ b/engines/scumm/actor.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp index b29bacc9c6..2a51464341 100644 --- a/engines/scumm/akos.cpp +++ b/engines/scumm/akos.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/akos.h b/engines/scumm/akos.h index 9c9c608a64..d38ae4b1ad 100644 --- a/engines/scumm/akos.h +++ b/engines/scumm/akos.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/base-costume.cpp b/engines/scumm/base-costume.cpp index ee0589275a..8886dbfcd4 100644 --- a/engines/scumm/base-costume.cpp +++ b/engines/scumm/base-costume.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/base-costume.h b/engines/scumm/base-costume.h index 02930c6603..e6ef618a3e 100644 --- a/engines/scumm/base-costume.h +++ b/engines/scumm/base-costume.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/bomp.cpp b/engines/scumm/bomp.cpp index 78808a79dc..0ffb80970c 100644 --- a/engines/scumm/bomp.cpp +++ b/engines/scumm/bomp.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/bomp.h b/engines/scumm/bomp.h index cf22abe3de..0d76c370db 100644 --- a/engines/scumm/bomp.h +++ b/engines/scumm/bomp.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp index 7b51268f42..424e5d891e 100644 --- a/engines/scumm/boxes.cpp +++ b/engines/scumm/boxes.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/boxes.h b/engines/scumm/boxes.h index f2c0597a25..a93c9f4919 100644 --- a/engines/scumm/boxes.h +++ b/engines/scumm/boxes.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/camera.cpp b/engines/scumm/camera.cpp index 5aaa197310..d6ecc715ea 100644 --- a/engines/scumm/camera.cpp +++ b/engines/scumm/camera.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp index 654a7fd6c3..28012e5759 100644 --- a/engines/scumm/charset.cpp +++ b/engines/scumm/charset.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1311,6 +1314,20 @@ void CharsetRenderer::translateColor() { } } +void CharsetRenderer::saveLoadWithSerializer(Serializer *ser) { + static const SaveLoadEntry charsetRendererEntries[] = { + MKLINE(CharsetRenderer, _curId, sleByte, VER(73)), + MKLINE(CharsetRenderer, _color, sleByte, VER(73)), + MKEND() + }; + + ser->saveLoadEntries(this, charsetRendererEntries); + + if (ser->isLoading()) { + setCurID(_curId); + setColor(_color); + } +} void CharsetRendererClassic::printChar(int chr, bool ignoreCharsetMask) { int width, height, origWidth, origHeight; diff --git a/engines/scumm/charset.h b/engines/scumm/charset.h index 5039d31573..2f1ce1129f 100644 --- a/engines/scumm/charset.h +++ b/engines/scumm/charset.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -25,6 +28,7 @@ #include "common/scummsys.h" #include "common/rect.h" #include "scumm/gfx.h" +#include "scumm/saveload.h" namespace Scumm { @@ -84,6 +88,8 @@ public: virtual int getCharWidth(byte chr) = 0; virtual void setColor(byte color) { _color = color; translateColor(); } + + void saveLoadWithSerializer(Serializer *ser); }; class CharsetRendererCommon : public CharsetRenderer { diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp index 7eaeb2b08c..2c5be5bf21 100644 --- a/engines/scumm/costume.cpp +++ b/engines/scumm/costume.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/costume.h b/engines/scumm/costume.h index 0bdcc5c679..003bd6ce2b 100644 --- a/engines/scumm/costume.h +++ b/engines/scumm/costume.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp index 66b3fc8a39..23657946c6 100644 --- a/engines/scumm/cursor.cpp +++ b/engines/scumm/cursor.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp index 421d8a0b2d..83ba9e24c1 100644 --- a/engines/scumm/debugger.cpp +++ b/engines/scumm/debugger.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/debugger.h b/engines/scumm/debugger.h index d781b957de..043983bbd9 100644 --- a/engines/scumm/debugger.h +++ b/engines/scumm/debugger.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index d9ac3e42df..f60908d3ed 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/scumm/detection.cpp $ + * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ @@ -319,6 +321,7 @@ static void computeGameSettingsFromMD5(const FSList &fslist, const GameFilenameP static void detectGames(const FSList &fslist, Common::List<DetectorResult> &results, const char *gameid) { DescMap fileMD5Map; DetectorResult dr; + char md5str[32+1]; for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { if (!file->isDirectory()) { @@ -369,7 +372,6 @@ static void detectGames(const FSList &fslist, Common::List<DetectorResult> &resu // DetectorDesc &d = fileMD5Map[file]; if (d.md5.empty()) { - char md5str[32+1]; if (Common::md5_file_string(d.node, md5str, kMD5FileSizeLimit)) { d.md5 = md5str; diff --git a/engines/scumm/detection.h b/engines/scumm/detection.h index b75fd7c46e..d0fefe3a29 100644 --- a/engines/scumm/detection.h +++ b/engines/scumm/detection.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/scumm/detection.h $ + * $Id:detection.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h index 85813aa606..c59c790229 100644 --- a/engines/scumm/detection_tables.h +++ b/engines/scumm/detection_tables.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/scumm/detection_tables.h $ + * $Id:detection_tables.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ @@ -512,6 +514,7 @@ static const GameFilenamePattern gameFilenamesTable[] = { { "bluesabctime", "BluesABCTimeDemo", kGenHEPC, UNK_LANG, UNK, 0 }, { "bluesabctime", "BluesABCTimeDemo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, { "bluesabctime", "abc-slideshow.cup", kGenUnchanged, UNK_LANG, UNK, 0 }, + { "bluesabctime", "BluesABCTimeSlideshow.cup", kGenUnchanged, UNK_LANG, UNK, 0 }, { "BluesBirthday", "Blue'sBirthday-Red", kGenHEPC, UNK_LANG, UNK, 0 }, { "BluesBirthday", "Blue'sBirthday-Red", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, @@ -520,6 +523,7 @@ static const GameFilenamePattern gameFilenamesTable[] = { { "BluesBirthday", "BluesBirthdayDemo", kGenHEPC, UNK_LANG, UNK, 0 }, { "BluesBirthday", "BluesBirthdayDemo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, { "BluesBirthday", "bda-slideshow.cup", kGenUnchanged, UNK_LANG, UNK, 0 }, + { "BluesBirthday", "BluesBirthdaySlideshow.cup", kGenUnchanged, UNK_LANG, UNK, 0 }, { "catalog", "catalog", kGenHEPC, UNK_LANG, UNK, 0 }, { "catalog", "catalog2", kGenHEPC, UNK_LANG, UNK, 0 }, @@ -703,6 +707,7 @@ static const GameFilenamePattern gameFilenamesTable[] = { { "puttrace", "ToffRennen", kGenHEPC, Common::DE_DEU, UNK, 0 }, { "puttrace", "ToffRennen", kGenHEMac, Common::DE_DEU, Common::kPlatformMacintosh, 0 }, { "puttrace", "UKPuttRace", kGenHEPC, Common::RU_RUS, UNK, 0 }, // Russian + { "puttrace", "PUTTDEMO.CUP", kGenUnchanged, UNK_LANG, UNK, 0 }, { "puttrace", "racedemo.cup", kGenUnchanged, UNK_LANG, UNK, 0 }, { "PuttsFunShop", "PuttsFunShop", kGenHEPC, UNK_LANG, UNK, 0 }, diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index a95aeacdad..15c22c2bed 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -910,7 +913,16 @@ void ValueDisplayDialog::open() { _timer = getMillis() + kDisplayDelay; } +Indy3IQPointsDialog::Indy3IQPointsDialog(ScummEngine *scumm, char* text) + : InfoDialog(scumm, text) { +} +void Indy3IQPointsDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) { + if (ascii == 'i') + close(); + else + ScummDialog::handleKeyDown(ascii, keycode, modifiers); +} } // End of namespace Scumm diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h index bfcdaf2960..d3ee9dbc18 100644 --- a/engines/scumm/dialogs.h +++ b/engines/scumm/dialogs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -232,6 +235,14 @@ protected: uint32 _timer; }; + +//The Indy IQ dialog +class Indy3IQPointsDialog : public InfoDialog { +public: + Indy3IQPointsDialog(ScummEngine *scumm, char* text); + virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers); +}; + } // End of namespace Scumm #endif diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp index 5957ff35c7..3ab3e1a2e0 100644 --- a/engines/scumm/file.cpp +++ b/engines/scumm/file.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/file.h b/engines/scumm/file.h index 0c78a5c5c2..18b7b8fb18 100644 --- a/engines/scumm/file.h +++ b/engines/scumm/file.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp index 914229cd23..dd7a23d0cf 100644 --- a/engines/scumm/gfx.cpp +++ b/engines/scumm/gfx.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/gfx.h b/engines/scumm/gfx.h index 4df50a7053..fb8da562c8 100644 --- a/engines/scumm/gfx.h +++ b/engines/scumm/gfx.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp index 98f370a827..da0855e1a3 100644 --- a/engines/scumm/he/animation_he.cpp +++ b/engines/scumm/he/animation_he.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h index 78b0a747e0..d93c1317d7 100644 --- a/engines/scumm/he/animation_he.h +++ b/engines/scumm/he/animation_he.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index 6b1d31a435..737e2772ff 100644 --- a/engines/scumm/he/cup_player_he.cpp +++ b/engines/scumm/he/cup_player_he.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/cup_player_he.h b/engines/scumm/he/cup_player_he.h index 1295cec7a1..b9f257add1 100644 --- a/engines/scumm/he/cup_player_he.h +++ b/engines/scumm/he/cup_player_he.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/floodfill_he.cpp b/engines/scumm/he/floodfill_he.cpp index dd45cf56bc..1fdd11fce8 100644 --- a/engines/scumm/he/floodfill_he.cpp +++ b/engines/scumm/he/floodfill_he.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/floodfill_he.h b/engines/scumm/he/floodfill_he.h index 6369e4712e..d449599f7d 100644 --- a/engines/scumm/he/floodfill_he.h +++ b/engines/scumm/he/floodfill_he.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h index 2a59e02126..54eb470c26 100644 --- a/engines/scumm/he/intern_he.h +++ b/engines/scumm/he/intern_he.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/logic_he.cpp b/engines/scumm/he/logic_he.cpp index 996ccd93f9..7a0869ad24 100644 --- a/engines/scumm/he/logic_he.cpp +++ b/engines/scumm/he/logic_he.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/logic_he.h b/engines/scumm/he/logic_he.h index 1f2303da1f..af5457295b 100644 --- a/engines/scumm/he/logic_he.h +++ b/engines/scumm/he/logic_he.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/palette_he.cpp b/engines/scumm/he/palette_he.cpp index 1f7ff8f7c9..9efc16c60b 100644 --- a/engines/scumm/he/palette_he.cpp +++ b/engines/scumm/he/palette_he.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp index 9f372f0c1a..651c150cee 100644 --- a/engines/scumm/he/resource_he.cpp +++ b/engines/scumm/he/resource_he.cpp @@ -1,9 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Parts of code heavily based on: - * icoutils - A set of programs dealing with MS Windows icons and cursors. - * Copyright (C) 1998-2001 Oskar Liljeblad + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h index 411dd375e2..757cf13b7c 100644 --- a/engines/scumm/he/resource_he.h +++ b/engines/scumm/he/resource_he.h @@ -1,9 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * Parts of code heavily based on: - * icoutils - A set of programs dealing with MS Windows icons and cursors. - * Copyright (C) 1998-2001 Oskar Liljeblad + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp index 2139359232..e234dd02fc 100644 --- a/engines/scumm/he/script_v100he.cpp +++ b/engines/scumm/he/script_v100he.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp index c629ab64a1..29226cd939 100644 --- a/engines/scumm/he/script_v60he.cpp +++ b/engines/scumm/he/script_v60he.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/script_v70he.cpp b/engines/scumm/he/script_v70he.cpp index c70ff136c4..6b1f670e15 100644 --- a/engines/scumm/he/script_v70he.cpp +++ b/engines/scumm/he/script_v70he.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index 5611047596..8953d55546 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp index 9b0adb258e..a62b65787c 100644 --- a/engines/scumm/he/script_v80he.cpp +++ b/engines/scumm/he/script_v80he.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp index fdca6172bd..a717eecc50 100644 --- a/engines/scumm/he/script_v90he.cpp +++ b/engines/scumm/he/script_v90he.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index a9ec98c53a..d0a16390dd 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/sound_he.h b/engines/scumm/he/sound_he.h index 36f0714048..5ee1f9e0b9 100644 --- a/engines/scumm/he/sound_he.h +++ b/engines/scumm/he/sound_he.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp index ca64fe8c28..8e6f3ce4c2 100644 --- a/engines/scumm/he/sprite_he.cpp +++ b/engines/scumm/he/sprite_he.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/sprite_he.h b/engines/scumm/he/sprite_he.h index d7fbbe2f63..55c1093f00 100644 --- a/engines/scumm/he/sprite_he.h +++ b/engines/scumm/he/sprite_he.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp index 005202a229..549e4480f6 100644 --- a/engines/scumm/he/wiz_he.cpp +++ b/engines/scumm/he/wiz_he.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/he/wiz_he.h b/engines/scumm/he/wiz_he.h index 95a69c517e..a9b60384f4 100644 --- a/engines/scumm/he/wiz_he.h +++ b/engines/scumm/he/wiz_he.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/help.cpp b/engines/scumm/help.cpp index a7a6b621d4..16605605e9 100644 --- a/engines/scumm/help.cpp +++ b/engines/scumm/help.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/help.h b/engines/scumm/help.h index 9691c09594..152dc99c3e 100644 --- a/engines/scumm/help.h +++ b/engines/scumm/help.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index e1e192100e..e604222733 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse/imuse.h b/engines/scumm/imuse/imuse.h index fe779a1360..ece4a30e14 100644 --- a/engines/scumm/imuse/imuse.h +++ b/engines/scumm/imuse/imuse.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse/imuse_internal.h b/engines/scumm/imuse/imuse_internal.h index 1a70563c8f..7e2bd03211 100644 --- a/engines/scumm/imuse/imuse_internal.h +++ b/engines/scumm/imuse/imuse_internal.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse/imuse_part.cpp b/engines/scumm/imuse/imuse_part.cpp index 46ebd92982..ffe572aaa9 100644 --- a/engines/scumm/imuse/imuse_part.cpp +++ b/engines/scumm/imuse/imuse_part.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp index 1f20d6ca69..b6ed9f8d25 100644 --- a/engines/scumm/imuse/imuse_player.cpp +++ b/engines/scumm/imuse/imuse_player.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse/instrument.cpp b/engines/scumm/imuse/instrument.cpp index 171efe9b4b..23b325c20b 100644 --- a/engines/scumm/imuse/instrument.cpp +++ b/engines/scumm/imuse/instrument.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse/instrument.h b/engines/scumm/imuse/instrument.h index 98e4a6cbad..e8914e899e 100644 --- a/engines/scumm/imuse/instrument.h +++ b/engines/scumm/imuse/instrument.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse/sysex.h b/engines/scumm/imuse/sysex.h index b573906887..adffc24e88 100644 --- a/engines/scumm/imuse/sysex.h +++ b/engines/scumm/imuse/sysex.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse/sysex_samnmax.cpp b/engines/scumm/imuse/sysex_samnmax.cpp index 02295e7b84..0586db25ee 100644 --- a/engines/scumm/imuse/sysex_samnmax.cpp +++ b/engines/scumm/imuse/sysex_samnmax.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse/sysex_scumm.cpp b/engines/scumm/imuse/sysex_scumm.cpp index e3298fc85f..bee790e009 100644 --- a/engines/scumm/imuse/sysex_scumm.cpp +++ b/engines/scumm/imuse/sysex_scumm.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp index cf4c0ca86e..bee1a56b82 100644 --- a/engines/scumm/imuse_digi/dimuse.cpp +++ b/engines/scumm/imuse_digi/dimuse.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse_digi/dimuse.h b/engines/scumm/imuse_digi/dimuse.h index fdbbdf7b40..8cfe0f8542 100644 --- a/engines/scumm/imuse_digi/dimuse.h +++ b/engines/scumm/imuse_digi/dimuse.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse_digi/dimuse_bndmgr.cpp b/engines/scumm/imuse_digi/dimuse_bndmgr.cpp index 671a71ac09..6592be8848 100644 --- a/engines/scumm/imuse_digi/dimuse_bndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_bndmgr.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse_digi/dimuse_bndmgr.h b/engines/scumm/imuse_digi/dimuse_bndmgr.h index 60bce790bf..ba044a24ed 100644 --- a/engines/scumm/imuse_digi/dimuse_bndmgr.h +++ b/engines/scumm/imuse_digi/dimuse_bndmgr.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse_digi/dimuse_codecs.cpp b/engines/scumm/imuse_digi/dimuse_codecs.cpp index 6f695eab0d..601bfddbe9 100644 --- a/engines/scumm/imuse_digi/dimuse_codecs.cpp +++ b/engines/scumm/imuse_digi/dimuse_codecs.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse_digi/dimuse_music.cpp b/engines/scumm/imuse_digi/dimuse_music.cpp index 909f1e65db..ad734c7311 100644 --- a/engines/scumm/imuse_digi/dimuse_music.cpp +++ b/engines/scumm/imuse_digi/dimuse_music.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp index 1ee71b51da..a61fbcfb24 100644 --- a/engines/scumm/imuse_digi/dimuse_script.cpp +++ b/engines/scumm/imuse_digi/dimuse_script.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index 5c7fa5b613..61c5fece2a 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.h b/engines/scumm/imuse_digi/dimuse_sndmgr.h index d351e2ca70..2bdaed446b 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.h +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse_digi/dimuse_tables.cpp b/engines/scumm/imuse_digi/dimuse_tables.cpp index f4fd25a160..0b014b5f5e 100644 --- a/engines/scumm/imuse_digi/dimuse_tables.cpp +++ b/engines/scumm/imuse_digi/dimuse_tables.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp index a3ff3927fe..6277cfdf01 100644 --- a/engines/scumm/imuse_digi/dimuse_track.cpp +++ b/engines/scumm/imuse_digi/dimuse_track.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -326,6 +329,10 @@ IMuseDigital::Track *IMuseDigital::cloneToFadeOutTrack(const Track *track, int f // Clone the soundhandle // FIXME: Shouldn't we check here whether track->soundHandle is NULL, resp. whether stream2 // is being used (as in, we are using compressed data)... + // + // -- aquadran -- nope :) this is called only for bundle files and sound data in *.la1 + // from switchToNextRegion and fadeOutMusic func. + // stream2 is used only for sou VOICE type sound data (FT) -- fadeTrack->soundHandle = _sound->cloneSound(track->soundHandle); assert(fadeTrack->soundHandle); diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index d31d3afd85..50307ebc57 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -496,6 +498,26 @@ void ScummEngine_v3::processKeyboard(int lastKeyHit) { // Fall back to default behavior ScummEngine::processKeyboard(lastKeyHit); } + + // i brings up an IQ dialog in Indy3 + + if (lastKeyHit == 'i' && _game.id == GID_INDY3) { + // SCUMM var 244 is the episode score + // and var 245 is the series score + char text[50]; + + // FIXME: Currently, the series score does not work properly + // This workaround just sets it equal to the episode score + // However, at the end of the game, it does show the episode + // score by itself + int a = _scummVars[245]; + if (!a) + a = _scummVars[244]; + + sprintf(text, "IQ Points: Episode = %d, Series = %d", _scummVars[244], a); + Indy3IQPointsDialog indy3IQPointsDialog(this, text); + runDialog(indy3IQPointsDialog); + } } void ScummEngine::processKeyboard(int lastKeyHit) { diff --git a/engines/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp index 15c653dc98..f445fe490c 100644 --- a/engines/scumm/insane/insane.cpp +++ b/engines/scumm/insane/insane.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/insane/insane.h b/engines/scumm/insane/insane.h index a99a28f6e0..a3dcbe1ce6 100644 --- a/engines/scumm/insane/insane.h +++ b/engines/scumm/insane/insane.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/insane/insane_ben.cpp b/engines/scumm/insane/insane_ben.cpp index 573197e8c5..1732ce0b11 100644 --- a/engines/scumm/insane/insane_ben.cpp +++ b/engines/scumm/insane/insane_ben.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp index af5b0fe02b..36568a635c 100644 --- a/engines/scumm/insane/insane_enemy.cpp +++ b/engines/scumm/insane/insane_enemy.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/insane/insane_iact.cpp b/engines/scumm/insane/insane_iact.cpp index e43fb0d352..cc1be928bb 100644 --- a/engines/scumm/insane/insane_iact.cpp +++ b/engines/scumm/insane/insane_iact.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp index 2b148716eb..5843e85f0f 100644 --- a/engines/scumm/insane/insane_scenes.cpp +++ b/engines/scumm/insane/insane_scenes.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h index 3d3a07a2ed..3c16f78a68 100644 --- a/engines/scumm/intern.h +++ b/engines/scumm/intern.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/midiparser_eup.cpp b/engines/scumm/midiparser_eup.cpp index a9c40f99c5..9d26d1232b 100644 --- a/engines/scumm/midiparser_eup.cpp +++ b/engines/scumm/midiparser_eup.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/midiparser_ro.cpp b/engines/scumm/midiparser_ro.cpp index b240ffb5fd..fff4f616c0 100644 --- a/engines/scumm/midiparser_ro.cpp +++ b/engines/scumm/midiparser_ro.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/music.h b/engines/scumm/music.h index fc75aba4c9..c6555318a9 100644 --- a/engines/scumm/music.h +++ b/engines/scumm/music.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/nut_renderer.cpp b/engines/scumm/nut_renderer.cpp index 8dc3ee3ddf..4d5097cf61 100644 --- a/engines/scumm/nut_renderer.cpp +++ b/engines/scumm/nut_renderer.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/nut_renderer.h b/engines/scumm/nut_renderer.h index 1d5ee4a018..55a445e957 100644 --- a/engines/scumm/nut_renderer.h +++ b/engines/scumm/nut_renderer.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index 5cd1297034..a88c56bc5a 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/object.h b/engines/scumm/object.h index 35233a3bb0..bf38d42289 100644 --- a/engines/scumm/object.h +++ b/engines/scumm/object.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp index b276c2bb84..a29cf5fdaa 100644 --- a/engines/scumm/palette.cpp +++ b/engines/scumm/palette.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/player_mod.cpp b/engines/scumm/player_mod.cpp index 918df6e6dc..9005376187 100644 --- a/engines/scumm/player_mod.cpp +++ b/engines/scumm/player_mod.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/player_mod.h b/engines/scumm/player_mod.h index 6e381191d1..5756916ae0 100644 --- a/engines/scumm/player_mod.h +++ b/engines/scumm/player_mod.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/player_nes.cpp b/engines/scumm/player_nes.cpp index a59a7437a2..5d3424da42 100644 --- a/engines/scumm/player_nes.cpp +++ b/engines/scumm/player_nes.cpp @@ -1,7 +1,8 @@ - -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/player_nes.h b/engines/scumm/player_nes.h index eaececee2d..bed23d7c85 100644 --- a/engines/scumm/player_nes.h +++ b/engines/scumm/player_nes.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/player_v1.cpp b/engines/scumm/player_v1.cpp index b0b47b7f32..8ae2772a6c 100644 --- a/engines/scumm/player_v1.cpp +++ b/engines/scumm/player_v1.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/player_v1.h b/engines/scumm/player_v1.h index 5b6d3e704a..ab5d6c1619 100644 --- a/engines/scumm/player_v1.h +++ b/engines/scumm/player_v1.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/player_v2.cpp b/engines/scumm/player_v2.cpp index 9f764a5d0b..ae7985011b 100644 --- a/engines/scumm/player_v2.cpp +++ b/engines/scumm/player_v2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/player_v2.h b/engines/scumm/player_v2.h index 704c3d9795..43771d295f 100644 --- a/engines/scumm/player_v2.h +++ b/engines/scumm/player_v2.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/player_v2a.cpp b/engines/scumm/player_v2a.cpp index 5957e2378f..7096021be9 100644 --- a/engines/scumm/player_v2a.cpp +++ b/engines/scumm/player_v2a.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/player_v2a.h b/engines/scumm/player_v2a.h index 9e3348181d..3157e9d8be 100644 --- a/engines/scumm/player_v2a.h +++ b/engines/scumm/player_v2a.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/player_v3a.cpp b/engines/scumm/player_v3a.cpp index 597b62054c..76913f351d 100644 --- a/engines/scumm/player_v3a.cpp +++ b/engines/scumm/player_v3a.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/player_v3a.h b/engines/scumm/player_v3a.h index 2a6714f622..ce8d9477c9 100644 --- a/engines/scumm/player_v3a.h +++ b/engines/scumm/player_v3a.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp index 6d2bf76592..88df9da6c7 100644 --- a/engines/scumm/resource.cpp +++ b/engines/scumm/resource.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/resource.h b/engines/scumm/resource.h index 789249abd7..a14b7173a2 100644 --- a/engines/scumm/resource.h +++ b/engines/scumm/resource.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/resource_v2.cpp b/engines/scumm/resource_v2.cpp index 6a4f1ea30b..816556775f 100644 --- a/engines/scumm/resource_v2.cpp +++ b/engines/scumm/resource_v2.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/resource_v3.cpp b/engines/scumm/resource_v3.cpp index 2a4add52f3..5b3fc8e546 100644 --- a/engines/scumm/resource_v3.cpp +++ b/engines/scumm/resource_v3.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/resource_v4.cpp b/engines/scumm/resource_v4.cpp index 6b02494856..6a4e3f0c0a 100644 --- a/engines/scumm/resource_v4.cpp +++ b/engines/scumm/resource_v4.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp index 102b012f76..bb0e0c88f8 100644 --- a/engines/scumm/room.cpp +++ b/engines/scumm/room.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 242b7c9f51..9578b05c1f 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1156,11 +1158,16 @@ void ScummEngine::saveOrLoad(Serializer *s) { // // Save/load the charset renderer state // - if (s->getVersion() >= VER(72)) { - if (s->isSaving()) { - s->saveByte(_charset->getCurID()); - } else { + if (s->getVersion() >= VER(73)) { + _charset->saveLoadWithSerializer(s); + } else if (s->isLoading()) { + if (s->getVersion() == VER(72)) { _charset->setCurID(s->loadByte()); + } else { + // Before V72, the charset id wasn't saved. This used to cause issues such + // as the one described in the bug report #1722153. For these savegames, + // we reinitialize the id using a, hopefully, sane value. + _charset->setCurID(_string[0]._default.charset); } } } diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index 0c4bc14001..449cfc57f1 100644 --- a/engines/scumm/saveload.h +++ b/engines/scumm/saveload.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -47,7 +50,7 @@ namespace Scumm { * only saves/loads those which are valid for the version of the savegame * which is being loaded/saved currently. */ -#define CURRENT_VER 72 +#define CURRENT_VER 73 /** * An auxillary macro, used to specify savegame versions. We use this instead diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index a0e48bc4a1..46e4e64347 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/script.h b/engines/scumm/script.h index 776c5276a7..9081e76c22 100644 --- a/engines/scumm/script.h +++ b/engines/scumm/script.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp index 78853ecbae..62e5cee03b 100644 --- a/engines/scumm/script_v0.cpp +++ b/engines/scumm/script_v0.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index 9fc0f0659f..767d9495cc 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp index fca3228696..c4f7937aa4 100644 --- a/engines/scumm/script_v5.cpp +++ b/engines/scumm/script_v5.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index d29b30fc8f..a408616942 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp index 011c41856a..984604516d 100644 --- a/engines/scumm/script_v8.cpp +++ b/engines/scumm/script_v8.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 5da8ddf8fa..8abfd006a5 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,7 +26,6 @@ #include "common/stdafx.h" #include "common/config-manager.h" -//#include "common/fs.h" #include "common/md5.h" #include "common/events.h" #include "common/system.h" diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 33df01be1d..59c5923e3b 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/channel.cpp b/engines/scumm/smush/channel.cpp index 81019ab41d..065712fcad 100644 --- a/engines/scumm/smush/channel.cpp +++ b/engines/scumm/smush/channel.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/channel.h b/engines/scumm/smush/channel.h index 2dd523dc06..52fec22e0e 100644 --- a/engines/scumm/smush/channel.h +++ b/engines/scumm/smush/channel.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/chunk.cpp b/engines/scumm/smush/chunk.cpp index a0b5fb86e4..ee24773c82 100644 --- a/engines/scumm/smush/chunk.cpp +++ b/engines/scumm/smush/chunk.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/chunk.h b/engines/scumm/smush/chunk.h index f88f9d37a2..ca4a3cdd99 100644 --- a/engines/scumm/smush/chunk.h +++ b/engines/scumm/smush/chunk.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/codec1.cpp b/engines/scumm/smush/codec1.cpp index 5b6a7b62f8..a1f04b6a29 100644 --- a/engines/scumm/smush/codec1.cpp +++ b/engines/scumm/smush/codec1.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/codec37.cpp b/engines/scumm/smush/codec37.cpp index fadb7d115a..5207374313 100644 --- a/engines/scumm/smush/codec37.cpp +++ b/engines/scumm/smush/codec37.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/codec37.h b/engines/scumm/smush/codec37.h index 6ad3e6b72e..96033ade31 100644 --- a/engines/scumm/smush/codec37.h +++ b/engines/scumm/smush/codec37.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/codec47.cpp b/engines/scumm/smush/codec47.cpp index 9bf4262c03..34d61d1c8a 100644 --- a/engines/scumm/smush/codec47.cpp +++ b/engines/scumm/smush/codec47.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/codec47.h b/engines/scumm/smush/codec47.h index ccb4b4ccfd..cfa467de4e 100644 --- a/engines/scumm/smush/codec47.h +++ b/engines/scumm/smush/codec47.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/imuse_channel.cpp b/engines/scumm/smush/imuse_channel.cpp index e69b08014b..951a4bdc7e 100644 --- a/engines/scumm/smush/imuse_channel.cpp +++ b/engines/scumm/smush/imuse_channel.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/saud_channel.cpp b/engines/scumm/smush/saud_channel.cpp index 3541d37ed5..1bd74b2446 100644 --- a/engines/scumm/smush/saud_channel.cpp +++ b/engines/scumm/smush/saud_channel.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/smush_font.cpp b/engines/scumm/smush/smush_font.cpp index 0b194544d8..094421cdcb 100644 --- a/engines/scumm/smush/smush_font.cpp +++ b/engines/scumm/smush/smush_font.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/smush_font.h b/engines/scumm/smush/smush_font.h index 6e38f0b31f..312d6dbc78 100644 --- a/engines/scumm/smush/smush_font.h +++ b/engines/scumm/smush/smush_font.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp index e29a921224..04103bb8d8 100644 --- a/engines/scumm/smush/smush_mixer.cpp +++ b/engines/scumm/smush/smush_mixer.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/smush_mixer.h b/engines/scumm/smush/smush_mixer.h index 456c2b4203..86adcd3bdc 100644 --- a/engines/scumm/smush/smush_mixer.h +++ b/engines/scumm/smush/smush_mixer.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 0b5a1450e5..2c744a16e2 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/smush/smush_player.h b/engines/scumm/smush/smush_player.h index f4b1b5881e..486c8d23e6 100644 --- a/engines/scumm/smush/smush_player.h +++ b/engines/scumm/smush/smush_player.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index c54eb25db5..4a468d151c 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/sound.h b/engines/scumm/sound.h index bda4fdd273..57b73d3a04 100644 --- a/engines/scumm/sound.h +++ b/engines/scumm/sound.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index b255737fa3..44e727b5d3 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/thumbnail.cpp b/engines/scumm/thumbnail.cpp index 023848c02a..01255f1c1d 100644 --- a/engines/scumm/thumbnail.cpp +++ b/engines/scumm/thumbnail.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/usage_bits.cpp b/engines/scumm/usage_bits.cpp index 3fd90311fd..ebf9261afb 100644 --- a/engines/scumm/usage_bits.cpp +++ b/engines/scumm/usage_bits.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/usage_bits.h b/engines/scumm/usage_bits.h index 55154e3793..b3d582f7b9 100644 --- a/engines/scumm/usage_bits.h +++ b/engines/scumm/usage_bits.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/util.cpp b/engines/scumm/util.cpp index a0f3b05c5e..c78b72d7f6 100644 --- a/engines/scumm/util.cpp +++ b/engines/scumm/util.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/util.h b/engines/scumm/util.h index ca1ecd6293..0cf94eaff0 100644 --- a/engines/scumm/util.h +++ b/engines/scumm/util.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp index 7c73b42b1f..0dd4c83a0d 100644 --- a/engines/scumm/vars.cpp +++ b/engines/scumm/vars.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp index b899ab6751..edd8004d30 100644 --- a/engines/scumm/verbs.cpp +++ b/engines/scumm/verbs.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/scumm/verbs.h b/engines/scumm/verbs.h index 46ef502cba..47fa98a9de 100644 --- a/engines/scumm/verbs.h +++ b/engines/scumm/verbs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/autoroute.cpp b/engines/sky/autoroute.cpp index 53c870f6f2..3086121942 100644 --- a/engines/sky/autoroute.cpp +++ b/engines/sky/autoroute.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/autoroute.h b/engines/sky/autoroute.h index b476beeb04..0b9ad2912a 100644 --- a/engines/sky/autoroute.h +++ b/engines/sky/autoroute.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp index e8c57cb027..2cdfbf679c 100644 --- a/engines/sky/compact.cpp +++ b/engines/sky/compact.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/compact.h b/engines/sky/compact.h index 070c3af629..ac72d60395 100644 --- a/engines/sky/compact.h +++ b/engines/sky/compact.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp index b795bf3c7b..04f6800aab 100644 --- a/engines/sky/control.cpp +++ b/engines/sky/control.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/control.h b/engines/sky/control.h index efccd268f4..ebf66a9e16 100644 --- a/engines/sky/control.h +++ b/engines/sky/control.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/debug.cpp b/engines/sky/debug.cpp index 28d9482ae7..995a18c39b 100644 --- a/engines/sky/debug.cpp +++ b/engines/sky/debug.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/debug.h b/engines/sky/debug.h index c85604e877..20b518768b 100644 --- a/engines/sky/debug.h +++ b/engines/sky/debug.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp index 8d21fed5c6..0cdb05aa00 100644 --- a/engines/sky/disk.cpp +++ b/engines/sky/disk.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/disk.h b/engines/sky/disk.h index df0b8e380f..b6a85569d4 100644 --- a/engines/sky/disk.h +++ b/engines/sky/disk.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/grid.cpp b/engines/sky/grid.cpp index 7becff74d5..83ca55d00d 100644 --- a/engines/sky/grid.cpp +++ b/engines/sky/grid.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/grid.h b/engines/sky/grid.h index fb51d8555a..366a71518f 100644 --- a/engines/sky/grid.h +++ b/engines/sky/grid.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/hufftext.cpp b/engines/sky/hufftext.cpp index 01b0d4a679..b3e299d00c 100644 --- a/engines/sky/hufftext.cpp +++ b/engines/sky/hufftext.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp index 42e0e92f5a..482dc623cc 100644 --- a/engines/sky/intro.cpp +++ b/engines/sky/intro.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/intro.h b/engines/sky/intro.h index 85ba744573..7f0b94fb52 100644 --- a/engines/sky/intro.h +++ b/engines/sky/intro.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp index dac64dff4e..c5a6b32ea1 100644 --- a/engines/sky/logic.cpp +++ b/engines/sky/logic.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/logic.h b/engines/sky/logic.h index d1189bbef0..8b42f89e5d 100644 --- a/engines/sky/logic.h +++ b/engines/sky/logic.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/mouse.cpp b/engines/sky/mouse.cpp index bb31c6b542..c18eb6d901 100644 --- a/engines/sky/mouse.cpp +++ b/engines/sky/mouse.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/mouse.h b/engines/sky/mouse.h index b60108dcc9..83e82101bc 100644 --- a/engines/sky/mouse.h +++ b/engines/sky/mouse.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp index 59d144feea..fa589d64c0 100644 --- a/engines/sky/music/adlibchannel.cpp +++ b/engines/sky/music/adlibchannel.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/music/adlibchannel.h b/engines/sky/music/adlibchannel.h index 5dbf5564f5..d73de0b0de 100644 --- a/engines/sky/music/adlibchannel.h +++ b/engines/sky/music/adlibchannel.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp index 5955a504df..03588f1fca 100644 --- a/engines/sky/music/adlibmusic.cpp +++ b/engines/sky/music/adlibmusic.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/music/adlibmusic.h b/engines/sky/music/adlibmusic.h index 152fcc0df5..bccf0cbbec 100644 --- a/engines/sky/music/adlibmusic.h +++ b/engines/sky/music/adlibmusic.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/music/gmchannel.cpp b/engines/sky/music/gmchannel.cpp index 766bd2ff66..d7d2ba854b 100644 --- a/engines/sky/music/gmchannel.cpp +++ b/engines/sky/music/gmchannel.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/music/gmchannel.h b/engines/sky/music/gmchannel.h index ffe898a400..555054315e 100644 --- a/engines/sky/music/gmchannel.h +++ b/engines/sky/music/gmchannel.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/music/gmmusic.cpp b/engines/sky/music/gmmusic.cpp index ff9bc14263..2a1e8dcc1d 100644 --- a/engines/sky/music/gmmusic.cpp +++ b/engines/sky/music/gmmusic.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/music/gmmusic.h b/engines/sky/music/gmmusic.h index 214dfd810f..c4f3216b79 100644 --- a/engines/sky/music/gmmusic.h +++ b/engines/sky/music/gmmusic.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/music/mt32music.cpp b/engines/sky/music/mt32music.cpp index 322e5e77fe..4f816c6856 100644 --- a/engines/sky/music/mt32music.cpp +++ b/engines/sky/music/mt32music.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/music/mt32music.h b/engines/sky/music/mt32music.h index eb312136db..cf77240be8 100644 --- a/engines/sky/music/mt32music.h +++ b/engines/sky/music/mt32music.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/music/musicbase.cpp b/engines/sky/music/musicbase.cpp index 80eeaf7637..b6ea150d94 100644 --- a/engines/sky/music/musicbase.cpp +++ b/engines/sky/music/musicbase.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/music/musicbase.h b/engines/sky/music/musicbase.h index 1adb03fc9c..40556e7e8a 100644 --- a/engines/sky/music/musicbase.h +++ b/engines/sky/music/musicbase.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/rnc_deco.cpp b/engines/sky/rnc_deco.cpp index a49ddb0735..c87968b521 100644 --- a/engines/sky/rnc_deco.cpp +++ b/engines/sky/rnc_deco.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/rnc_deco.h b/engines/sky/rnc_deco.h index c02e4eab2f..89bdf83f45 100644 --- a/engines/sky/rnc_deco.h +++ b/engines/sky/rnc_deco.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/screen.cpp b/engines/sky/screen.cpp index eae0417d09..cd99515d06 100644 --- a/engines/sky/screen.cpp +++ b/engines/sky/screen.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/screen.h b/engines/sky/screen.h index 15223b0c3e..f3fdda2506 100644 --- a/engines/sky/screen.h +++ b/engines/sky/screen.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index 195aa240e2..84038990aa 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/sky.h b/engines/sky/sky.h index e11f1b6cd5..bc76e37eef 100644 --- a/engines/sky/sky.h +++ b/engines/sky/sky.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/skydefs.h b/engines/sky/skydefs.h index 31448fc3d7..49e717737c 100644 --- a/engines/sky/skydefs.h +++ b/engines/sky/skydefs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index 5e17ab4d01..cf769cb3e9 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/sound.h b/engines/sky/sound.h index 4d7456195e..c5f9011499 100644 --- a/engines/sky/sound.h +++ b/engines/sky/sound.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/struc.h b/engines/sky/struc.h index 357b31d1cd..25f0b3d772 100644 --- a/engines/sky/struc.h +++ b/engines/sky/struc.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/text.cpp b/engines/sky/text.cpp index 93af603257..3b7d2feb72 100644 --- a/engines/sky/text.cpp +++ b/engines/sky/text.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sky/text.h b/engines/sky/text.h index 2cade27f5d..be09f5a437 100644 --- a/engines/sky/text.h +++ b/engines/sky/text.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index c80614d2d4..d66db9347d 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h index 4e76c200c5..db3ea75fd9 100644 --- a/engines/sword1/animation.h +++ b/engines/sword1/animation.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/collision.h b/engines/sword1/collision.h index e6b0bea43e..774ce09f9e 100644 --- a/engines/sword1/collision.h +++ b/engines/sword1/collision.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index d8cc03bce5..e40db20f37 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/control.h b/engines/sword1/control.h index 8cacbfb0b8..89ea7199b6 100644 --- a/engines/sword1/control.h +++ b/engines/sword1/control.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/credits.cpp b/engines/sword1/credits.cpp index aa520367d7..0dd190232a 100644 --- a/engines/sword1/credits.cpp +++ b/engines/sword1/credits.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/credits.h b/engines/sword1/credits.h index bce2678cd3..1b4864709b 100644 --- a/engines/sword1/credits.h +++ b/engines/sword1/credits.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/debug.cpp b/engines/sword1/debug.cpp index d5ef5f87da..9eddc60942 100644 --- a/engines/sword1/debug.cpp +++ b/engines/sword1/debug.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/debug.h b/engines/sword1/debug.h index 8992a3bcfe..1fe37ff856 100644 --- a/engines/sword1/debug.h +++ b/engines/sword1/debug.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/eventman.cpp b/engines/sword1/eventman.cpp index c13007e8fc..74c8b30f9a 100644 --- a/engines/sword1/eventman.cpp +++ b/engines/sword1/eventman.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/eventman.h b/engines/sword1/eventman.h index b234a7afa4..a7d2e59407 100644 --- a/engines/sword1/eventman.h +++ b/engines/sword1/eventman.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp index 1f6a648a9e..7c15d66a46 100644 --- a/engines/sword1/logic.cpp +++ b/engines/sword1/logic.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/logic.h b/engines/sword1/logic.h index 4e8267a184..4792d004dd 100644 --- a/engines/sword1/logic.h +++ b/engines/sword1/logic.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/memman.cpp b/engines/sword1/memman.cpp index b9b0dc5d24..558140b73b 100644 --- a/engines/sword1/memman.cpp +++ b/engines/sword1/memman.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/memman.h b/engines/sword1/memman.h index e4083301f8..17e07a9b5b 100644 --- a/engines/sword1/memman.h +++ b/engines/sword1/memman.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/menu.cpp b/engines/sword1/menu.cpp index 1266d39daa..0ffeb2b1a0 100644 --- a/engines/sword1/menu.cpp +++ b/engines/sword1/menu.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/menu.h b/engines/sword1/menu.h index 410067a70b..e8e6049431 100644 --- a/engines/sword1/menu.h +++ b/engines/sword1/menu.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/mouse.cpp b/engines/sword1/mouse.cpp index 6e4923c304..cc4bd5e028 100644 --- a/engines/sword1/mouse.cpp +++ b/engines/sword1/mouse.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/mouse.h b/engines/sword1/mouse.h index f69309020e..92b26c3573 100644 --- a/engines/sword1/mouse.h +++ b/engines/sword1/mouse.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp index a8cf0db661..67a390802b 100644 --- a/engines/sword1/music.cpp +++ b/engines/sword1/music.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/music.h b/engines/sword1/music.h index 049d425130..09108af75a 100644 --- a/engines/sword1/music.h +++ b/engines/sword1/music.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/object.h b/engines/sword1/object.h index 88599a6a62..ba65002918 100644 --- a/engines/sword1/object.h +++ b/engines/sword1/object.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/objectman.cpp b/engines/sword1/objectman.cpp index 5aab4859be..0d3a79b1d2 100644 --- a/engines/sword1/objectman.cpp +++ b/engines/sword1/objectman.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/objectman.h b/engines/sword1/objectman.h index e797ffb734..5fb0b787c2 100644 --- a/engines/sword1/objectman.h +++ b/engines/sword1/objectman.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/resman.cpp b/engines/sword1/resman.cpp index 1abc91a2e1..0ed9b833f1 100644 --- a/engines/sword1/resman.cpp +++ b/engines/sword1/resman.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/resman.h b/engines/sword1/resman.h index 83da34ce10..62d290e6da 100644 --- a/engines/sword1/resman.h +++ b/engines/sword1/resman.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/router.cpp b/engines/sword1/router.cpp index 7ca917326b..685e11fd32 100644 --- a/engines/sword1/router.cpp +++ b/engines/sword1/router.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/router.h b/engines/sword1/router.h index d45a08dca2..67be8d0593 100644 --- a/engines/sword1/router.h +++ b/engines/sword1/router.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) Revolution Software Ltd. +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/screen.cpp b/engines/sword1/screen.cpp index 605e1127cf..078f14a00e 100644 --- a/engines/sword1/screen.cpp +++ b/engines/sword1/screen.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/screen.h b/engines/sword1/screen.h index c72b8db1e1..28aa43f023 100644 --- a/engines/sword1/screen.h +++ b/engines/sword1/screen.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index 35130c89c1..4d8601a0d8 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/sound.h b/engines/sword1/sound.h index 2542c02b9e..fb608a9631 100644 --- a/engines/sword1/sound.h +++ b/engines/sword1/sound.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/staticres.cpp b/engines/sword1/staticres.cpp index 9991d0e826..366e2c7608 100644 --- a/engines/sword1/staticres.cpp +++ b/engines/sword1/staticres.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index 751fb0f1ac..97e518421c 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/sword1.h b/engines/sword1/sword1.h index 75bae573e6..1ced01d6ef 100644 --- a/engines/sword1/sword1.h +++ b/engines/sword1/sword1.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/sworddefs.h b/engines/sword1/sworddefs.h index af85a45f23..aedc38ef7e 100644 --- a/engines/sword1/sworddefs.h +++ b/engines/sword1/sworddefs.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/swordres.h b/engines/sword1/swordres.h index 5c11fae88b..0c861a3307 100644 --- a/engines/sword1/swordres.h +++ b/engines/sword1/swordres.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/text.cpp b/engines/sword1/text.cpp index f55eed52b0..adab06e283 100644 --- a/engines/sword1/text.cpp +++ b/engines/sword1/text.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword1/text.h b/engines/sword1/text.h index dc3f48eb77..fcea75ff87 100644 --- a/engines/sword1/text.h +++ b/engines/sword1/text.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index 8424e9c768..2eb24430c7 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h index 4d3660026d..38055f59a9 100644 --- a/engines/sword2/animation.h +++ b/engines/sword2/animation.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/anims.cpp b/engines/sword2/anims.cpp index b00e40a8f4..1878b1d6f1 100644 --- a/engines/sword2/anims.cpp +++ b/engines/sword2/anims.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/console.cpp b/engines/sword2/console.cpp index 4e8e0eda24..1fae963ee8 100644 --- a/engines/sword2/console.cpp +++ b/engines/sword2/console.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/console.h b/engines/sword2/console.h index 35c6d582e7..32beaedfbb 100644 --- a/engines/sword2/console.h +++ b/engines/sword2/console.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/controls.cpp b/engines/sword2/controls.cpp index f9665c4be8..277ea108d9 100644 --- a/engines/sword2/controls.cpp +++ b/engines/sword2/controls.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/controls.h b/engines/sword2/controls.h index 5ec48c26dc..043330c178 100644 --- a/engines/sword2/controls.h +++ b/engines/sword2/controls.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/debug.cpp b/engines/sword2/debug.cpp index a7d4e709cc..f1f93c4731 100644 --- a/engines/sword2/debug.cpp +++ b/engines/sword2/debug.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/debug.h b/engines/sword2/debug.h index 9832c471d0..768f339dbd 100644 --- a/engines/sword2/debug.h +++ b/engines/sword2/debug.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/defs.h b/engines/sword2/defs.h index 7fe73a7c3e..c729ff0287 100644 --- a/engines/sword2/defs.h +++ b/engines/sword2/defs.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/events.cpp b/engines/sword2/events.cpp index c1b5a22232..4a2838795c 100644 --- a/engines/sword2/events.cpp +++ b/engines/sword2/events.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/function.cpp b/engines/sword2/function.cpp index ea7629ce4c..188ddd4d9b 100644 --- a/engines/sword2/function.cpp +++ b/engines/sword2/function.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/header.h b/engines/sword2/header.h index 278d98b0b9..3e4cc0a6ae 100644 --- a/engines/sword2/header.h +++ b/engines/sword2/header.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/icons.cpp b/engines/sword2/icons.cpp index 6af244369a..13f211d7a0 100644 --- a/engines/sword2/icons.cpp +++ b/engines/sword2/icons.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/interpreter.cpp b/engines/sword2/interpreter.cpp index c496d2bafe..605f1625fa 100644 --- a/engines/sword2/interpreter.cpp +++ b/engines/sword2/interpreter.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/interpreter.h b/engines/sword2/interpreter.h index c4f352dfa2..1eb66cfa3c 100644 --- a/engines/sword2/interpreter.h +++ b/engines/sword2/interpreter.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/layers.cpp b/engines/sword2/layers.cpp index 5d9f78799e..2b5f215b7a 100644 --- a/engines/sword2/layers.cpp +++ b/engines/sword2/layers.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/logic.cpp b/engines/sword2/logic.cpp index 40b431fccc..03a248450a 100644 --- a/engines/sword2/logic.cpp +++ b/engines/sword2/logic.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/logic.h b/engines/sword2/logic.h index 6048fe7310..0093b85436 100644 --- a/engines/sword2/logic.h +++ b/engines/sword2/logic.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/maketext.cpp b/engines/sword2/maketext.cpp index c4f4f5f99c..324f7c19ca 100644 --- a/engines/sword2/maketext.cpp +++ b/engines/sword2/maketext.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/maketext.h b/engines/sword2/maketext.h index 53e66c6b7b..63b65a32b1 100644 --- a/engines/sword2/maketext.h +++ b/engines/sword2/maketext.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/memory.cpp b/engines/sword2/memory.cpp index 7da4e86b51..c3d0a7add6 100644 --- a/engines/sword2/memory.cpp +++ b/engines/sword2/memory.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/memory.h b/engines/sword2/memory.h index 9dee857fbe..f01b85f4b3 100644 --- a/engines/sword2/memory.h +++ b/engines/sword2/memory.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/menu.cpp b/engines/sword2/menu.cpp index 68435eb526..2f93227bfa 100644 --- a/engines/sword2/menu.cpp +++ b/engines/sword2/menu.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/mouse.cpp b/engines/sword2/mouse.cpp index c839a4b172..46cc5372a1 100644 --- a/engines/sword2/mouse.cpp +++ b/engines/sword2/mouse.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/mouse.h b/engines/sword2/mouse.h index a18687384b..c7d90cc6fe 100644 --- a/engines/sword2/mouse.h +++ b/engines/sword2/mouse.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp index 819e4164ca..28427e5d1b 100644 --- a/engines/sword2/music.cpp +++ b/engines/sword2/music.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/object.h b/engines/sword2/object.h index 829a3ab38e..ce894e287b 100644 --- a/engines/sword2/object.h +++ b/engines/sword2/object.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/palette.cpp b/engines/sword2/palette.cpp index 86aebc7684..dcc519cdce 100644 --- a/engines/sword2/palette.cpp +++ b/engines/sword2/palette.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/protocol.cpp b/engines/sword2/protocol.cpp index 1824aca258..e4992c27c7 100644 --- a/engines/sword2/protocol.cpp +++ b/engines/sword2/protocol.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/render.cpp b/engines/sword2/render.cpp index 02f576c99c..dafef6de00 100644 --- a/engines/sword2/render.cpp +++ b/engines/sword2/render.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/resman.cpp b/engines/sword2/resman.cpp index b8e79a610e..e8c5fcf42a 100644 --- a/engines/sword2/resman.cpp +++ b/engines/sword2/resman.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/resman.h b/engines/sword2/resman.h index c1a8f3f117..4546448167 100644 --- a/engines/sword2/resman.h +++ b/engines/sword2/resman.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/router.cpp b/engines/sword2/router.cpp index e26f736a5f..b05f2ae0e5 100644 --- a/engines/sword2/router.cpp +++ b/engines/sword2/router.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/router.h b/engines/sword2/router.h index f2f87403c7..f5d7f65efe 100644 --- a/engines/sword2/router.h +++ b/engines/sword2/router.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/saveload.cpp b/engines/sword2/saveload.cpp index 3f37d6b5de..9d6826f1a0 100644 --- a/engines/sword2/saveload.cpp +++ b/engines/sword2/saveload.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/saveload.h b/engines/sword2/saveload.h index 195843dcf2..ceaa9712a4 100644 --- a/engines/sword2/saveload.h +++ b/engines/sword2/saveload.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/screen.cpp b/engines/sword2/screen.cpp index 603a4d4d90..a31d2a46c9 100644 --- a/engines/sword2/screen.cpp +++ b/engines/sword2/screen.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/screen.h b/engines/sword2/screen.h index d5a01485fa..d59a6ef3df 100644 --- a/engines/sword2/screen.h +++ b/engines/sword2/screen.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/scroll.cpp b/engines/sword2/scroll.cpp index 503c8646c9..7df70c8019 100644 --- a/engines/sword2/scroll.cpp +++ b/engines/sword2/scroll.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp index 1a7cc1cee6..04b3e55098 100644 --- a/engines/sword2/sound.cpp +++ b/engines/sword2/sound.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/sound.h b/engines/sword2/sound.h index 932e557eaa..70bae6f851 100644 --- a/engines/sword2/sound.h +++ b/engines/sword2/sound.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/speech.cpp b/engines/sword2/speech.cpp index 7367b2b083..0e8aa70538 100644 --- a/engines/sword2/speech.cpp +++ b/engines/sword2/speech.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/sprite.cpp b/engines/sword2/sprite.cpp index a353180561..9aa3bfff9b 100644 --- a/engines/sword2/sprite.cpp +++ b/engines/sword2/sprite.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/startup.cpp b/engines/sword2/startup.cpp index d7b1c0f934..870a13fd46 100644 --- a/engines/sword2/startup.cpp +++ b/engines/sword2/startup.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index 8f49bba839..280beb7c22 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h index 5e67eb2a08..b6d6c331f9 100644 --- a/engines/sword2/sword2.h +++ b/engines/sword2/sword2.h @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/sync.cpp b/engines/sword2/sync.cpp index cfe17ac713..57e857b6ed 100644 --- a/engines/sword2/sync.cpp +++ b/engines/sword2/sync.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/sword2/walker.cpp b/engines/sword2/walker.cpp index 47f01fecf4..4db69474d9 100644 --- a/engines/sword2/walker.cpp +++ b/engines/sword2/walker.cpp @@ -1,5 +1,11 @@ -/* Copyright (C) 1994-1998 Revolution Software Ltd. - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1994-1998 Revolution Software Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index cff91ecd83..fd390a5d10 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/touche/detection.cpp $ + * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/touche/graphics.cpp b/engines/touche/graphics.cpp index 32daa98cbe..51fdcbd89a 100644 --- a/engines/touche/graphics.cpp +++ b/engines/touche/graphics.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/touche/graphics.h b/engines/touche/graphics.h index 71b77dc22c..42d1a93425 100644 --- a/engines/touche/graphics.h +++ b/engines/touche/graphics.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/touche/midi.cpp b/engines/touche/midi.cpp index 398eefc5b5..29e68a4562 100644 --- a/engines/touche/midi.cpp +++ b/engines/touche/midi.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/touche/midi.h b/engines/touche/midi.h index b9cd22cb8d..808ecfb205 100644 --- a/engines/touche/midi.h +++ b/engines/touche/midi.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/touche/opcodes.cpp b/engines/touche/opcodes.cpp index c5f2e5afd9..f0ef748fbd 100644 --- a/engines/touche/opcodes.cpp +++ b/engines/touche/opcodes.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/touche/resource.cpp b/engines/touche/resource.cpp index 92a83cdd7f..585e70c534 100644 --- a/engines/touche/resource.cpp +++ b/engines/touche/resource.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/touche/saveload.cpp b/engines/touche/saveload.cpp index dd29c3c387..b219001c49 100644 --- a/engines/touche/saveload.cpp +++ b/engines/touche/saveload.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/touche/staticres.cpp b/engines/touche/staticres.cpp index 8a68bbe049..4c3ea4855f 100644 --- a/engines/touche/staticres.cpp +++ b/engines/touche/staticres.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp index 69e4ac8a22..3bbb01e095 100644 --- a/engines/touche/touche.cpp +++ b/engines/touche/touche.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/touche/touche.h b/engines/touche/touche.h index 04fb42d80a..ce4f84b9a8 100644 --- a/engines/touche/touche.h +++ b/engines/touche/touche.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engines/touche/ui.cpp b/engines/touche/ui.cpp index ba4dba9037..bf2fb747ab 100644 --- a/engines/touche/ui.cpp +++ b/engines/touche/ui.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/colormasks.h b/graphics/colormasks.h index 16ebafc020..c5e463e2c2 100644 --- a/graphics/colormasks.h +++ b/graphics/colormasks.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/cursorman.cpp b/graphics/cursorman.cpp index 397d74789f..ba7c6dee9b 100644 --- a/graphics/cursorman.cpp +++ b/graphics/cursorman.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,6 +27,8 @@ #include "common/system.h" #include "common/stack.h" +DECLARE_SINGLETON(Graphics::CursorManager); + namespace Graphics { static bool g_initialized = false; diff --git a/graphics/cursorman.h b/graphics/cursorman.h index af5021e5d4..e0c6b2a4a8 100644 --- a/graphics/cursorman.h +++ b/graphics/cursorman.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/dxa_player.cpp b/graphics/dxa_player.cpp index 2af2e3b609..5edf526b8f 100644 --- a/graphics/dxa_player.cpp +++ b/graphics/dxa_player.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/dxa_player.h b/graphics/dxa_player.h index a6e751c8a3..2b9d5f1228 100644 --- a/graphics/dxa_player.h +++ b/graphics/dxa_player.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/font.cpp b/graphics/font.cpp index a06ebe26da..8fd92a9476 100644 --- a/graphics/font.cpp +++ b/graphics/font.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/font.h b/graphics/font.h index 263bedd96d..5e72e9d4b3 100644 --- a/graphics/font.h +++ b/graphics/font.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp index fad8654d02..fea29f4489 100644 --- a/graphics/fontman.cpp +++ b/graphics/fontman.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -22,6 +25,8 @@ #include "graphics/fontman.h" //#include "gui/consolefont.h" +DECLARE_SINGLETON(Graphics::FontManager); + namespace Graphics { #if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__)) diff --git a/graphics/fontman.h b/graphics/fontman.h index 443587ca7c..9911629432 100644 --- a/graphics/fontman.h +++ b/graphics/fontman.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/fonts/scummfont.cpp b/graphics/fonts/scummfont.cpp index 59c4bde84d..8975665813 100644 --- a/graphics/fonts/scummfont.cpp +++ b/graphics/fonts/scummfont.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/iff.cpp b/graphics/iff.cpp index 7ab34e2989..f9f324b1d5 100644 --- a/graphics/iff.cpp +++ b/graphics/iff.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/graphics/iff.cpp $ + * $Id:iff.cpp 26949 2007-05-26 20:23:24Z david_corrales $ */ #include "graphics/iff.h" diff --git a/graphics/iff.h b/graphics/iff.h index 322c372592..50877dbd6f 100644 --- a/graphics/iff.h +++ b/graphics/iff.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/graphics/iff.h $ + * $Id:iff.h 26949 2007-05-26 20:23:24Z david_corrales $ */ diff --git a/graphics/imagedec.cpp b/graphics/imagedec.cpp index 5d9eac3f4b..e84ca8ca0e 100644 --- a/graphics/imagedec.cpp +++ b/graphics/imagedec.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/imagedec.h b/graphics/imagedec.h index db35f0a367..997c8c0861 100644 --- a/graphics/imagedec.h +++ b/graphics/imagedec.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/imageman.cpp b/graphics/imageman.cpp index 1145dd262f..6ab64e8bca 100644 --- a/graphics/imageman.cpp +++ b/graphics/imageman.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,6 +26,8 @@ #include "graphics/imageman.h" #include "graphics/surface.h" +DECLARE_SINGLETON(Graphics::ImageManager); + namespace Graphics { ImageManager::ImageManager() : _surfaces() #ifdef USE_ZLIB diff --git a/graphics/imageman.h b/graphics/imageman.h index a5fe8f131d..ac5fae6a83 100644 --- a/graphics/imageman.h +++ b/graphics/imageman.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/mpeg_player.cpp b/graphics/mpeg_player.cpp index b1427522b0..d17d503a87 100644 --- a/graphics/mpeg_player.cpp +++ b/graphics/mpeg_player.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/mpeg_player.h b/graphics/mpeg_player.h index 40b922ad14..b0192bc8b4 100644 --- a/graphics/mpeg_player.h +++ b/graphics/mpeg_player.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/primitives.cpp b/graphics/primitives.cpp index 0b3d154fcf..3b57c1c94c 100644 --- a/graphics/primitives.cpp +++ b/graphics/primitives.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/primitives.h b/graphics/primitives.h index 6b2196384d..e062efed37 100644 --- a/graphics/primitives.h +++ b/graphics/primitives.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp index 9a42dcb324..e492a8a58b 100644 --- a/graphics/scaler.cpp +++ b/graphics/scaler.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/scaler.h b/graphics/scaler.h index 91fd290ea3..f544b7d85b 100644 --- a/graphics/scaler.h +++ b/graphics/scaler.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/scaler/2xsai.cpp b/graphics/scaler/2xsai.cpp index 54c304e320..f56d5f7e40 100644 --- a/graphics/scaler/2xsai.cpp +++ b/graphics/scaler/2xsai.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/scaler/aspect.cpp b/graphics/scaler/aspect.cpp index 575a117295..4b3f194244 100644 --- a/graphics/scaler/aspect.cpp +++ b/graphics/scaler/aspect.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/scaler/hq2x.cpp b/graphics/scaler/hq2x.cpp index 727ae207d5..6bca6d2f08 100644 --- a/graphics/scaler/hq2x.cpp +++ b/graphics/scaler/hq2x.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/scaler/hq2x.h b/graphics/scaler/hq2x.h index 5a541b660d..0a927296d8 100644 --- a/graphics/scaler/hq2x.h +++ b/graphics/scaler/hq2x.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/scaler/hq3x.cpp b/graphics/scaler/hq3x.cpp index 2d0f50bd76..31e098efd1 100644 --- a/graphics/scaler/hq3x.cpp +++ b/graphics/scaler/hq3x.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/scaler/hq3x.h b/graphics/scaler/hq3x.h index f7c9fda469..6c4f80ec25 100644 --- a/graphics/scaler/hq3x.h +++ b/graphics/scaler/hq3x.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/scaler/intern.h b/graphics/scaler/intern.h index 43356a23b9..68294d98c2 100644 --- a/graphics/scaler/intern.h +++ b/graphics/scaler/intern.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/scaler/thumbnail.cpp b/graphics/scaler/thumbnail.cpp index 998cc11dbe..a6575f3ea3 100644 --- a/graphics/scaler/thumbnail.cpp +++ b/graphics/scaler/thumbnail.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/surface.cpp b/graphics/surface.cpp index e9d52e162e..80163f7f47 100644 --- a/graphics/surface.cpp +++ b/graphics/surface.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/graphics/surface.h b/graphics/surface.h index 2fd5968727..f583e4a81f 100644 --- a/graphics/surface.h +++ b/graphics/surface.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/Actions.cpp b/gui/Actions.cpp index 53ebdfd720..6157603ab0 100644 --- a/gui/Actions.cpp +++ b/gui/Actions.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/Actions.h b/gui/Actions.h index 5f90a2f864..240f8d2295 100644 --- a/gui/Actions.h +++ b/gui/Actions.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/EditTextWidget.cpp b/gui/EditTextWidget.cpp index 98e29c49b8..71ca23afb2 100644 --- a/gui/EditTextWidget.cpp +++ b/gui/EditTextWidget.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/EditTextWidget.h b/gui/EditTextWidget.h index 1d61e7becb..7fabb52d8d 100644 --- a/gui/EditTextWidget.h +++ b/gui/EditTextWidget.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/Key.cpp b/gui/Key.cpp index d9c37f116c..3d6fe9f05b 100644 --- a/gui/Key.cpp +++ b/gui/Key.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/KeysDialog.cpp b/gui/KeysDialog.cpp index db70f0dbfb..6093af684d 100644 --- a/gui/KeysDialog.cpp +++ b/gui/KeysDialog.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -32,16 +35,13 @@ namespace GUI { enum { - kMapCmd = 'map ', - kOKCmd = 'ok ' + kMapCmd = 'map ', + kOKCmd = 'ok ' }; KeysDialog::KeysDialog(const Common::String &title) : GUI::Dialog("keysdialog") { -//tmp -// addButton(this, _w - (buttonWidth + 10), _h - buttonHeight - 8, "Choose", kChooseCmd, 0, ws); -//tmp new ButtonWidget(this, "keysdialog_map", "Map", kMapCmd, 0); new ButtonWidget(this, "keysdialog_ok", "OK", kOKCmd, 0); new ButtonWidget(this, "keysdialog_cancel", "Cancel", kCloseCmd, 0); @@ -73,23 +73,18 @@ void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { case kListSelectionChangedCmd: if (_actionsList->getSelected() >= 0) { char selection[100]; -#ifdef __SYMBIAN32__ - uint16 key = Actions::Instance()->getMapping(_actionsList->getSelected()); - - if (key != 0) { - // ScummVM mappings for F1-F9 are different from SDL so remap back to sdl - if (key >= 315 && key <= 323) { - key = key - 315 + SDLK_F1; - } - } + uint16 key = Actions::Instance()->getMapping(_actionsList->getSelected()); +#ifdef __SYMBIAN32__ + // ScummVM mappings for F1-F9 are different from SDL so remap back to sdl + if (key >= 315 && key <= 323) + key = key - 315 + SDLK_F1; +#endif if (key != 0) sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey)key)); else sprintf(selection, "Associated key : none"); -#else - sprintf(selection, "Associated key : %s", CEDevice::getKeyName(Actions::Instance()->getMapping((ActionType)(_actionsList->getSelected()))).c_str()); -#endif + _keyMapping->setLabel(selection); _keyMapping->draw(); } @@ -102,21 +97,17 @@ void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { char selection[100]; _actionSelected = _actionsList->getSelected(); -#ifdef __SYMBIAN32__ uint16 key = Actions::Instance()->getMapping(_actionSelected); - if (key != 0) { - // ScummVM mappings for F1-F9 are different from SDL so remap back to sdl - if (key >= 315 && key <= 323) { - key = key - 315 + SDLK_F1; - } - +#ifdef __SYMBIAN32__ + // ScummVM mappings for F1-F9 are different from SDL so remap back to sdl + if (key >= 315 && key <= 323) + key = key - 315 + SDLK_F1; +#endif + if (key != 0) sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey)key)); - } else sprintf(selection, "Associated key : none"); -#else - sprintf(selection, "Associated key : %s", CEDevice::getKeyName(Actions::Instance()->getMapping((ActionType)_actionSelected)).c_str()); -#endif + _actionTitle->setLabel("Press the key to associate"); _keyMapping->setLabel(selection); _keyMapping->draw(); @@ -137,29 +128,25 @@ void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { } void KeysDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers){ - if (!Actions::Instance()->mappingActive()) { + if (!Actions::Instance()->mappingActive()) Dialog::handleKeyDown(ascii,keycode,modifiers); - } } void KeysDialog::handleKeyUp(uint16 ascii, int keycode, int modifiers) { #ifdef __SYMBIAN32__ if (Actions::Instance()->mappingActive()) { #else - // GAPI key was selected - if (modifiers == 0xff && Actions::Instance()->mappingActive()) { + if (modifiers == 0xff && Actions::Instance()->mappingActive()) { // GAPI key was selected #endif char selection[100]; Actions::Instance()->setMapping((ActionType)_actionSelected, ascii); -#ifdef __SYMBIAN32__ + if (ascii != 0) sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey) keycode)); else sprintf(selection, "Associated key : none"); -#else - sprintf(selection, "Associated key : %s", CEDevice::getKeyName(Actions::Instance()->getMapping((ActionType)_actionSelected)).c_str()); -#endif + _actionTitle->setLabel("Choose an action to map"); _keyMapping->setLabel(selection); _keyMapping->draw(); @@ -167,10 +154,8 @@ void KeysDialog::handleKeyUp(uint16 ascii, int keycode, int modifiers) { _actionSelected = -1; _actionsList->setEnabled(true); Actions::Instance()->beginMapping(false); - } - else { + } else Dialog::handleKeyUp(ascii,keycode,modifiers); - } } } // namespace GUI diff --git a/gui/KeysDialog.h b/gui/KeysDialog.h index 75f49100fa..f4fa4d9419 100644 --- a/gui/KeysDialog.h +++ b/gui/KeysDialog.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/ListWidget.cpp b/gui/ListWidget.cpp index ed8cd9c38b..9d7494115b 100644 --- a/gui/ListWidget.cpp +++ b/gui/ListWidget.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/ListWidget.h b/gui/ListWidget.h index a51452e8e5..a8656061d3 100644 --- a/gui/ListWidget.h +++ b/gui/ListWidget.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/PopUpWidget.cpp b/gui/PopUpWidget.cpp index b9a13e203b..1bdce8a24e 100644 --- a/gui/PopUpWidget.cpp +++ b/gui/PopUpWidget.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/PopUpWidget.h b/gui/PopUpWidget.h index b2bdf463af..89801fc8d3 100644 --- a/gui/PopUpWidget.h +++ b/gui/PopUpWidget.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/ScrollBarWidget.cpp b/gui/ScrollBarWidget.cpp index 1875854ca0..615a05d7ac 100644 --- a/gui/ScrollBarWidget.cpp +++ b/gui/ScrollBarWidget.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/ScrollBarWidget.h b/gui/ScrollBarWidget.h index c7c7d44109..e926f1d424 100644 --- a/gui/ScrollBarWidget.h +++ b/gui/ScrollBarWidget.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/TabWidget.cpp b/gui/TabWidget.cpp index a6b4eee8fb..8159147c83 100644 --- a/gui/TabWidget.cpp +++ b/gui/TabWidget.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/TabWidget.h b/gui/TabWidget.h index 7ccf6f3d2f..bb836e0999 100644 --- a/gui/TabWidget.h +++ b/gui/TabWidget.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/ThemeClassic.cpp b/gui/ThemeClassic.cpp index eb0da48ce2..c46965c191 100644 --- a/gui/ThemeClassic.cpp +++ b/gui/ThemeClassic.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/ThemeClassic.h b/gui/ThemeClassic.h index df7ad7b2d6..97cc3ff098 100644 --- a/gui/ThemeClassic.h +++ b/gui/ThemeClassic.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/ThemeModern.cpp b/gui/ThemeModern.cpp index 80edc9702d..a5b6e682cb 100644 --- a/gui/ThemeModern.cpp +++ b/gui/ThemeModern.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/ThemeModern.h b/gui/ThemeModern.h index b83bec9425..ed5e29fdfc 100644 --- a/gui/ThemeModern.h +++ b/gui/ThemeModern.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/about.cpp b/gui/about.cpp index 1014eefd39..2098d91aae 100644 --- a/gui/about.cpp +++ b/gui/about.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/about.h b/gui/about.h index 23c130905f..a1ee96b090 100644 --- a/gui/about.h +++ b/gui/about.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/browser.cpp b/gui/browser.cpp index 2d27e1f1ee..b9cae7d923 100644 --- a/gui/browser.cpp +++ b/gui/browser.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/browser.h b/gui/browser.h index 66400bfc07..d330e32269 100644 --- a/gui/browser.h +++ b/gui/browser.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/chooser.cpp b/gui/chooser.cpp index aa3dc8f5ca..a189e3b07b 100644 --- a/gui/chooser.cpp +++ b/gui/chooser.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/chooser.h b/gui/chooser.h index cb2e5b63c6..ef36d1e59a 100644 --- a/gui/chooser.h +++ b/gui/chooser.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/console.cpp b/gui/console.cpp index 494721e242..9186c7b405 100644 --- a/gui/console.cpp +++ b/gui/console.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/console.h b/gui/console.h index 587be82f04..ea28e5b449 100644 --- a/gui/console.h +++ b/gui/console.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/debugger.cpp b/gui/debugger.cpp index 38a2ef7d15..11d5d28e59 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/debugger.h b/gui/debugger.h index 34665cf645..da0253c148 100644 --- a/gui/debugger.h +++ b/gui/debugger.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/dialog.cpp b/gui/dialog.cpp index c0c8d50430..3bcf770ff3 100644 --- a/gui/dialog.cpp +++ b/gui/dialog.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/dialog.h b/gui/dialog.h index 098cf88278..1c97b4b185 100644 --- a/gui/dialog.h +++ b/gui/dialog.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/editable.cpp b/gui/editable.cpp index b1d08c7fad..6199ea67fa 100644 --- a/gui/editable.cpp +++ b/gui/editable.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/editable.h b/gui/editable.h index 520c4cf689..a56b079662 100644 --- a/gui/editable.h +++ b/gui/editable.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/eval.cpp b/gui/eval.cpp index 773770b5be..89577cc51d 100644 --- a/gui/eval.cpp +++ b/gui/eval.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/eval.h b/gui/eval.h index 7db048809b..d63caae291 100644 --- a/gui/eval.h +++ b/gui/eval.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/launcher.cpp b/gui/launcher.cpp index 8ba3f0f538..eba5498318 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/launcher.h b/gui/launcher.h index 0ea7c5995c..5ccf9cb422 100644 --- a/gui/launcher.h +++ b/gui/launcher.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/massadd.cpp b/gui/massadd.cpp index e3f0e63e6e..de54cada26 100644 --- a/gui/massadd.cpp +++ b/gui/massadd.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/massadd.h b/gui/massadd.h index 7fd2d2f10d..5723f5a6f8 100644 --- a/gui/massadd.h +++ b/gui/massadd.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/message.cpp b/gui/message.cpp index 2453c9506b..114d4f38c5 100644 --- a/gui/message.cpp +++ b/gui/message.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/message.h b/gui/message.h index 53afa67387..912e3b0785 100644 --- a/gui/message.h +++ b/gui/message.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/newgui.cpp b/gui/newgui.cpp index bd7315add5..eefb3e2f64 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -32,6 +35,8 @@ #include "common/config-manager.h" +DECLARE_SINGLETON(GUI::NewGui); + namespace GUI { /* @@ -307,6 +312,8 @@ void NewGui::runLoop() { case Common::EVENT_SCREEN_CHANGED: screenChange(); break; + default: + break; } } diff --git a/gui/newgui.h b/gui/newgui.h index 70658abcb4..6a2920048f 100644 --- a/gui/newgui.h +++ b/gui/newgui.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/object.cpp b/gui/object.cpp index ec3167c9a3..28caf6c380 100644 --- a/gui/object.cpp +++ b/gui/object.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/object.h b/gui/object.h index bc87ad65ec..7a8d626db5 100644 --- a/gui/object.h +++ b/gui/object.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/options.cpp b/gui/options.cpp index c010587300..76a40f5f50 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/options.h b/gui/options.h index 67b4a40ebd..8743528f12 100644 --- a/gui/options.h +++ b/gui/options.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp index 72e71a0414..55a9ca9600 100644 --- a/gui/theme-config.cpp +++ b/gui/theme-config.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006-2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/theme.cpp b/gui/theme.cpp index 446f746cf3..6aef7d1e37 100644 --- a/gui/theme.cpp +++ b/gui/theme.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/theme.h b/gui/theme.h index b8055819d5..e64b65645c 100644 --- a/gui/theme.h +++ b/gui/theme.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/themebrowser.cpp b/gui/themebrowser.cpp index 515c6d83f7..8f72127a75 100644 --- a/gui/themebrowser.cpp +++ b/gui/themebrowser.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/themebrowser.h b/gui/themebrowser.h index ce38bead9d..9351648d24 100644 --- a/gui/themebrowser.h +++ b/gui/themebrowser.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/widget.cpp b/gui/widget.cpp index dcf9156165..bb4b0b87ed 100644 --- a/gui/widget.cpp +++ b/gui/widget.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/gui/widget.h b/gui/widget.h index 4ff8ad5409..bf15081f79 100644 --- a/gui/widget.h +++ b/gui/widget.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2002-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/icons/scummvm.svg b/icons/scummvm.svg new file mode 100644 index 0000000000..f51744b30b --- /dev/null +++ b/icons/scummvm.svg @@ -0,0 +1,721 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+ <!ENTITY ns_svg "http://www.w3.org/2000/svg">
+ <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+]>
+<svg version="1.1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ width="256" height="256" viewBox="9 26.1103516 256 256" enable-background="new 9 26.1103516 256 256" xml:space="preserve">
+<defs>
+</defs>
+<g id="Shadow_1_" opacity="0.4">
+
+ <image width="280" height="314" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAARgAAAE6CAYAAADN6k2xAAAACXBIWXMAAAsSAAALEgHS3X78AAAA +BGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAB7PSURB +VHja7J2Hdhu5skUhUjnLsmWPPcHz3v//0r3z7kQnZYlKFC/xXLW6WESTkpjQ3fushUUlezzs1u5z +CgUgBIQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQQgghhBBC +CCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQQgghhGalJd4ClPG91uNtAzAIjbqflkpenwKWXgI0QAfA +oIbdO0sjXnW03Oej4KLj0X3eGwMfBGBQTYCSGq3E53G0zWiNgIwFS9eNRzNS8MHhABhU0ftDX1sO +HCmAtM3X4utyf6z0x6qMMsh4uNyZcd8fDzK65rXroFPmchCAQZmCRWFggeGHBciqfK0tr/HzdRlr +BjL2v2GBoHC57Y9Of9zIuDVfvzXguX8CcHA3AAZlcj+k4o2FyJqBxZr5PI4NA5EV+XNr5nvrzsV4 +WfcSoXItkLHj2r1aAHmn4yMVtRsAgzIAi3UmCpEIiM3+2O6PLRmb8vUN832FTwpK6/K1cYC5N+C4 +lleFypWMS/OqH3ccbCxw9O8GNnPUMm8BYHFgWTFA2BSQ7MjYNWNHvrdhfnbduBQfk6yraYXyIu+j +AOHORKK7BGQULBf9cS7jQr53XRKvHlycsrABNDgYNAewbIhLiRDZd2NPxq78zKYBypqrwdhC7ySz +SA8J4GhcukoA5iLhbi7Nn7kJg4XjVN0G2OBg0JTBovEnAuSgPw7NOBDAqJPZNvWWFeNMLERSU9Yv +6YN5TADnzrkaH5UuDWzOEg5H49Stq91Y2OBqcDDoBXBRCKyEovi6I2B5JUB5I+O1fG1PfmYzDBZy +lx1QUhCZtJO3l4COdTb3AombRIxSd3PmhnU7vnZjazZls1EIwCB3jTWqrBrHsiPORMFy5OByIHFo +y0ShFQeWpRFQmfRe642ATsrZ3DvgdEaA5tSMszBYKPYzUoAGwKARrkXjkAXLgXErR+b10LgWjUIK +FnU/SyVxZx73U5m7eUy4G1uz8a4mguWkP45lnAhotIZzHQZnpGxhmDoNgOHamkikcWhbHEuEydv+ +eCevRy4OaQF3LQxOKz/FqcxTvTG1Gw8bG6EujJM5dqBRZ3MeigKxBY2NT4AGwDTyutpIpHWWQwHK ++/74sT9+MHApA0s7M6i8xN3YNU22QKwFYY1J6mi+mXFiIlQn4WgAzQi1eQtqC5dl41oOBCw/9cev +/fE/Mn4W2LwRZ2Nnh3wBdynk/0AqW3ypoLTNf9qzo7Nnts9nJwxOw68lYmJV3hMAg6YOlxXjWl6L +U/nZwOWjOJi3Eos8WPysUJUjYmqhpoWNbypU2NgpedtQaNdTtUgFAKaJcFmXX47oTD70xy8lrmXP +RaI6gOWpzsY2AK6EwUZDhY0Cxw6dUVsZEx8BDYCpLVx2BSA/ukgUI9I7cS07oZghatcULM+FjY9Q +Za5GHc2oKXtAA2AaA5dfBS5vpR6zLT+7nHgKN+29sxHKuxrbM2RBo/UZ33S4XALqXlNhA2DqCZcP +UmdRuETYxNmiffnFsOuFKFSmXU3bQEMdjY9Pm2ash8HZN95XAFNruPyvgYvWW2wk4hfgabCxM1B2 +64ky2NiOZ+tkeon/DoBBlYXLR/ncwmUF1/Ii0Gjs0Ui5alyNLQbbPXK8SwwloAEwKEu4LIdiKlpr +Lim47IbhjZ6Ay2Sg8TNP6l5SkEk5mcY05gGYat7s2kRn4WILuim4AJbp12lSNZqNRF3GzjSFBGhq +G5kATPVu8LbctPFp+VpgYuHyI3CZe41m2dVoFDR2n2K7m19oiosBMNW6sTX/x6djnG6OHbq/JOCy +B1wWAhofnexm52uJukzZoXIABi2k7qJLACJAYk/Lz2Gwie4opAu6aL41Gu9o1sPwfsW+JgNgUBZ1 +F50x0oWLvwpoInD2DVzawCWL6GQ7g9cScanWoAEw1ay7vDd1lxiR3klk0ia6VkgvxEPzdzR+YaXf +HN0+CGq3cx6bfucvOyW9F4pZo+hgPhCLKuFmRq11ss153nXeh8H9ZgAMmnrdxbqXuGHUDwKYH41z +2Qp06OZ8DT1o/J40ayOuX6UhA2DyfgK25MbbCsWmUR8MXHQvlzXgkvW1DOb6WDdTdiCdv4aVhQyA +yT8aaWFXN476IHCJbmYnFKuiiUb5QyblZvwOeWWqJGQATL7uxUajVwKVCBe7WZStu6DquZmyURvI +AJg8b0LN6bEAuG+i0ftQ7OmidRcWL1bXzaw8ESyVhQyAydu96J667wQuqboL0ai61/mpYPELJB+q +AhkAk9+N5wu7RwKXH8LgGiPqLvW53isjwGIB0wuDvTIhd8gAmPyeanoCo05L6wFperTIpotGqL6Q +8edx+7OYurlDBsDkeaNp7eV1KE5e1LoL0agZkLFw0ZMpdTwkIANg0LPcyysBy5F8TDRqFmTsqZSx +sBtPlLyRceecTLb1GACTp3vZE/fyRl5tNGIRY/3vA+1/UsBEoOiZ2np87UOowNG1ACZf9/JGhp01 +Wg5MSTfpYdMT56pnaXfMuAvFGdnZ1mMATP7uRU9fZCFjM+8JXeTqIXPjnEyW9RgAg3tBed4XIRQ7 +GG6FotB7I1HpysQlbb57zM3FABjcC8ofMvrwuRfARLhcyrg2TkZnnLIRG07lA5c4DR0b6uIGUh/D +9xXTr42DYROp5jpc3/X7aGCjcUmnr6nBoNKcfYh7QQn5+yRC5aI/TmWci6uJTqZrohIOBrgMnRCA +e0GpqGQ/1oLurYDlKhGVsiEjWtx7b/d7wb2gcQ8krcfEou++3DOH8rHv8gYwDc/Vuqhx09wsr8XN +sEsdKoOMPpS25b55Ja9+thHA4F7+HzDbBjC6JICjR9C4aK3nku/J2A4ZLiUBMIt9EulNciBw2Qts +4I3G3z9tA5ltGVvGwWSzCRmAWUw88llaba51L9Re0Kh4recs2XOws3O9AGZx8Whd3IsFjLqXZa4N +egJk7PG0q7m5FwCzuBtDi7t7AheNR34zKRwMGueE/cjqvgEwi3Evq4l45I8gQegpkHnOqQQApuY3 +hC/u+njE1DSaBDRZPlHRfC3tWol72QjsVoeeL7shOIAhHlHcRVMHSy9X0HAzz8+9+G0ZKO6iSeHS +TYysIANg5vc+23i0FyjuosngYk8buA3Dpw30crnx0XwcjF9DchDo3EWTwSWCxW6haffoxcE0CC66 +9aGdPdoz7oXOXfQcyNiTBnRnO90PJisXA2DmAxkFjNZfdHAUCXqJg1H3EqESN57SDaduQmbnVgOY +2cNFi7s6e7QXBqemiUfoOXDRg9h0V7uzMLyjHRGpgfFIi7sHodi/Q4u7wAU9Nx5dC1gUMNdh8MRH +ANMAlfW+aHE3ux3IUNZwsZt9q3s5lY87oSjyBiJSM9zLuN4XW9zFwaCnxKM7iUMRLicCmMtQ1F/o +g2mQe6H3BU0zGmntJUai4/74ZgCT3YkCAGb2DobeFzRN93IrMInO5asBzHUoTnfEwTQELvS+oGkB +Rmsv1xKNIly+CGDOw+D0dHY2Hs0GMvS+oGm5lwfjXo4FLl/EyWg8yq7+AmBmBxd6X9A83Ev8vOPi +EQ6mQfGI3hc0K/dynLt7ATCze0/pfUGzdC9f5fPrnN0LgJmNe6H3BeFeAMzM3k96XxDuBcDMzMHQ ++4JwLwBmJnCh9wXhXgDMzCBD7wvCvQCYmcCF3heEewEwM49H9L4g3AuAmfr7SO8Lwr0AmJm4F3pf +EO4FwMzsPaT3BU0KGLsV5mkd3AuAmZ6DofcFTRqNojOJ2y7oZlKfZVTWvQCY6cCF3hc0aTTSzaTi +VpgnApZP4l5Oq+peAMx0IEPvC5o0GulWmKcSi/4RwHyrsnsBMJPDhd4XNC33ciFAiXD5W1zMSSiO +I6mcewEw04tH9L6glwDmMRSnBGg0+lsg802gcxOKw9QATAPdS3Qqu+H7zNGhAQy9L2ice3lIuJd/ +JCadhsGzjnpV/B/l5n+5e1kWiGyLczk0gKH3BY0DjNZebFPdZxON/FGwAKZB8p270b28kVd6X9BT +otFDKM44iu7lUygKu+fyvSxPCgAws3cv8X3TmaPoWF6Lezkw8Yj6CyqLRqlp6c9huKmu0u4FwEzm +XlZD0VinSwNiLWYj0PuCxkcjPy1tC7uVnZYGMJM7GF/cPQiDCxuZmkZPcS+1nJYGMJPHIz81/Uog +g3tB4wBT+2lpADNd96LRSKemVwPFXVTuXvxq6U+hZtPSAGYy95Kamn4diqnp1cDUNCp3LzpzpNPS +n0JxBGwtpqUBzGTvFVPT6CVwCSYead/LNxnHJhpVfloawLzcvTA1jSaBjJ09upBIdCpx6SYMrpbu +1eV/HMA8z70wNY0mjUh3ApmOgOXWOJdeHX9x0HgHw9Q0moUrXgo1r9kBmKfdCExNo2ncS3Zzsm0Z +8Z7S+l3tHlLLXPcn3RSjVk0zNY2eA5etUNTw4iSB1mF0BulRXmuhNtf+SdFoUxzLD/3xi4wPApot ++Rl2rkNl95HVYyjqMREqWoe5k6/VpgcGwIyPj3pawK48bX7qj4/98XN/vJO4xMZS6CWw0ca7ewHM +rXxcK8gQkcpvBN9Yp30vbwJT0+hlblgfWDuh6InRcSNfs528XQMjAFPjeLRnMvOhfE5xF73EFdt6 +3pGApWPGrXMxla7HAJjnu5dXuBc0QTyyxV7ti7kRF3NlIGMb7yrbIwNgnudeXof0cbAIPRcy+vC6 +N4C5NJC5C8WsUq+qUYki72i4xFrL+/B91uhjf/wokFEH0wpMT6OXOeQl53714PvUzFJllw/gYHAv +aDGy9Zg9gUp0LxcyrsLwGqXKRSUAM/xkofaC5hWVdAHtlrjljsSkC3mtfFQiIg0+Uew04pFEoo8S +kWLfy748cZZxMGhKDzQLnJ6JSjd1iEoAJh2NbNfux0DtBc3WyfgGvG4oZpcUMvfGyRCRKupgdEOp +mIkPA7UXNL+Hm49KFyYqXYfBbR0q0+mLgyku8LLEn/0R7kW3ZcC9oFlHpW5JVKqUiwEwg0+QbYHJ +BwHMzwIbrb3gYNA8o5JdEKnLCeysEoCpCFxWJBpFkLwVsETA/CTA2cG9oDnDJoTBbTb9UoJKQKbp +gLEzR969/CLuJU5PbwZmjtD8o5KdUeqEohZTmYJvu+EXVGsvOnP0LgzWXo7EvdD7gubtXjQm6YzS +bSjfxzdbJ9NkwKh70WNIdL+XXwUw7wU6zB6hRbkZ7Yux09YKmftQgWNO2g2+gKk1Rx8FMD8JcHZx +L2iBLsZGpQfjYnTYvWOydDFNBYzfre4oFLvVae0lQoeZI5RLXFIXE8Fit3XI2sW0G3rhytxLHD+K +e9GuXWaO0KJdjEYlBYzd1iHrgm+roRdv1Ippe840G3mjRd+nqeOKK3MeequBF40V06hK96vugKcP +w0odm9NEwLDfC6raA7Hs4L/oarJe3d9q4MXCvaCqPhR1s3A9G31foLMWMj0VstXQC4V7QVWS1mLs +yZAKmOhi1nONSU0BDO4FVf3e1QW5thbzquTBmM2922rQBbLFsn3cC6qoi9EZpX0DGBuTWrn9o5t2 +cfQA+yMZuBdUtYekFnsPQjGblOURxq0GXZi1UOwYFsHyNgz2E+BeUO73st1aZEcgo3UY7Tpvm58H +MHO4KO1QVOD3JRa9E8Ac4l5QBe9njfq7ApndMNgcms3vdavmF0MviBL/UODyg7iYA3E1q7gXVKH7 +WR+YOwYwWU5X1x0wtvKu0egHgcxhKPZ6ybKHAKESyNjZUHUxtg6Dg5nzhbDu5Z3EpH2XW4ELqlpM +2hCw7MirX/2/8Hu6VdMLYK2kbao7ctEI94KqeG/bWdEtgYs6mKwemHV1MPYYkl1xL29DUdjdDZzQ +iKod/ZdN/N8W0PhCLw5mhu7FT0sfheGmOqIRqjJktNi7JWMjDM6I4mBmlE9T09K+sMu0NKp6TFqR +e3nTDO9gFnp/t2r4xtuOXaalUV2l276uyv2+Ka9ZbZRWF8CkCrt6iBrT0qjOLkZrMWsy7AZU1GCm +/P9i3ctr516YlkZ1g0zLPFRXZawEirwzcy/afGTXG2k02sa9oBoCZpyDoQYzhTfaF3Ztx+5rcTTr +gWlpVD/I6L2/Lvd/VnWYVg3e4FGF3beBUwJQPcFiI9KqA4yPSQu751s1eJPHFXbVvRCNUF0djAJm +HQcz/X8/hV2EiykKvdm4lyoDxr6xdo/dIwEMhV3UJMi0E4PFjlMgt91j902gsIuaC5nUyCJi1CEa +KVzem2hEYRc1FTRZ/aJW1RLaaPRO4OLdC9EIIQDzLMCkZo3ey7DT0hR2EQIwz3YvqVkjdS/2CBLc +C0IA5tnRKOVeYv3lTaCwixCAmeDf6t3LWwMXW9gFLggBmGe7F7+YUXtefDQCMAgBmCcDhsWMCAGY +mbqX1OFpLGZECMBMBJhxh6fR84IQgHmxe7Gn2OnxIxyehhCAmYp7sdPSOnPE4WkIAZipuhddLa2z +RhR2EQIwU3EvevTrG3mlsIsQgJmqe3kjw/a8cHgaQgBmqu7FHv1KNELou3pmABjcC0JTB0svN9Dk +CBh7qHd0K4e4F4RGwqWbGFlAJifApNzLAe4FoZFweRSg3PfHnbx25esLh0xuDsavmMa9IDQaMl0B +y40Zd8bF4GDC4EbetrHuUODCCQEIlbsXBUxHXrNxMTk5GH8MiQJGm+pYEoBQ2sHcO8DgYEocjMYj +BcyBRKO4JGAV94LQAFyiQ3kQoNzKuJOvUYMxcAlhcM+XHQHMnnys5+1Se0FoEDC2wJsq8uJgwuAh +3psSifbklSUBCA3D5akOBsCEwS0xtwxgdsJw7QXIIDRc4L0OmdVfcopIdnpaAbMbiu0Y6HtBaNi9 +3ItruTbjLtAHMwAXCxh1MDvySjxCKA0ZBUycObqS0RHgPOBgyh3MphnqXlo4GIQG4KLxyAPGOxgA +E4oGu+hWNmTozBG1F4SGIaPF3RiLLg1g7nOBS04RqW0cjAJmLTA1jZAHi509ujHu5Uo+fwgsdhyC +jE5Re8BwiBpCw5Dx8ehSnExW9ZdFA8YWeNsmHm3K62qg/oKQh8tjSTxKzSA1PiKlHIwOZo8QGh+P +LmXYRY44mBIXEx3Liry2cS8IjYxHESwX8uoLvDiYBGxaZgAVhIYdTHQvtwKV8/44Mw5Glwhko1Zm +b+CjGT3uKYQG4KILGzviXM4EMlcCnWxmj3IBjN8450HeQJ1qewwZ7pSO0ILj0bVxL+dhuMCLgyl5 +47Lc9g+hTNy9biyl7uVUPtb6S9f8fOMBk9r2ryM01pbnbDbOQSiDeHQncSjC5UQAY+svnIv0BAfT +CcWirazm9BFa4O+H1l5iJDruj28GMLc5xqMcAGPp/JAATFbrKhBa4O+HzhxF5/LVAOY6ZDg9nZuD +0Xx5ZwDjG4eADGoiYPR341qiUYTLFwHMech0ejpHwKiDuQ5F67N984AMaqJ7sX0vxwKXL+JkNB49 +5Pr7kdM0tb6Rtv3Z7m8BXBDupXAvZyHD7Rmq4GAu5c07C+kWaISa7l6Oq+BecgFMSLyZOg13Jo7G +uhggg5rsXr7K59dVePDmAhjthdGIdCqUjsN3KgIYhHupgHvJKSJ5Yp8aYsc39CIMF3wRwr1k/rvQ +zuTfseSgpycMxI2n9HQBPR/JHmHCimtUR/eiTXWxTPB3f/yfjD/C9wLvpTh6APMCyKQ2AVfA6CkD +bASO6goYLRVE1/5ZoBLh8p/++EfcvV0akLXamf677FEmqZ3u2EoT1T0aHRv38lt//Fk195IjYJYS +kFkR57IeBk8baBOVUM3g0hV3ci7u5XeBy+/iXs6q5F5ydTC9EiezlnAxbRetEKoiXBQwOmsUi7l/ +CVyse7mqknvJOSJZ0Oim4NbJrBGVUE2j0Ym4lRiN/i3u5ZNxL5Vq1cgRMClQ2HqMhYwezAZkUJXd +S4w8HYFIjEb/Ebj8Jk7mOFRoaroqDsZeAAuZFeNgOIEAVd256BKZWHeJvS5/GLj8IV+7CBkeqlYH +wAT3hvrjTRQwyzgZVEHnYqekvwpQfktEo06oaJNpzoBZKnEywcCkbQDTBjKoYnCJBdtY1I0F3FjI +jXWXf8nr3xKNrkw0qpyWK+Bc7F6kbTNGgYTiL8o9Gmm3rtZdfEOdwqXSC32XK3AxQhjcMtD3vqSc +znooCsAByKAM4WLrLn9JJPpdnIs21N2Giu8isFyhi6LFsJBwJr2SsWJiIJBBOd3HES5fBSgeLrVZ +3Nuu4EXS/KrDXoDU8bOjHA9Ci3IuX6Xu8lv4XtS1a410k7XK73/UrujFspCxp0D6QhiQQVWAiy/q +Vqpbt26A8ZB5cCPlalKAATJoHvdoqtfFwuU3qcHUpu5SB8CkLqAee3IXBo87WSqBTMDNoDncm2XO +5V+hWGf0NRQnNNZqa9h2DS6krkJVwNw6yDwa0ATcDJqju34qXGq7Y2O7JhfUQ0ZBc29Ak1okhptB +07wPQxg8a123vEzFoj/l63p4Wi1PzmjX6OI+mpqMdTO3idjUS0BlCdCgKdZbYrE2Fm1ju/8fCbh8 +rTtc6gSYFGTuHGQUNA9j3AwzTWiSSNSRyBOLttrj8u9QzBb95WJRrc/8atf4YusFV7jcyFA3o3nX +HkubggqgQc+JRHamSNcWaZ+L7dKtPVzqCBjvZnxcujEjVQwmNqGXRqIIjdOSSKRbXh4buDTiCJ52 +A24CG5ksZDoybhKQ6Y2ISoAGsDwnEkXYfBb4XIWiz6UR53u1G3JD+OKvBUzHRCffqFdWEAY2za61 +6KmLERg6S/RXKLa51Eik9ZZzuc8adwRyu6E3x72BzLWBzK2r0Yx60hCfmhmHtNYSXcuJRKI/HVxS +kejePbgCgKlnXcbWZmwBuPMEV/PogDMOPKhecUinn0/C4DYLtt7yZyISPbj4HQBM80CjkLmSJ5SO +mxJX0x0ToQBN9cHyaGL1VSg6cv8JRSFXh91uobGRCMAMug/fN2Nj05XY26sRMaqbsL24mmrfE77O +okXcY3EmfyZqLX9IVDppeiQCMKPdjL2pLGTssMC5D4M9NU95WgGbajxsOqbO8iUUM0Q2DmmtJbqW +M7kvGh2JuNnT74EOfzRKPKp2uz92+2NfxkF/vDIjfr7XHzv9sdUfm6E4t0k3I2+bv9++77z/i3cr +Pi4rXC4FGscSiz6LS/kkH3+TOsulidHdpkciAPMy0KwLOLYFJHsjQLMvP7cVimNuV8PghuVsgrVY +qJQtK+mYWsuJgOWLjM/yeizfu5CfV8fSDenWBgCDxoLGu5otgch+CWz2javZlD9jz9QuO2aFIvFs +oBJMPaTraiw3Jg5fiCs5dnD5Jl87lZ/RKFRWh0PcxM8GjYWNdTVbJa7mQECz6+LTRhg8W3sUbHA3 +kzsVv4ezuhWdctYW/zNxJscCFB0n8j3rWHwcCsAFwEz6HlnQ6IFvGn+sq9kz9Rp1MjosbDbC4Bnb +K65mkzpEDuCMdim+rmK3VPWzhBcCDnUsxyb+nMo4FwB1jGN5COWd3gjATAU0o1zNhnE1OwKVvRGg +sRHKAse7m6URwGnCteyNcCqPibqKXX/WcTHoXABy4sCiTuUyFD1QgAXAZOVqtFZj6zVbBja7pj6z +E4qC8Lb52NZsfJRql0SpuizO7D0x9ligeKhYt2KhcmbGqRlnoWhB8G4FsACY7FyNhc2qcTYbBiQW +LDsOQDZG2Si1OiJKjavfLGVwH/ReEHd87PFQ8dtxdMaA5Uy+diFDoaJuxUIFsACYbF3NkoHAsqnZ +rJk4tBEGC8UWMBZEm2ZY2JS5m1ZJrFoa8W+e5f3QK3kNCZg8jgGK361QZ4F02KbICwOUcwMU61Ss +W+mGp603QwAmC9AEBxs/7b2SqN1sl8SmbRO3/NT3KOCkYlUIw7NkZRCaBlw8PHoldZSuGymgpJZ0 +2GUdl4mPL8PwItYyqAAWAFN52Pgo5Zv6rLvRYQHjIbMZhovEKwY6GqtaCbCMgtC04OLh8ZgAT+ps +K7sQVZ1KCi4KE+tkOmF490J7OF/XQQ+oAJjavNdLJXWbtnM3PlJtGvBsuOF7bOyfW5e/z0coWyfy +EJoWYDw8/H7I9siZ1JamdhbIb6lxbV5TW6H6Qq2FSgAsAKYp7mYccJYdcNZK6jnr7nsbLkq13d/v +/w4LoWkoBQ/bqGYB43cavA3DxdsUfPwmYQ/OKT0CFQDDdSh3N0sJ4KTAY+OQj1trIwCzXgKhaQLm +zkGiDDC3DiL3LjalQPKQiF5lsz9ABcCgkJ7dWUrUcHwNpT0CPu3En1spgdCks0rWJaTgcR+Gdwns +joBIN1HDeSwBCi4FwKApAWfpGfBJFXjLIDSNQq8v8N4lajBlTXPjINIDKAAGzS9SjavppJrvcplF +CmH0VPYoiAAUAIMWdC3HNdHl0gcTSgBS9n0EYFBFrnEunbyABMAg7oOpgQYhhBBCCCGEEEIIIYQQ +QgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEII +IYQQQgghhBBCCCGEJtR/BRgACjQLvCISp+EAAAAASUVORK5CYII=">
+ </image>
+</g>
+<path d="M233.421875,171.4472656c-0.4414063-3.0947266-1.1308594-6.1865234-2.0683594-9.1689453
+ c-1.7060547-5.421875-4.09375-10.652832-7.0449219-15.512207c-1.8759766-3.0849609-3.8046875-6.1430664-5.8847656-9.0996094
+ c-1.9257813-2.7416992-3.8925781-5.1850586-6.1435547-7.6235352c-0.7138672-0.7749023-1.8710938-1.6728516-2.1542969-2.7353516
+ c-0.3251953-1.2236328,0.5878906-2.2568359,1.1484375-3.2504883c0.6943359-1.2358398,1.3349609-2.4975586,2.0683594-3.7133789
+ c1.2460938-2.065918,2.4853516-4.1367188,3.6865234-6.2280273c4.1494141-7.2114258,7.9970703-14.6118164,11.5693359-22.1225586
+ c2.1269531-4.46875,3.9970703-8.8510742,3.4931641-13.9296875c-0.2216797-2.2412109-1.2412109-4.3505859-2.4912109-6.1860352
+ c-4.6347656-6.7973633-11.0078125-13.0581055-17.7412109-17.7573242
+ c-4.8847656-3.4086914-10.1220703-6.2998047-15.5097656-8.8369141c-10.6894531-5.03125-22.0439453-8.7753906-33.5859375-11.277832
+ c-5.8876953-1.2768555-11.9160156-2.2983398-17.9541016-2.4536133c-18.7983398-0.4824219-40.0610352,1.8276367-57.1088867,10.090332
+ C82.121582,44.3447266,76.65625,47.7363281,71.8500977,51.6464844
+ c-8.6958008,7.0761719-16.1352539,16.4443359-21.5927734,26.2138672c-2.2138672,3.9658203-4.0727539,8.3603516-5.2939453,12.7348633
+ c-1.9287109,6.9160156-2.3505859,14.0581055-2.1762695,21.2050781c0.0249023,1.0561523,0.0708008,2.1098633,0.137207,3.1621094
+ c0.4023438,6.5146484,1.5717773,12.9833984,3.5244141,19.2114258c0.9702148,3.1025391,2.1347656,6.1420898,3.4873047,9.097168
+ c2.8476563,6.2250977,6.6635742,11.7143555,10.3574219,17.4418945c1.2104492,1.8769531,0.5332031,2.4560547-0.4633789,4.2041016
+ c-0.6845703,1.1992188-1.3671875,2.3994141-2.0576172,3.5927734c-1.3828125,2.390625-2.7739258,4.7744141-4.1455078,7.1728516
+ c-2.5556641,4.4628906-4.8671875,9.0585938-7.402832,13.53125c-3.2124023,5.6591797-6.7294922,11.2822266-8.3071289,17.6572266
+ c-0.7807617,3.1611328-0.9516602,6.46875-0.2275391,9.6806641c1.512207,6.7001953,5.6782227,12.4042969,10.3193359,17.3291016
+ c2.5888672,2.7509766,5.8950195,4.7880859,8.9228516,7.0107422c12.5400391,9.1962891,28.3925781,14.5644531,43.2666016,18.6210938
+ c15.0751953,4.1123047,31.0375977,5.5341797,46.6416016,4.5488281c30.6806641-1.9345703,63.5322266-13.359375,78.4365234-41.9150391
+ c2.8027344-5.3740234,5.0166016-11.3720703,6.5380859-17.2333984
+ C234.6025391,194.1484375,234.9824219,182.4375,233.421875,171.4472656z"/>
+<g id="S_1_">
+
+ <image width="239" height="275" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAO8AAAETCAYAAADeV1FvAAAACXBIWXMAAAsSAAALEgHS3X78AAAA +BGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAF/pSURB +VHja7L1psG3bVR42xtrnNWoAO3SOK1Wp5I+pxE5shIloLXosJBrTmqZMQCAMkQCBEHpCEgIDQgIk +gYBAwMIUyGCBiGhkMMIImUaC2A4pJ1SSP6mKqTJllwgG9N67d685stacY8z5jTHnPvfep/eezj53 +zqeltc8+++6zm/XNb7TfIJprrrnmmmuuueaaa6655pprrrnmmmuuueaaa6655pprrrnmmmuuueaa +a6655pprrrnmmmuuueaaa6655pprrrnmmmuuueaaa6655pprrrnmmmuuueaaa6655pprrrnmmmuu +ueaaa6655pprrrnmmmuuueaaa6655pprrrnmmmuuueaaa6655pprrrnmmmuuueaaa6655pprrrnm +mmuuueaaa6655prrqiyeH8HVXr/30LcKSbkt8IVJfYTUn0Sk+637qvP/wlfOTB96/0vmdTDBO9e7 +BVLFnQT8sYzgaIjesd1AK0PgImh5x6v7+oWl2wSE0nZet58SffiTXzGvkwneuXD9rrKqgZMFoceA +WOBZh2xRtvUArrhm/IINvmyE2/G4KIDL3yjgLc+c8s/7C7W/81Hv/ep57Uzw3p2A3QHCBjRp0CEZ +M2d5POJZgSRJASaBhcOXzKzwVRDr/7EotYPZXc47eFMDdAawwIaxA/u43d4OXulj3vfH5rU0wXsd +TeJvUYIsXmu7TZU5SdD0PeG2OiIuINoBlnYgSTppNlfQKoCrCS3oAQs1u123A3tOQbPafp8KcLcj +A3kDcGZmLrvMx73/6+e1NcF7/iybL3YBk1Q8aDOrOZM5Orl8ArzFtE2ZIZOy4wj5O8MqeIWdB+wf +OvCj622pr6sy/m5WG3iNmRW8tFA9f9wHTCBP8J4JYDMw9VrnypBg5mbMpnp/MVHlErpl57t68Jpv +moLPKr23K8q6iq/xnxNvxjurAPzs/H42tk2rM6kreJk6EE8gT/BeyfWOB18mZhZTNIt301YQbGru +6oXvzdPwBTFXADbgcX1uMdbNkWEAXMCjgZWTKJAj88rQ0RYa/V7AmkiNnXFHAAAzewBPIE/wXhHQ +fnM1jRtpNfMygysV0ziDVeCcfUYMDNnFH2LE29W/AHC5bhCU2U8QQB3IAMD1dUoA7y0d7HCpBJO6 +y23BjsHkwbzgbck/y3b+hA/86XktTvA+TqB9aGPaZAxE1RwmNJMF/NK0g3XNwE3pGICbOlO35WML +WBeDrTAAz5vcPXiBCO35k1Rz/jRm5cQlYoUe8Oe7J5HxFQZA3t+XGHi5gFeW7X0cEn3yX3rjvCYn +eB8rn/ZlxadNLRDlzeEGqBxISgbYNYN33YGbwQu+avApsRqqAjaTFudccEm5hgASnaiuEk+G1X+9 +zFweettcTXio8rjNDYBqaqpj5QzklKPUsmyfz2H7TO5L9MwP+KV5bU7wPorAVRO5uLHFVE2VWVdg +0ebTNuAeK4Dt3PxdcgDOIMnX99KucSmA5YRm78BkBbObT7ir7Xen2Jd70FmqiZcewLfaA3h8X85b +65vLboVGzLOVcnPNcYL9vf6dv/7P5nU6wfvI2XY3N0UC21ZTuDBpTplU4CYF7JHW9QigtfTOqswb +fU/v71bQVuAmvS+Yw5eyJnzV8gguEW6+d3ZSwZzvX/Wtno77x7LUQhPR4F7ZDDWfrJ/9Zz/lLfN6 +neC9A9BKAy0p4xaTeK2MW4FYTWdg2w24a7pRzOXK1C1IVRkXIrusUWvWv1lM5R20SYHsMzIRkdw5 +mnw7hu0l7NuqsxrjsqfQbrvgy/DbbS0WJU9oudhnlKR8dmsB9hc89a3zup3gvR0TWWpRRUzzmCnc +gLs2YGpgak03N+bdDiumwItSoNywmsF4e0/tJDWTpZ73Y6EGYAp83TDVwCunLehbXBYMpjMFAPf3 +c7hvaDFzLNMk2MBaTjxJix2kHcDbsW4AvnHzmM/P/ri38wTvXMC236xpVx9J9nnaFjkWY10EcfV1 +b2bwZhAraBOUHiJ4sw+N4BWBtE7zc3cYsviMy5hbuWNZ3zvkyzguM5njFiEIUW5/ffeHmXpm5hNm +MzvWrvilWoBCop+7ZDdkXXfwrnRz84dvHle6cWP/fBN93af+bzzBe5evmrNN4qLHCFgEsCCAN4CS +AtdYN22Mu7Pzuv+8VyCLdOBt/vOqm0WqzMsAZFZzuqZKA4Abo1FXIWVJpHQpgEeXQ8jvhMcxgDv/ +l8G7dKY1D9jcNUd0sbPmTiTd2PbzDtT1mDbwbsfxuJ2PdNwY+Kj+8QOf+Qc8wXu3AtfytilVky2y +rQNvKrW9BbDHxr77eb1ZA1k5RSRaTiHxuUX/jUaeo9lMDchcQSuh3iGaq9ibm6CpzxUyBvN54MtC +rpkGwS/nuxrrVvblE+zLYNnzpba8aBR+N5d3v3cHbwZrBu+aAbwz8WqWEJXjpZ/5//AE790UlNIL +hKo/u/rgUk0DNeCSgncPSu1gLex5LECE59iPFQ7n+2rUuprRakozYTQZzWXzeVMFbk0ocYxcSzM9 +tfp5JWu2B9DyKf91GRrlzCEiXn9efHAL2Zsvi4BzAHDbjHKsTgG8s+5RTefjDt4duBm81pyxfRe8 +tyjeyF1OL/uM/8ATvNcZuEmDUsa2NRd7bODC3lZkV2PcDN4b9T5yVVXGvNuFp+fkgC2VcbE5ATmr +FCOJAliBa0ysYOIokCPNYC4ANuYVK7KCKyAGo4x1l5MMyiFy3H6Af9OZz8GHFr0tCmAi7XpqoNfS +8I11C3jXCuINwKu6JEnbItnAu22ky+bG7AD+tD/hCd5rF02GNFCCaqjsox5bLhaB60C7ZtCS+ra0 +mtmcdCNYK7vuF9i6Pe9xe2wGsPrA3oSWoQG75P+o+rwFuKmaznwiPFX9XQXxDljfezQGbQPsooy6 +nAYuicaxWbGnryqCngdVWrU7CsBbQdx+J9vPOdK87Yl7hDn7vWs5jkctfFGbQqiAdq/UosN2PqzE +h9Jn/NJPfhdP8F4j4Ja8rTjGLcA9KnABvDWSbEx7LIA10JoZnSCYpcUGBbw36WaOOh/VfF5D9Bkh +JY1xwXgtgSoErgSjFuVyWrgqvw5g3/pXmDqg+nNQ33D/Ly4JJczVEy+3lw68jCa09RUbgFNj3x2w +G4Vur5cz6+bXvbaIczkXk7l0ZhUxgOwU7ODdgXuxA3j/OeUaat7OL/mEh3iC9zowrganSjQTyxZv +1uBHvigMxCm1qPLxZgHtsQB3u4rg96umllKtqMrg3f7dTbmZzxm8BP5v9U8bMCzsc0DwSgSt9IUa +gjFmqjnTVXPV5a9BlJiXwLpLUNxgkNGBC0cwe1x+n/KGsFTgijPDg/lc2VcBLOV2MZONcRW8Ncdb +gJsPZeGaqstKHsa423e0gXdnXjpsr2pvgLjYXtVF2QG/6SOvB4j57gLuS6EFdVTiqGWMGbzHCt58 +Wy+S3UzeQUs7cI+76ZzKfSuY02Yy63MfldGP2XQuAZYKXtCfwriuMe2BQhedY71QZSUIWwhM7ZFu +kZAmUhOWW4SY65l7zuWT4ab6ikTBW2yDsinIqK0IQQzgrcH2nXX3j3UtADbwZvatBRupbZikpalq +LmfGvdjZdwPuBl46SD54Ay8filX/og87fwDfNeB9x4MvqclOseiyBZO0oKKmG6QAN6nAmp1JUzoF +uDuA1wzaYj6vLmVkQar9YjPAloBVOVsEWiAPaxHlHOflHryLD+V4SAh1ShrIvEnAlGYG8ALTaoSZ +mZuZzr3BPCoIkWo6K3h56bcYVpMYTWj1dTkp665UgLv9nEMKCF47rEda1iqGtz3B9oIbeOWeNbNv +Bu2hMG8Frx77G3zgg88XxHcFeN/+4ItbgjP54vdaRFF9UGPdDcz7sZm6Ysxrfu0O2JvHYi4beI/F +/903AQSvHUd3XoPJ3JhzUZZb1GQ28I6SNhxKLJxOlnGwYOCqZWas0YAHrLvUCLYSs6uoIhfAEvdq +mumcz2g+xwCZIHiLj4vg1Y81n5OazlZphTnyTNe7/ZLBu/3Vi2IyUwZvymZz/hB38O6g3QC8GHh3 +MN8r9ML/6uGzxMHFXUG7qfm4NUAFrFsCSq2AImmQKtGNfIg1zlsaKBUWJmXjbDbrsUeexZ5XSlXV +EcCbPWgLZlGqwELTd2GqcVxhRle2Ku0wxJQjUNvjpW/ftT/DmkPeL/rdjtxBoF3y5XeY1pF2W2JE +G3igPsa89wTbTsteizQhvM3WbeBN1MzlnM+1QJX6vVpAgzXm1RHYA1NqGXGXL/cqJ2KbkpoXL//D ++2QH8Qve/wZP5r1C67ff9YBWJqh/C7nXpH5pBlj6/RzUSSY2IYft0tuO7eKyi8bytzv7sqaJsgmd +mViDWKsFqRrT3qzgtahv1FpuASCUetqZ94I5n/1QA/H2cogwe7B7VSsXfFJzeXG+rrIuwxmmLIzq +kYmw7JLVOynM69jXqj0TVeCygrcGqDbgZtZ14JXm59Z2wVDsuSiAN9bl3de9b2fhYi4X07mx7x64 +2g++Z2fe7bhfz9vx/Pc7Hxa+uN7AfWHetkv1VKrBqBZMKoDKif/dVNtzoZr7bWY0q8lWwEsK3gzc +BMy7mddWwJGBuz+nA68yO4HyhQShdYlAUFKq+lMh3ItnF7MSGvbqK3Eya8uhkR8qusOZwbIFDh7A +NhRIiXnlqipSk1tUiy7K21+KY5CDVUvxb6uZ3IC7quVkQaoE7Zd5u1jaE7Oa0ZV5B3OeYvVmNj5y +lonpVe98gnztf/IgT/C+B9dvvesFkk2s1bp8WkkiHgVkpCBG8NZSZwBvAScDeEVvW3mkOOBunvN2 +381a1+zBylFWFZuKwjGSp3LAJeoAK5nRgnG79BcwV8A2e1rDA828RIfb0XgYeYbC8rWMQ1pQS8Hb +hA30dWZgbqyrAM7MC2kiSxEV66mJ7uXXn8xqL4BeQCIIy1GEegGQms3WDXIn7+/7kyfKc97n6hd1 +XFvwZjPXGDcB40K9cdI877oxgAHYorIloAWF8eDjWuCKanT5ZvF3888K3CTKuqLmctkQogPLyJSI +R+HaCYRyyP2l55mvgqZ2FHpJm9rEr4VQCzcpGnw+zr6vpy2JHYJopnPzK1uKCsFrPxdWlVqWKrrJ +sGPeNVngKoBXv7sy5kW3B+amjKn1VksA7khTq2bKdjfFAnXb61g2K+AH/+y95O8/+U95gvdxXm/7 +s6+RPW9LqzjQCkSU13rsO/y/BV/XN38n83XzGQJVmdU1RbQ2rarCuhakkrohJAgeOfVGzO9iONgx +cWOzXn2CXZAq9vRHKWiGi3a/wC1eRGZ6cqyRbkxcpxVGcSxuG5CAX1uCaAx1Y415SwFG0rNVU3H5 +rGqet9Q0F/N5hZ7q0NholVnV4yaoI2skPDSbq19PTp1zP//wu95HvvyJV7c2+lqCN+VvveVyG+Oq ++kUuUbyh8jQP10BVVW9I/rCyR67RZS3E2EG719fuh1b85MBUNr9TjpMlZV0J+smVAYWdb+YALB3B +DeaQiWNdkRCZHhC1oCksJT+1oLKjsy8bQArzSu97S5gzKHg01rXPofq0BtJEDcDS7itBK6lpIidg +QK3KcgnVab0lIkPgto3MA9jGw1z1eO61A+8//49fUVgXq6hU4Lww7s0CWnm4qFxsIK4NAhWw2ta3 +rrb9b35VC1DVHtw1aW63+NTGuiuayiEgZTv7sptnKDpnelXgf5GAfI2MJV2jr2uA8bp0XE1mIQxG +eabNbMwNpKwgrh6r+OAVgqO55XJCEKSwcHFHGOqVAcxaHlnzvDVQRTAuBqZCaEoL32bdYEgtCxdl +p1rtopWgdROr0XY+Jd4zwfuYrl/70y/fMGV+lNUur7VDKANXELg3FdTJ1SZnH1arBNgKMczPtahz +YGf0oZNg8KYRVA2K6FGL8kVqKsVCzBLH7fbjdz2WpQcOOtIOuMqi5WJvbLksxc+tZjWP48sDDxL8 +2oH5boE/wSqpBtJkprQ0X7cWZiSNFcD7I5dy9gEzA2MKRIu/qyKYWg3D0C+BZaE8mffxDFJVZyso +YFg3j5nKN6r5nKr+VIL+3JutvGcziVnNZkqhOT8lvcCaPKmA79d8WSGUgzsAAxudJXDjOASdYhoo +Mm7HwIMUETsSFkgbKesvJTK9LM2UpApkbowbhimI6x9GM7k/UqIaCPSMSw7QeAiodw69APYhZAPp +EqL1DB2IBlhezGRudd7t58m8j9t6y59+qeQmAWljM0vccQNtPm4o697IjGs9u140TiPHe9rneFNt +N0g8tsr5NoPIyvakje+sSRJUd8wCcty0p+pjWWsM4N9Hf7emVMajheRUnrd7ABZbGEilTkE5LMU3 +LQAWCOjIUDCSJQ77JsIsjbFmBPCqpnAF6wjY4d8R3UKqNkTypAtMgZtgTLvAwb44BT+rCd7HmnVF +QEYm1QbtvU65+LXKuKrmWHt2TT/KqWKU1E+upLKgFQwMk+THdsbxnEsIFrmplzHtUyv5OM6vhvc1 +CkbJ0HQOLna4thsIWc1nRj9x/3nRcs2dbRXEHFR2OrCEv22vOaU+eOXYVSJgGwNbK6AzNrhFrUes +i69JvBfignSFdTkErEJVGdMMWD0e61f+7O9JTtnUbpoG3JU2lqWHs79rjQY2yQBZtwSobqqczRHy +uKmK0lVdYYJuIAgOGasKRF9Nj6mLMI8qMRCg4oGb4OchC4UA0Qi8jPlNUWBSM+H3gV+7L55Y87/i +U0t0ojQSa4fFFbYMTGfn/wLrVrNZAPQlyBU1thxouaW6uFPfOaGRW/1eHoLY2PlZT3jnzPM+9qy7 +wgVbYry7ltGaGws2sPKNom2UO4VKKaN0rKuBKu0KqtUCGknBCQeVcV0bvd/8T8iSO9aVE6BF4OLF +PgQmMh6hjxjACzXKWJzgQJy4+YdLAdOiD2QOKZcTwash60ZGlrGpLBDMqu+hFo8YcAHA2oLVVHek +TSDcA3EAbHLmMaaKlHUXO1sk+uo7vWcP3l/688/a8HdDvx1jRVMSvKEtfTeLquMGYNp1jlAlQ5pC +higbl0KMVH1bQpY1NQo1AekEcGMFIeuV1Kb1+dysB7G/yCVhBLvP36IpbaDBAFYzlTUgpeocEYDZ +L1eQ7x8B52Yf7+/yiaaEfhMJlkLHvI1lkXUlQaqL2JnMgrI6fAmjDn5m9HP3aioFLZ73aPu5sO61 +AG+dtGdVPnlcpOopUwFu/nlRM9i0jkoJRTmsJ1TWFoyy+2AKPDJugzREceN86ai6KJCXPDFK11r7 +XMUX1YmiXdCqRZiDmQrUa+19+TUkDUYtfHLighiIlYadQORlzCvwmYyHP3iTOYDXIvYxRW2MK9wD +lwOzdoCFoNSysAtSLWo2l/NS2Hc5sUNN8D42JnPNM3Kq/m5uoFcpGzJ9I1YYsPXRCki7InD9cOwo +oyohmssBwFJHdLqrr0H6xEVNQl2xRUK2okFASkbPI0HHXGr6KYE1sEQzgbrGolJ/zXRb0wW7xgjq +QSsDH1eS33w8eKNuCPVaQUsPVARoViWxnw9cjkXZlrmBWjeHZz3xnbOr6LFeP/+uT5HsqxpncWqC +cayljGRMq6BdtIijlv23FJBUc1jnxMZ5Qm2bOBHNbZVMLRyqZmiXzjm1GQ06izjMxeYQkbbHyK0G +iUntLkgh97wQNOjfkeUT3lcw7RNsQpKaaV96pH1gi8TL8MWBCq46bAFJm3xb9FyOxYC7FOWM/Xxw +92/v/QC+bqlKaV1XE7yPfXqIqpSMMmgOTGn7HptJHRtiAbg4CASYN+FcITc+5PI0I9/iN7fExomZ +1ZeeHVXSOMfLsalgMJIbyx8bzofvWU6lidCMJ6yektaUIMC2CYo7cCdgcC8WX2CBh2fZdrABVyPn +7T5ut83Phajzlz7hnbMZ/7Feb3rwk0qjfU3dHAlmAhSWNeBiuZPjNGiwt+AVta4iH12OIV7utRAH +rNuoMgqdy0nstrSOdvT4bj1IJcHP8LTNr5Y+Ocse5DxgUAoAHqWknKUQAlQ+yiy1tiVhFVpk21Mp +MPYFF848Pijjqi7V6CjMzFru2XK85u+6INdyXhg4W/Ai6wqYxhDeIRQ7lS6pGlkX/VxyM35kwDes +DWinhU09djnQnqgxHdM5AkY2dK15cHX023rebK9iom4GEIcn5Tv6vAf+NvUFGLVMFAGdQvR5EFTr +NqEBiFvEWOVszEQ+NNPYzOjFzszV3+UFzWQo1lAQnxPrnjd4izBVDTjZMI8IVgmjLiPrCqaEQtWU +OFOw502m/mprbX4RrOFa5ECMjO20u0kndNm1jGi2ABhDbbQMBvK2Ig0e5p7jqz6ZAnIBqRPmcGBW +GVSOjVJNozfdmBEUIC8AuMDEzWyG+8HPbRFnqGFmOitf9xow75HIDa8UYNwBRWHhLaR/TOOKsLxS +gsYU9o/CBY5keqtAD0e/VKyGdiCyxM2Ky/qLbqyPeNNVulxT1WPrWZp70/zyCNfANO4LQqpJfNIs +7s3jDrS3EQtobOmDUxxSQKYQUv1eY1wHYHa+87mx7tmC92cf/O82oryh/a4j05goli5h+qe29Rnj +1vpl6adPU59GGRJEQDbXUk3ugI6FE056htzAvHzHwUDLxbbgQUAqmtSVgSmGq8NGI/3zMJ2q3oLK +KQqKGXWGbg/cuvXdEWi5CwJYbtr14mJ3ULhdA1MaUW4+MAPYtSDjie+cus2Pt7+Ll4MMYrGC4z8E +UkKm8OBq9VpClbF5nvxFLQPTksfWntNXZidjEVmZq5lusS6GGl2pgwWyxFqvAxdAyBGgKbj6Ql2R +h9tGQv7HgIo5ZwKftlaRJjnpz94p046b56WlhhY/UdQBt5rTmtM9YH633HbMe6brTM1mSN2cyo3g +9IB6MQWzWa9GE6vL5YFJKiCWer33Qm89cCXAisflkuxh3hrF1YoALfKFW8CqvWsOElIyNNHdY9YW +WK9a6AnSQ/DeIis7oKY+HdR6bsfAvSPTOASmUPGjNs4DeFtfrlQ2XaCSqgWx2B9gZn/ZE/+YJ3gf +p/UzD36IlCILtC/ldDzHmc5EscNd0KFT5liswEChtRBVFUS+FMADMxpUGbFYY2A1q6B52TWqMJxa +vAcgTaImyyrsngD6dKnKv+bn0wIzDRU0PasgFi3ipayiHC0BcDtfmN5N4FIY2h0izHRoTQMc2HZU +WVWDWC6wxfU5vuxJf3zWQwfO02y+9MoA5QUrdaRQKTXqVQup4EWhlhS0ib0mEp0CMNiejSWlMWtN +EXEPYGQcAG+Nq2iJJFOTbK35YIrdMmBo6D/agbtfzK5jZ7v/FV/8yMZ8fM333SMUpzScEr+7HeCC +miNhX230cxepAO5MZqyqUlPZMy+dvbl8tuA9vZs7/cJmJgf1CxdpjhfP4HmXdu1TVwhcy49ayBl1 +khnH9kibUtAFvoTiCEDX4tY1z3AM5rQLGFtuqzFhL/tQ7v/Ov/PojPR49XNuuuf5qu9aHgnZBifX +AzL26XJ4vy63C6C1lFIdbwLBqv05v/zMWfc8mVfG/q9E8FbA4kQ5cZq/QwB3VCjaQieUTrwUHkwS +sNww1wgU0hPXkDOWIUK3flNC7PSnep/QmZDsNzm2F71dvN/xtx/bOTzf//WpPv9XvnKRR4Ld2mNr +5nFg3drD2zFuyOse2AE7llJeh3XmXUUGwBRACx1DCSfLgeKj+MhMrWgUVl2nZjYvemZXLyidzyqY +OK2FweTGiHTFxXxKDJxaYzmklxjSJh0TxUiVtD/5bZ/4+A7Q+oHn3wGQYXC3S+MY+C70Sl3GmxU2 +0WN1FQLf/I49lvDsJ/0JT/C+p4GbGxGsTDJVeRpsnne+L7BxB0DGibPNfHN+JpXm9K7Cf6TnxHG6 +l0DlFdQyVnbvTWYB9YolmseQIrEG+1E51v7Yb33ae3bynQH5FIjje4+KFpYmogU0phasU7YKK3bs +S+72Dlymv/9ef3JtJmOeqdmMjfHafE9Ff9mzcIyOwqgM16xAXcyYgRZb9FlyIEugdNG36UmVafEO +LZrHPo2ENZJVCH2Bx7L3dZ2mVFA97DyL7ca3fPTVGVk5BHHQC/LtftwizCDHU3WlawVVMJsPxU2o +wamqGil0ndZZ7UJ7mqjmZq3nVhvvi0rk2phV1WxymDi39W7/Zj+Oazn2aQfHovpdzhvDrQJFDH4K +QJW/GdV0iRcdr0ageBkcm4HDzcZWM71FzHhprLuzfK7a3m7vGZ79WHMaqSg7oqwLxnusdPElH361 +Z81mEKNioxZV5Nrle7hNr9czYQDqgumgNc52zvfdU/6tncscXs6zeJ/zF//8Ws2jPivm9c0GTTEj +6eFMZxMgczzXhOSok45TyHGb1SPimw/6NgNfvIHWtEnJSAVnX5yBIW522rAnIs2MM+bZd/iFroJz +4Bhj4q/67oPUzyCUOro5uhSE9EKQylJIjmkXrib3dVtnZjYnagasVOZNKneD4K3/gYh2uaKhgyjO +x3V9uAGgOOuHbkMXpnYJxZLI4OcCCLG9RwadNb7zZ2Dij97GGazv/7o1v9qv/r57pAbegh5VZ15T +LzbnhdV1CoQC+rlnMG/3LmFe02VeAbSrgjU1f5gNwjixZqS1eru+9h3+6kQ5s82UbcCDqDP7QDUF +9l0Ya5qDVQB/54GnPnx2F+trNG/8dT96r5g7gK1PbggYn5iKQOZ2cNNzvoasS3R2xoRXymhN+Cu1 +pKa4xyE757NNBKwHwE9GMjPS9SuFUpBbMnAnAh5VDpcxwzS2LcWZe4/vPhblsM8USqJDy0QHl0me +gXTYPoJ7tvNrfuf+s43OfPeX3uDaOFAdn2aOoDhBaZqC70gfluMF6jp99V+4fqx7duAVB0pk3f4/ +chI2aXAIlEx6GpUAThuODVtH43A52UHY1zpz79vygDk4FmfAP7HgaQZswqmDnIFrAOZ03hfmK7/o +YXabmYwtMVdjDa7SHtBL2wfzvPd78FoC9yzBm7taeXXSNzVELD4OLEEsvUm5jqqrAvQ1upzEbxd1 +vk6deF+AfQq4TByw6XPLMRjTtQtSUDmF8aALHAbai7WcD+v5X5yv/PyHOVajNisaIv04A87Glu55 +3QNd63VeZnNOnViEuQ9QefWLBshacQX9pi367KPOGMt2wBX8mUC/o28VrPNdQWaFTgZXBgGZEyze +TGhg4My2xrpchnYnzrd/6K1PkPMH8A3mQcAK3ZxOKle7sl7w/g/zBO8VWZ93/x/wyg/VGUSFgVG3 +CkZcClZYUR05gEUanZgaxLAThMVQiA5BOxLd8BPWG2My9Qmn202z8+Bc3ecA3IMC1/aFH74GAHZx +A/vG+IQ0z37/xrgv/Ms3rjVwzzBgRZDTXf3QEaxppijH4tv+hoEpBKgA+9KIbb0gBZYL1Txkronm +wX89ZPk2wtwY8+IOwKX4Y8G+hia/QT/86+cN4Fd8TvF/GRLe3YQJgp/vo7tinR94WcXUg7xr7+M2 +e2o0TqRn3ADOOlAsetH9ZM5GDx648RgB+TRce2hXczzO+yWufrAbaFb/1UI/9OtPPmsAf+dnPsy+ +AIVzAUz1eVf9PrbzN33g9Wfd27fbrtB63YPvJy0+JWHIVjFx06pKhrkcspRK7oMCa1ZpV5UoGu1F +9ibHwaRNuk/m37bSx0Q0HHNiO2AG6MYIBwMryqtCgKWXX+cOuH2D41iu2TaJA+Pm0G8CUinrkE36 +L3/aefeyfuMv3yeM5aFa//wPPvrhuwK0Zwvef/jg+7pcTdMNLpHkpDNexWqZd7DWwmCqQKUwe6zU +PqcqX9rA683kUXBqARAd8nkBMEFATCKn+sqoKFp7QsS2Y+L971VWDs9ew1ysUM9AL+cv+Vv//q66 +2K/bOvtZRW0qnk44gCMpq9q0Ajk5YsQL2kkYJiaXsG59DjWZlwzcJTCh1Hprz4tRsJ1d7BpnKrCM +9bKWNmzlsvAWeW4uP//42/6y7K/3Cz/q304QT/A+PraCEx6PY0rgdiU7QV7z8EGnX7CKcgDV3mxt +4CDnyy7a6YOmcyL/Kk7PKpLuUdKakMI/bSWDrWXBg3cJry364Au9/jf/ywzi/XGf9xH/9wTyNJsf +u/Ujf/4Xpc4IS55pnd96BD/XpE/VZCY1mRcznTuf1+YV0UmzmYPfebHdutgcsPwf+7AUd11M47EH +cbs4NR0QfxcHeTfe1lfIBlPbVJZiIezm9vZ6F959YfXcedHbTJ/zYf/7BPJk3kd3JczTOrYNdcjc +FBJlNBEMTdDYtSJ+GBgPWdfzbj/xB3/DjhchkuUgzQ6e3P1dAWVKfDXWU1e1q7ScwyocGEHMBuyl +vW7xtZo7qH/2HU8RXi622xcZ0J/+lH8xwTzB+26C1xoKMBWUgmdaJ0Y3ZX9C5cbBlDwO6GVUqxkA +t7OpWTcSFu3n9f4oMw8E4kdTkNCEbsawScsKNVnKBCa/WP0VO95V4C7VJ2djWOyS6Ao5udvd3vSv +PqaI4m4/f+rf+LUJ5AneRxCoIhxZQn6I1ag9F3tkObToxU53pjrupM3dlaaKQT5V4wBXAVy6WhiE +1jlMe28SOgxR5xETj7cLt1XVUSg8+FeNcTkAt55BX7UvJ+Gwr5RIwS/8r5+YZT/2xz3jv/2nE8jT +57399dr/78k65bNJ17h0jLT5OXu6KGVfV4rw+Mo5z7usnGuD91pgNnmdVWBiu8CcHpz8S+BVqs+b +j6XMg9Xz7vsuzt+kQWmGn0Z4KpA1LijBSi8P3qLdxlTknNTHzcx76ABMkY3VFx4dRXbVHuN9ZNL3 ++vS/+qYJ5sm8l7HvKMJzIpHDkICJguWRrZxcKxCqKqjzLS0CFajL7JtyhfxSI+SgmoFJH2V7uaT/ +zc8SjH+3mM8CZjoGrZB5KYC0ZqkVsASR8lEBCZ9ozTMXYb/9S//m06oO39P/6wnkCd54wZgsaj/a +7lIzQ1CyYhDDik0GGBpiGhVJjE36VO3ipICQjnUZ660qgIkuk9npfxNN5VHe1wMXWdIpl9cA1+KD +WdGvJ6waE5+P1iCB/fTm/+PTahvU0//KBPI0m3V97x8/KZvO3PWEtfxuGqSNcmXVkbPZfNhN5yrE +ISDS3vzqqs8hvkySXMlDy53WM5jQS04fafEGR4C1Ciy5bEAw+UmdJQPGelCbWaTPvBvIF2zm/EFN +dzCNkXHRjI7+cb7vEExsrqZztxlQEIDH1sgJ4sm8detZ9Cq+xQM5hIHqf1WKVQFs5iuwOd8q0ozm +I/m0TtHUWoKeFl3K5ncwLN61Hcb8M59oJJbb+TuVXjVYZ1rVGk1vn08iK3URCiWf0twN4Roqpzf/ +wadVD+HpHzSBfFcy776+74+f2AQ1kHlTSyHVrhNj3e1Yjjvrbny4nVuNc2HdJNDDi7XNIgNO5JBo +CZVMWi65s+5BbzefMgau6LaZ1+YGS2VfclIci2taWCBQhROpva+LrGqFHFi4EZm5Me4ScsQmd8st +LYcKedwGs5UqmNLL9Yy/9uYJ5LuGeYPjKaN+PW1MNw1mBzJoozPTW+pvvbYVxK9GYRyik6Ucfcti +U4PtSjBuybv4t3GC4eLa/fuSkZLnlia4x+RmgPaV0C2vbG2H2W/fd0IdkFbONoJtlCtuSTIRCBBW +ZXrftPELv/9Jead95l//1QniuwW8gnnWXs6qDdyCyQWLgNms99fJfq66ahznjW0FfGlMXF+YtGCO +k3OG4M/tv+3GsOPfwHPrm8/FLVwgL1VfVmB0kihAdysBVEC4BaiaTQFx7Z2VBbqXVBggagB1Q8gF +MtvSNrk3/euPFZs/9ekf/LYJ5OtqNu/rNe98ktR+XUiAuuHSGuHZzeM9z3uwPK8GrlRZToXl1tal +RK01sMFxXFVMrpa59fUuGLxyTQt8wtOVW35tAmcBmYk4k4FBtlIFZMuZmxqWgDndWgaLmV9qn8Fc +dsEsNJmXkJZip+VlBR1cBy0JbFrJzU8uUy2272D/HvT+z/ybb58gvnbMixdzCgD2DmJhFlBf5ISM +3NiWQ6ct23xNGZQwVruUA4g91C14lYeVSfAR72g4iQclc1cxTTF95Plfgmibal9Kk/BJCmmpcD9k +XehWJ13M5J2hW5VW+T1Lia7XcjZM5Y3SeoKjWclNsajR/g28P/X2D5Y1rfQFH/77E8TXiXn39ao/ +enJhX2y6B2BmkK6Sq6n21JCxLmuVFQrUpTrETKqSRjVq8UKkQcWUgO/JrSFvARZaAkvRgC9v/ZW1 +pgMZGPACZ6x7rgUd8LNgfTNb44J1HUHAC0ooqTLsoaubXmJgDti46Xw18ArBmFabt5yDhoV99/Mx +HfOxSlEO/dKP/L/uehBfXJc3sk/OyzBTINrwBHbMSyDuG/zCAbct6vVKvdilG5DNgdmIETrjtgOx +9EqbWwJcHeYYnfJ32fuSY6ZF4ALzCjtpnxpwUn9VMhC1uSKDXY1tATBqF9KyB7ukAFYU5M2H1g1K +2ibjpisJ1HLbADgX5W+qJr5rLNEP//Z/Lmnbhb/iqXevkMC1euPf9Ycb+z60fdv7yJtEEE2WejtP +GUjFz61HGIHQLhKYvAAxYx4EpcZxYg7yr6FcMSSYYrnmKanYEXjFyem0FJLtU/k+IZdaaswLYfs6 +hW8ZCAuwY1NkWmbrEd6LUQ7Z1LbnIFeYgtlm+OTAwiGdcrEzbkrlvGbmvblx7sa8vB3LftzcNu2V +vvJD/+iuBPDFdXoz60Eb7Y8CwG3TBUrFFeU5PwKlUkKn2gN9fLlGpLHFKKR7xtobgYtltG1Kazrm +VsrZTwBkGhns46ILcVMP/TwJY19vZpcoOOeUkNkeJGDySjOrRecn7WBbCLWtLRIuNRgmEkekivN/ +JcoQmZigid8HnW3cUF/7e++bv/D/4UPeOQXoznl9+795YvF9E/luVZzto8LkJlJu6SI3gIhwjpFA +tNn3DTd5Grl0ZpEv4KDO58UMbes35sDA7FiXTwSn2sEubmdR8xqQZ4hWE3kFDkZPffElKMa6DJpd +yrwHVebAohD/7poRz0GeyBWHGnh3v3fbcXfm3Y8kwLyHm7SbzrKkGn18zof8MU/wnvH61nc8IV8F +CwNwoSAjz/WhAmADMQtHuYoGYhC5cwDmBmD7TVSqwgTSEtoGXBAn/D+dADcGqqhLN40iywy+LoGA +POfmCXHyeyMVkKU7W1CrAJYbcMkA3Cq6iJcOvHG7qMB140s0cGgVbwjefY7FBt51O+RQdLy1tzOD +eP94nvOUP7n2IL64jm9qXUuPb4ri5GLGHqR5BIXouCpNWrFG7a5Xii2VSmCKQgoJReJ8gMqqfgeG +rQ3g7kJcFMxr9gG2wbDucQKtvMGlbizBpGZUk47VYihiJ+29uDST1Xnp+4eAUyneWGqrotStSIZa +XBG8VT87NUlfm9jYxpywBit1s1nKs3/vv3xvee5T/uO1BvC1fXMvfuv9Jl9VLj9QxrFum4uqtWyV +VzYHtnUq1TJJgdJCHdxtowssCu1mODANuIwpxoi5Y+ERD0cWXgIDew9YwAhF0fj+aH3Ap9m3yeU4 +zUlg3wMKEFhRSmg/vJ2hLgheMj83A3c/1sy+hXnLzOU9WFXN5qXNN+WlRSu/+il/em2v8Yvr+sbq +REBl3aQjQbIJyaWXoc3BZZ3jLI46OY5KoWBZ50SuxFLqdgF25CnAQH1phaVmrLldAOwW8Cn4TuVx +NXWzQF8thRfbarG4M+WlMrnVWkvXG9TqsckKMeLuL5buorrhNS+7idu1ajDy8ebopaCoYDWbU2Xg +OhkyZ9y25zlYUYgVd3AG8m7RvPpfPjm/+K/54D+/diC+1mbFN/3qfYLzfFqbOdXpBvco81ZOEWrs +m1p0GCuAjGkrtett2xhiRDqWYjSmpY59Y6S7Ty3F8sqlpplidByDbI5xTTmIfWeSsC/uoBNTlxYo +5jhA+Wf2cplceKsa8Faeyb60s+0xfBq8G+vKuqeL9uDVCjMcU2bdtB1yMPZVBr5Ytz2tfE9G/F97 +zQB87Z36F/+z+2QRn29d9CIr5rMGr+yCs0FdrsG/mZ+Vi7Q/NzOvUk5iAb22vgrLdfqgwiPTYPCY +H8+9sBdKbwBeCFvvnEsbRp/WYJUAaNnL6KRh0Eob+aE2uwKWW+thEQCA98IYSPMATghgAQBDpVv2 +eXdhhGwyb8daIs8G3My/O3j3stODms9qOu+3+WLzyBcpQiH6tp73lOsD4LsirP7Nv1L8Xxv+heyb +/V70JFtVQyuZtAsMdaGNbQ3EoBE9iix50IJYpRVmMF0OXgfgpeZaYzOE9yP7ES5QCQo+b1PkaOyL +ya1SdLFEgT1uQnc+Ju3Nc1coohsEJIz8eE7rCkvaU7025s1A1kaFsoEW4K6s7KvMK3qbNyAv9+wA +NhepvLKv+5DrAeDlbgBvTgmRKSk2pj2In3tLOoGBTA4Hh5hZpNOGkG2PXfdj1XMqBSD+4Oozp9Z3 +Xm6ndl8ifG74G3bQYNyo+PGm3ZjTUMEUVTdiVfRIbg7DY9lSMSul3iadimgbIiaeMDotzpT3/6Ve +NF9SNZnFTOUKXD+2NdXmhRKNXvdjLZMi16PQ8SbR8di+k/3zf+XvPFkm857RevmvPFGWQQzV+cTJ +B6rcVAbyVT0ZUKzTG6xYA/JSlWVj1JnbmSEQiy5rbDFkNz60ma2+0IMumfjbNViR9mkUk5lb9Nnq +odHf3SPKF2Rlj9xkZIn0tYzF+HAbEMfw1DOva+HUzXJn29XMZq1/FoR9Yd2V12I674zLyrx7vjeP +/9yYd9tllm23ORzUhE/FNXrBR5x3JPquKif77l95kvih1E3KlBP7CiuMNJOXwJHKhns1pnKcm3hd +crfMAawIYAQvBRAjeBlCRRzNZ98723cn9YEh1+JcJa8NwOrzskXEW/HFBV94XWpi56uPlTRP/F0A +swh7OSyzdNYSXa7nFJsTCnh30B4NvHouRRslHrEDOIP3YrMSLspnt4M3H9vffuFHnW8u+K4r6H71 +Lz9Z40viu44GypMtwtxSGTZ8zEzdNeR1DcSl/1yDJTQAKgXmHbEvD5i3AjiUW55oxvdAgiSOYNuz +Ba9Q/7nYJw28h8y+S21pbDEEPqkj0vpyU4h6ozHvwGvD4xSwhXmjaV1G3hTrZ8/4ro19edXYQ8p2 +/f4d7Ky7g/fiohRx5L+5gTetxa150d86TwDfld0Y3/vmJwv6Tm3gz9hcduNECXxSiOBGAJsU8sIN +wMQDs5nG5jO7Dh/PuAem+nPfg8SDpgkELlfjopu4gGNT6jDuBt4DLW5w+MJ8onUx+OcYMJMmCJBz +v7EsDSY2pgBeqpun9l2XQsl8ZNYlA+9uOkvJ9S7KurvZfM/2mheuueAdvEkZ+MUfc37llMvdCN7n +Pv3Pso5a0sBGDm6sEOhYqQak8s9J76+BKVWkBFXKejuR7uqUj3W7jUGtVQNVefrKHlwRccGseghV +086XDVLoDvL11jWYJRD4CfOLSeRSqTse2L41Z4ztkTIIlQlYJgq0dXsdx+18FAWamb3agO/feGrl +lei3kO8ZqdVjIHHkDtyZEm7K0llYTmlwMu+Z+MA/90QRFKwj8dVUvi/BM4r4Lp1KIC6sK6awquwq +ztfNrMxcGyiWysrKuvpABqYtUV80nemScBV3sWMZBIsi81pKBwNWjXUXx/ocMtRN8wvMZInx7yhb +H81mKjOjap5XfKpOo8trUtNZjIOtbNLyvds72U3nC2XfyrxcmRc3x5d87HmZz3e9lMgrf+YJUoaK +UddmKrDDexDD74AJrUCjTiNcGmBpAVN598MqgKmmYhYzlWFyoWkgt04e8pVMHJsCI2ipmonC2Abv ++3uSU91YFLzq9xK0/cHfXkK0W2AzQ/O417sWH8SD2IMoayYcdg5WQx2kroyexCRzknL6Cnne7bn2 +PO8O3g24ZTCEfsAA3vqZbS/ixR9zPhHo5W4H7/M/60GOudikprHlc/EwX0zAL+5yMOBLp/0i0coh +zDUmsAoFiqI5FkkDwNwmQtDmF1+/YAM7duK0+yRCiSHby75Es0Wniym8mtkPjfJ2ZKs1n+1xEkU9 +28dkZjyY3OTM/j5fjSY7ZgXgCfOHYCL6nGIQslnoTgyvCp1N5j3L9W2vv18i85ICgoII+ygdYmaz +OxZMH7UU0l62d1hadZKxKTdiKMy7UDWdzcR2VU186ovso80S2/x4ULqYby/kxXva4LF6D/uzbS5t +6qrQSZeSxRWJsDU+ZHOZNVVkm6RGn6EYo7Jv8swrxryWKtrN5nuoHQeIEAqwbv6cpXwk27950Ye/ +iyd4z3B960/cL81kDumiExuzH3LdA1dcSqiYzHvJ3n7USiVuRQ++FIoB+Nz8ZX0s3/YXGRLKQQdL +eKn6z01N0mmROA+3vTTuAkqJqOvRjZ9Y+bcmbAcWiwb9zGxOFbwG2AbcFpSzkkkDrwB4t/NuMl/k +D7lshvZ52MjVQ512qs0MRA889cErj41lwtWvF3/hQ1zF1tOobLGfqEIU/OTOJEbTjn2bocCFhHXV +uBu4WmBI84hFq6WZqnqk0Ekk6H9WuVUfNuLhf0RRNk4sqCt4iJuiKAG4pyYwYeQ8xYMJimGaqb4G +U726MRnQEFWmMK8qiXN/arSSrftI6gY7mffcgfy6+8QxR5uFPfzgqturrBtNZoIgVWbcRQ9nNnPF +cjXxRs9DNKjI6r/UVtXlGx0oDNxuM3p9ESkauHJbobGoJtRLyrM2ctRaaMit5xSbgi1VsEkb1Vpr +njX/kwG7Vt1nsk6vHGmW0rG+f8AX3AwJsxoWLk0LF8C+8Bm/8EMfutL4mMx7mQn93z/MGAfpbl92 +BJrBaDZe+K3XGCemeak6H7yikFMdBI3E2BdSnhq4stLOGAF2bFunB1pKiAevMVgadEr+Vi6NE8R4 +37oLJTDl47hdnUcux83tETe2P3QjlfNNTRWtVagO/WJyAcJUc/qQiw+6ZJ0ZdQbkezEheosg1pc8 +nK/WF/7ofe175lbK3JmA7C/IyFUVsCpKvujZaTZDnaQfc9YuNOFbQETIh6i4jXJh0OHyGtAL9AgN +fGMU6OAQwDMli1DD3aSDBi+YXe+RKlraoeWnbJ6sbUSt0CKPYNmPFLaO1Cq4eIWac1Dat1bFujvD +piR8HibpNJvvcH3jj9wnWH3IkUVCpBkbwZ3JvP1wz6KKHqx1wn2jr+8TXlAzq/cbHcPzWAuSQVR9 +qSqPBx1bYs2SC0SjY1mlL3fsQ8kNwBJTXe6iEydWa5MRVkvPiVa0QfXbujcprMVs3h+0bAdvdJo1 +piWMg7Q96KIUapALSumx1zxr08J+O5vOwSd64MOuruk8mfcO18ufVZh4BzGFSGpkXTm5S8YmvhE/ +xz0WRMcZmSsoLgYqrukdtpSMVmyh2czsunJrl64wMLQpiJTxJ3XCH6pn2l8clF+OtS0FNgfBasZO +b9oKP1YIDCZTBIUUbRXDXG0f4aINJgpgLMSx2AT+oTNyJKfP+26AWEYXGAatiG4x577Rd86z6pn4 +tBvm/qb4hv4+AuwLJlo3VIxE48CxduQaKokaVr6yqpPfgeeLg03o1HsR/55qRF0Gnyu+dql9DP6z +SCB8sPu4RzhWfyQ47GcstZ5m8zVf37CzsAI2LQrEGrmUGjBeqtlcTOV7th8Oi+o/QTFGBbT5ltV0 +NoF38axbBdW1QQqDYjAkuxZWWEO9TTdY7tnOF3vvkJ4PFazYo+jULwgDXy0NdetwVftN69iKqR9t +2tDz0ZnNWuus0iW8m8/ZbAbTGSLata5cCzD4oKZzSa7n83LhTWcCF3+Pcr/saQ9fSZxMs/lRWK94 +Vvtyv/bH7pea6nEGJ3nlCJDSaMoV0T+UAXtLZyZ71grTGtQ9TmAYozxtU0y10i4Ko0e5Sc8yGmyp +xdXq2FMOQ8hPwbalknzUnG4jr87uPcbaaJ8QKykn5ia6z6qwbxVdWD7JuZyyAbjKy06f9+5Yr/ri +EuD46r1SCyPHLJ2904JbjKLMvlKLwhwkY6oYsBI/ODuaVmVkJ8OQMVOyCJ416CvH8WZeg5qdxp6P +KssloMWJC5CyssaDRJD2CfpfoTUyFr+wYMxMoCJNWvyvDHIooD60v7HozzU3vNAtN6EJ3mu6XvOF +BcRf85P3+8pKhlrielAVJcfOpBQBbCYq90FeN+tnACPRkSfCHEoWGaLQes1CGidCuGvmYzHSbRkX +OQ1cEbQeBPxYcSBN0vV6DKyQsvut9oEou9ZXLth2qZvG4lmaqQGYUzvoQOQtqOnz3rXr619/n1hL +36K+7sWhnGuNMjByUh1oV5TB4sznYRBIaDATCXt/22S/MtHvgi42n/ewa1Rtjl/RqlJf2I1Gs9cm +VXbVFYvAucrlus1DwibjyzVbsEl9XqHq865aYbX7vKVhoagayKoVVqu1ajWzw0JlS+2b1n5pa9OE +gjKrrirMq1HpA1S5bQ9/+TOunt87mfdxWt/1+e3Lf+ANTxAzl5NWMUkICiUW6Mzxc4dOBYRkYDZb +8CZR6wIyXxd95Xq/KWGKBsmGYvDj19D+NruBZOT6esVJCnmXQJxJfEmYq6tkK4qQUs7UCmFy9kcb +QHZpnMyszG6kje9wCm/1CtPbBO97YH37Z5eOlZf9/HvlSydRjRXl1aRYyakwD7pw3YUeZ/9EvHEF +ripIQP9u7Jot8/+Cp8vhj/GobNSCVuwi0L49UJwZ7XTCLotyBTrvmj8S17JHVhMm+/qJtQ2xbF7V ++bXB64TS9TDT6YonUid434PrpZ9aVBu+5RffRwTm/NaJDAKJmUEkOYIXYeEfxBVoDLOCyMng+Jx1 +GX4tcfxRSVdVMTlpuVgpwgPlNTOAkzvGJGDok6hlr6aLMieCvdU25tMa+xNRG5Qm+TVZf3SOkdfZ +RW1WlIQZEfU9p5Of6ATvXGW95BlFufBlv/Tegj6vaH2vBJNYhkZz+ElqUBiM59FA7tb8YEGyzFxq +ti8CEXPCwWVSVTtWBW5xOdmBS+jE7GEiV2FVmFADZyIBsKFWC5siCNQxIjPDJERWgNecL0MZZ5ja +yPhn5Orq082A1RVdD7z5/ioQk4RcSmXIBnLqC7Z0yQLFGRas0ikIfE8NXtnvo8g7jBOv6o9W2WTV +XFJVRyh6plo0MeiC7mR1S7qoBqlqkUaqtc25vnlVWdj9fJTWsxu6/1vNi0BqXVsSQSAwC7RjDbQV +aUhRE715Q+jHnn3jSuFlMu9V9YufXlJNL3jzfeKLNU5r8cgAuFQLQEzMroCzVVCVkiPBQxbIIxcW +XRjB23KvBtxd/zhJK6JAZ7sCV1IIeKGeZCtREQUa2gy9lSE9+55wlQmCaMbCu2LGLsvLUOyMuvkl ++1Tee5YEvoLFGhO8V3x959NblPp5v3iPDIl2kFv1o0OXNu2PWxqo3LYJ9oftKQ4KXBtEXqLeXH1X +mNVUtae5ms0tz9x4mpttmjcJZurA24TnooVBQWu5yeE4aaJQAB7jAExWSdbeQ87lmlOtVVdR3KCU +R1rts0zwzvXI1/c842Yrw/yFe2ToAAmCtjUQRHO5sO/eBrgPOb0gk5zIzQlSIt47U3JgPqyjrqwr +jXUJTPsWHGuWgLhKDpxmD8AXf18DMTkQ+/Gr4E7ImH1j0UpLzRWzOZdLXmilFrc2xaSi+RO8j+P6 +jXe+NlNEVRjchbl5pU98/xecva//qmeOgcwwIqUO5c4+7AGAW+btlv7di3wmQfOZalsfD0JMreNH +ZW0pAtebqeWJugJLB6xWsGHPG/SaicL0B/xdA3twp4d2tCNqMI9LblhqW2Etz1Q1jhmwepzW2/7D +a6UIeKeif7RDV3bwHsskuYtET/+Ab7pW738HcZm8sABoGQJTF/nMGbwXlXVFVbSkim4ZHFfq2yK8 +j9mZy6ErohZAcK93hRMQbC6vzeFNOi1hP/ZA1fGYXNBKjiZrI3XkidPSPhHEE8KZR6lWrWXE6nSF +Moys/GNTr9yDVm943k2e4H0cgEtHGJlRtX3zPLkylGopAH7mf/rSa/cZPP+X7pcD63iS3IIIwKUS +XWa6d3vkvT5gJZif7caoOaqsBSUK2IgXl4xiGdIfzlUqOWPVX64ALi2AGbz5vNZ5Ujt4pQMv+WaF +IeNC/tzKObkpb6AQnW0w5vf+zNdfLfBez2b80HCdgbx/2fv5ppTj4e3CeGiln/vDB+S6vf1XfspD +fM+y1yovdM/yN+li+eDt+G828P7V7figDbz/xXZ84HY8eQPW/Qriixq1wUhy9mdTO1aBIdzkVSxH +Ss/dFIJqGgfBvH0ImU23VwmcUuMMUq91dlEUnfMmrjXSOwE6OXGfhPu0thrVK9tkh2k2P7as++83 +c/nmDlhQ3U/KurvZbEceTLWZ0Bui1+Nxe+xKn/M3XnXtPo9ve8vHyBKm13PQ/mhN9amx3/YZ2X0y +UKk2WZ3LlgxutJyu5a9TnTvUrCT9zjLzrtVcXvV2ZlvcnIF5BYak98Er8T3E0PCRPxgdCVob8s2/ +1xzyG7/hOJn3sWZdAikTMr3ftXSf1GPzoYyF8zzY7Vv6qX/13GvHwi/6+F/nQx1SpgUXVUVj93tV +RSP7v6igAXAXm6YHpZVyG3s/dA64ubpgJmPXUIKpCI1pgaHDzwkYuE4mFD9HqrGyhDP1ga8wT0rA +j05X8Mq4duC1yXJUVfSlTVZP8QhT17fbP/F7z5Yf/90vvVYg/oaP/TVeOBRpWOCqBq9AQdJyv6gU +3zzYkyacy5GKV4VMxrCqtWygtUl/cfpBDVjh7ZQaoJOa2fpv/RyjU5FpchHqrqmigljcoLlpNj8O +661/9L1CN8zPbSZzNpfTUc9gOm8m837/LtHWzOndlL65XVg38+1nPfWnrs1n9D1v/QSJQ0xatLd8 +Ns610EOCvmOdn6B5IKxcJhmNVqFuQmHqRnb6TRQjzdlcPq4g/WouETWxZ6HWjiV8MuLsWxN9n7RJ +6zbpLtUKUzb++QfWaTY/Zqy7NkZ10+PyRWgsu5afd9Cm1aUnRB+Tf9aL+od++7OvDQs/72m/ykud +hKBTEcjOxsRtWoIxNbOfZHTSv8XUD5i0lW2lsa5N+Gs+Nnx3SRzD7i6PY9wVTGg0sQczjOJ9I0bu +WgzrXGAf2Lpq69oUafzav3uVZP8V5tyIsWwCplXg7rfFmMUGM8PPOZyhU+h+8Lc+I1+WX/kR//PZ +s3AFYh1vqWFYLvcVnzcpqFWwLnccaeBK2mBsZ7pBoUU3H5jAdKURgFrFVAJ3pkSWwb/F2UXrQCcn +SW3KZ+GTJmaXRZITgTZ4YxO8jynrJog+2s5uwE0K2LWYwwZgUqBmc9lY2cZFhhrabX3/b35avvlV +H/mmMwaxCqwDdosimygDK3BzO+Be27woQgq4hZs2jDOXhzlbNJXpJGhFx5UkiEuk6numFswCtjVm +JKt8MhXIBJKYYu+XnMi9MPQWc4fTDsSzJfAxXL/8775D+OHtIttz6GA6m48rliZKR/V9gXkJZrtq +IUdJmaz1dg2+sLhv86s+6ufP8vN77dueKT6whCbsWi2QRPgZlLFlUnMz0OeE2ss2/Ctdwrh13m5q +t6kH7arse9z83VyscZTaEphwur0geE0snf3UCOaBxA1UV1EbK1PPtilRec5ffHGaLYGP9krH7ZPd +jxX8XrsQ1WTOgE3FdF4zcI9tmnowk9vFGsp1goTL973tU7JR+NyP/qdnBWLTcBJrHhCcAch1yLZN +K6ReIKb3eGPEF8GKrGuFFujnhn8bSyMljPpMkMaxgJU15LevTBxOBeRu/NAxIVdtMtLNvaLrWgSs +0o0NlDfXXGyxrsdsGttx1KP8fKOYzdl0LgC2AJaZz2KmNGgKk6UKaoDDX6Cv/o1POrOg1nB2YTMu +OcakwfzkSwJWwXymgYlcA4lW+rhHuPXI0e61nXN02WrT64Bs+D5sRC9sAn3QCkBvj405X/IFHY6j ++eoC+eyZ903/54tlfehYhZSMcc3nFWVdY9qEAHUgxZ+9rCkF+TeRIMC6/fyqt35CfpbnPe0t58HC +3AaCRY/YaTNbHyyQEruGew9hB+IwxLdFk9shEXg1z5tCTp68Ko6A/I3VNSffnF+ItfQ2LfW1eU+d +TzmR0IbMV/QbPXvwpoeP1b8xs7cFqo7Of5MYSQ7nVP3b5HKBJELeYBYYzCxuQPUO4v321z7tV+8K +iaHh1Hv9fLhj4Fb6KFCjXM1pqKrCYola6XSZArs02ZoWluDa3piqHREkXkezeIFtTdWTJ3gf3fWG +f/082c3g0uTNlU2xCKNL/5wAbse64lWFRVxclbA7Jco27K/nNb/xybJHb5/70W++q3TCmgZy+Swr +gNOAeSFo5YCbpLbitbRfA2mNdXdjUcRpORvsRNpA0Vr0ia4v99lr9p7ENJsfddaVUsTMrpnbR0xL +9ZQPQiFAa7QZgFzVkiU1XnUDtOIYMNidwc7aL4nX/otn5rDPVYlM/8Bvfro0058HHuudg9U+AbYc +cKw5TMi4fZoo/pxqgYTAuE1fztiZzwHIviuidRkkG+uirkAnDTAIA/AE76O7fvJ/+YrKumTyKhWM +a+uMidFkNIlH91d/F4F84rKW4OmhcyRel+YHN9DsTPwVH/HG9+hlwFXh4rTfemsEy+mfO2Qlx7wJ +AEyuKSDmcZuSpCT3dN5UHhx9R5GlgrhK2YoOGhcmbG70QAXmlQneR5d1s9KDQCpDfM42BqFGLFsf +U3+vNbyCEucmCXO5DVXHYKqmCv4ruzx++Lc+S6zo/8s+7Kcf10vih377s6RpP6UAPKHRYFGRy/lY +IDWD/i25mUXtd900bRJv9kpvNovEPYH7ZoLg+44KK7IJrwE4m3PMTvzr8uDVBO+jsF73ji8C1iUc +MtsxJzJqAqC2oozkAIzM7HtYmyx3UVscgVnqhWFXU5smm3Q6YBug+SO/83fzkz/rw/7x43JtcLgi +BSjKS8tCmqwbnD2ec98+80iVfp5JqX9Q3o9mL/zTrhMIc7gR1GE/iBrtnTpPJ/4OUvQsrolKmOmq +Dvo8S/AaQDl8K1gc733bBlLXqOBYd+0KNII3q2WFrIr+DFENgUk3OG+6mPEF6kv5+5q2sCt5/3c/ ++jtfkLvAzQX4kqf+o0cdzD/6O5+X3x0MM4GC/BYJjtORqPPxKdgjwLgJIspyotaw4h1KGAV7Z6Fd +D0abiI5zGJnJ6cR0A4E6jJOsGkxl1jkrRfmylaW88flpTgl8d9f/9NufKzlQRTZMmd2lREIdeJsy +RN+A4GqasUAjsG7mih1gWaRNagWSj2zAFPl8fab8mERNdWKpDA7y5CxNrXF7jn/49i+uNtyXPPV1 +79ZF87p3fKEYONlAAH6tOLDGyLtgdrsBlSBdJsDUCFxMs4kMhqxY8wA72uyixc4sZwhgQZ+tnAbu +LaNtIcJcDpjMpjONJ/M+Wr6uXOJ7wgXn87qxXhmi0tSCW4QRZnzazLiH/JhcwG8dOOzn/TT1MvYD +XrfHJlceX8v9zdpWBYtETZyc6XVv/xIpFU/Wusf0RR/6P156Nf3E7355Lj9aLbddtw/xQSU0kQVM +3y6BigE8CoCVlvJxYB6xbatGHA4ZC56KdBFlb1KnYXR5PCWxam0xuWHiMaLc7ufeD57gfeTr+9/2 +qZuve6zbJEufsKhmYAxaAUg7AOv9YVqsD1PpAK3s70pSQ3mpPa5iQBZxTEyqymg93oXfVq2Lt06e +8jcXy0RyGeFubG/T+YzSf/x3ny1MmJKiALSoZXyqXDGF/HcayLG25nkiz7RkwE3J1yvLqRHgAzDr +W0NfOO4vEv1iBG6ITIicJlfuosnsJgNa/hcDVBJqziZ4H+E6pmP9ZDH4wjF4Ui+8FVJCaibvhRsB +2IRjrAeBmVqob6mPakZzNf3aWJGiAyW1sD8po6rMqAt/cTHD2drtdBr9LoDOAhfOAuM1ra2NQ88q +eKJRKQIDSpr3TrJCIzxE20NqLZE4UBOec4HF6hvqcZqh+HlCLp0qKFZhIvEyTAONGDmy8WincMqW +YBJjkYZT+gm37TUJTbP53Vrf+ZaPlxvrsX74LtbLZoQieBOYwQkAvLpINHX1y2OaYIHOmtqBwgHI +2g+b2ZI1NKVqFFKA3eTJl2omZxO8MvBBga09MLlRvg0GY2lWR4t6e9vTiZg7K2MQXQ/M21oixbFx +6nzcpq/ctMBS53yKDEziGoDWDUhE2ZebhI1o5D7JMEh1cqzJALghZetM5z6ti6FH8u7GBO8jZN0M +XDVTeWlhffMe821/MTYlbrgvVFK5kdWt8r4zvATiyFzn8nggWzqIaIEGO2TkREXknHRwdYLH5dFf +wMqp5ThMmkZUnsaazLl/ueJSZh6kmVlTcR+a/C3qVSG4ZZBaE0gFte6gIic0GEPifFc/JKzutYlw +7kidAto6iNjlhmUwm/eUfe7AytzY1wWp4H4OUWd90jd8/ZEneB/heuDnP0gevnmTlkVVDjO7KeNk +AOzAXgGMKw00UvooKPlCDIhOdSkEzAjinkw4YEtb6SizFzBvlZZpBmxmVlnAZCyjNUln6bqSnsrM +qCcllziTNEyXCTbcE5rO/lxTaiR94YsBV5tqa2dQ9XfJ1RynkJMVbK+sahjswTloQOhYl27Nuo5l +fV6gA2xnUkfqnuC98/W1b/jP5MbxQVr5/83DkFlzo00cbQf0vWWEBy815cE1jypdMMdXDkmY0QGz +0muxRetz7WfKQppffNtZiUxzBmVhXqvy0YgyGZPaezkosy8u7UTwGFfyF69YodO5WYgDNICuPYBr +bEB687qCV92PtCqQ5RJdZHLCbzToze0iT8DEvqpKXBR6xLp9abK3UFj/rwduSRQ4Zr7iLSVXGrzP +ef1fkr0pO0czl/KBLzrZnFUdjfmo9606tpL8JPTBAFdRXRM5xbjMUHbBncgCcx/h9v5yu4TquEtr +kyPzYdW8hjTQsr0H4QMwrH9dsUbq8la1fhi184Uh8o4SOAkrz2CKQjaNKWmTwarnBIErGVdGjbSU +tdEA5wu123wJoMf5W7nEXmbqo8iMvzfQLhw1Ca68RtSVBe9X/fj7yz7qglMJBiU0bfZjKdPNM5C3 +82LgBdNncX6xn/0oNJpGNQxvQEGGycb4gMatjLgS0W5CblWQxQH3kMXe9vdheWSKoblowg+vWqkW +BGPApeopB1CeBK83tQvTotm8VuBS1Z4iJ9rnTGgDa8KaZXEBKTphMpOcCHzRIBXLJ8xjZN1gNrvH +uCAo0eu/7gZP8N7hEh2IatUtrJ9uBfACAN4e68d5lB01EZpBpztheia1RgduGk9M1G3Nl2cyfbDG +eo7RoKsBuAMdlkObZlAZmaHXlE8PnI2bT5Bz6WuWUzebyJeNSmVbp3+dWqDKMS+27FVPBKfZk2v9 +o5CzjYoY4sTUhWI88eQnjsBl9goYHAHNPn3EfY6XJvPe+Xr2j/wF2fWNLLda1Azap1rUSA28Sc1p +D97FfRlMo/gDu4iUDG5Lz8J30J3txdd0lm1XTsnFXJYNvEuJODMKn5sIHNNJwfNLX4PNRQjKININ +F0OgtuFsfmZuDFhBW1+UqRmBN/i7dT4QdhClQU534NdK2K/8SFG+RWAK/FseyNycAeteWfCm2tQt +faAIMZVaMn2x83bjAOxrwO7zewx1rHyJFwlqDNVkPh3RcCGtIXiDKb67BLIzLuR7mXWGkM0W0oIP +Hm0ccqnH615DkGp1HVdQsFHBWidIrA7AtUe380vDmBGs7AJz2UZzduJwqe/LHYQsTn76DrjBFHbB +q+DrniPrXknw/r0fepKsWr9cL1Zp4KsmWaiIWQ3A+xxZx75cAcwO1BbB1eHPnRSKBDzzaXuN48x3 +rr2sAvNobcqeUANuAWUqEWl7fftmsay5YHI3o8Xul3aFcWjp69kWJhgE0FInzWrC5qv3c51Y3Fo1 +pyrjuoooq5DiqqQhmJ8FhQyUtqmzdCWIqdMoOMU0FI7DnC0NIsZwHdDA16XL9+MJ3ts28/I8G7xY +QeMA9HbFimKpyZEm/ZKSA6ya1IseCGJqt1tgKxStj3B8KYAROCg2jkTV6p5boWTSckl9PUl7b+pc +oeYnk7CTnyGJ1WGLIy3UUqaooxxywHXOU+oBLF3DPRhE2vWDhRZeolVAf9kPrk4Sm+498LEO+jJF +OA5fg8vZKtMu2dW6ta971U3mKwneJAqi2jMLkMDrBYFrwNOHR+bN4N0urIOO6+B4QFqBsOsEBkjz +pYX2UBEA46v9iA987ayteXAxUktP7a816ZWXyzsM0HVDW4KFgLlrnOPXNhA/wWDAvhhdDsD1vw8R +ezCX2UaNGKATNNyDOkaqjQV+hCZucnRJgwGd6I9nV5iBZx4EqS5RjZzM+0iZFwsR5XQ2pz7IA5e0 +mDz7p1x8GuE2HNpYuDEvpg+aed7SfjAQR+REsEsBqcwokX2deB3GvhN4ZC3SnRNLUjah6p+FWUHV +9RffIi9a8VUIjyvzOrVGaUUqEiccAHCHw8Bgk8AaxVoZpeM2GTNzANCUqDJwvc+19/WC6C5ifEmG +7mQjwv59LjFIxePkwZmw7pUE709+5cP8+T9wn0hg2xA/8uYsxrPqlyfaLCCaJy7sm8GbuNuN0Vw2 +q3WhUKE13KQ96wrINkQlfrGrT8BslmZF1DfCxUe2okoW6lJHsQUOWwArqxHVKQE4pLoH4oCBCVsI +aQBc2FwTpHe6Pj1UwDDQinudw+kFo3T2IGY5TBW5lGIwkZcA3DNeVzLaLCJQ7cfjUCqP78j/VjHC +LqhbfLJEthNDCoY96xrzLt4AdhFwdIoZ7DWBsslhaMV87FwCmeoVF8flLODDWzMCw5R6jvI/KORG +rWhircyWBuClgTJGA3N7TiixHIDXgOu0lUOU2FJDSXyaqJVPtgIPiqx7SdMBcX/bAXfR2MdiOgl8 +aQXVubDulbby/+5r7xXHvCNziU/nDBwwiX2BemTdAXgzL0J1Fg9M+IZZdqaznBrMBUEyAiZ1F17n +u8FrBWGAU5tem9NDOtjaD5r2vqsXlnPC8q6OGEEdgIuSrOjzCqiEdDpV5BgY7++7kfD99Szrvgv7 +DJfGssviGXeY89Un+sdff4Mn8z5qFEzdoL5b1Uh4RSuTmJHGxFZrzFZeaQCW3m+isHtIMNkM5Atm +k7Bhoc34wQqtBXzZxt7e7He9qAwN64LMG5oBFVRrnUgP4B3UGPuPWpwgnYtBdKDyVU+i5jICmNHt +iV1BqW9eiM0G3cBrGWbmfHQ5mschsjwsjjvrSctXeH3+a+4VuYMS5BNZG1egjqkn5laQPtYYkz73 +KyMfi/0FckqqsPrW7IJeMdDiwAzgLaDFgBB3m1rSANUxz8nF4V1Uo81oj0pwMIdmMZrMgRkJAEmq +8FjVMahFogVSR2MQ96x7u8Dt2voGKaFg5HS6VT/1/Bs8wftom8+vutf1yjPfHoAdIJ2utq+2UjXX +0wM/UM8oOGFomi/MzlyP/5jDE+LPJ1k3FsvXAghqEjgD8K7GutJYWDDAFIs6IpgDcKOZjCZ1Zzpb +wQaYzUyBWdO4dfBWpvLtApdzTj8wbvz38Dw//YIbZ8m/Z/GiP++775Whv8mDgK8REg9Ir8HFA5xR +Z9kDwnwoGqSu0Of1zdx8otTuRLCE+26WjnnNFNWLvwMvtaacNTPvdhjzBoYdNfJLmF5AMJs4+sAO +uBSAq1PpOW4wg+kGcSN4LIE7NNz0xj/5xgnex3x97ivvlY7U+IQvPMjhMQ2CX+zb6+sFhGwIF4Gc +st5DOaYr/LjVJ37KnINfV2Gd5CO5TVurpYd28N6szOs1MfkEeBsQpWdXojELx7hE8sEqFgiuBZOZ +BsDtNoc7AS43H3dZCGIKVNNwLVEgNVD1T15442y93rN74Z/7intl1Oo11vikS9tty7XVUiUS3Voo +YqexlepM2kVTUAteOCfYX06AOOoLE7WxlAukYFzASl9UUr92zaxLmX2bmpcMXrcvcYwBKel+Jz0z +2u9BbwpNZhfvi74v3H/Kz70cuFAxtbR0EJ8ArqW07HE/86KHzzrTe7Yv/vM2EI8U72+ZRqLAtDAi +O4JXnCNKXVoHG8EXLaQ4LOTAy6NIGA+Vs3q1B256zyzKviibSk3E3Kq5dgBn8O4HFeYFYVuXH+ZB +EK5j2gEr19fdNciz83m7YH2sXSa67QDVsGZ54dPAxfFRSSctHAuIl4PQG1/68JmXaJx9jUlhYvdG ++PbeHY7/cgM9JFQvxcgRDwheiypyG/2ioq1QKz16Pbhp+Ei5XojwHKq7UTYI/TtRQaKKMibv89q8 +hMZ0AsG74Y52MkXj2JIicFv0m0ftgRT83QHj3665fMrHpYV70XQD73H7bNYC4jf9g4euxcDza/Em +Pvc775U7eWdoKCcGX5eiUDg8SRip7vxdANWBfTO4a6LnGvZq4A1UaL7y4p6HdXNot3H2j6DZrH6u +se9KLWDlWvgI/eYBiAefmcBEQRr4wgwFGjRi3kvM5NHPXfCOm0WyMADXSh6XgQtVVToKcK8D414r +8FYQv/xeudW7Q01FN1LskoKBVnIVFPYreLn5pcw1uER82iIQmKAgPPB5LQhmZwHg4t8gn2Jx4LVU +EYXyQzQrxPvtt7JUusizgBM/KgMfBrxoMN3xtAsU3YkMWgde9lMPul2nSBqdu497rcG7r895+b2X +ikoZeJspqfW21OsL1wsNdnybIzZSaVgQcDRIF3EDgjUfYHujT3lx3Qww2rxAmaSdkXkFq6uEIM8r +YQKfZ10MgI0i5G18apjkF6LOHXsPwHsZ296KdVuzgWddJ5ge3sC5poLuOvBWEH9HH9Ays8+m79ai +eBoNdx4Ek5aoh9TM4wiyGKyqjRYsfaTbRaDQn2bHwD1w2QEDdZJbXXNrxk9y2r+tUxhoDIBmOvtN +QC7RmjoFZLnEPB+xLn7eC9QpLyBjQ9HS0Z+vK3CvNXgdiNH0q2WCBOZkUDNM4QKL9bNLUNgn759G +6y0CQcB0NqdZRkUnAqxuogIRuA680LlTSyOpNiqMUkAx980weTBGyn3r3iBi3FEpXw7m2wEuwUa5 +kDeXQ81yvJjPOYc7wQvrszcQW8N5wja0GtTAbhfqZZFRfcEuIrzQLwXtqcgzgHYJJjRheaHmkE0d +k3o5WGTE1rnj1SsceCPz+lfa8szso8LI8EJeaEBIxlHjE740nzKVna/LTvHRapYXzMGPTOVrDty7 +Cry2PuPbLqSakJd1u0SW4MgEHrw+9eJnHfWF8J5aTY8rghe7c3IOGWR7GEdhuUiugjg1bajYLzsM +EFE0m2F2LflIsVVyNfnYPqjVmcfCwx7c2DnVfW6ofrEM/NwA3LsBtHcteG0982WHcm0l6gc4Ew1H +AY0KKE6agrHEknqRb/R3xViYenu9RrGhdnqUo0WA4QQDK97A4oj4WhE4qBON/cPo8ybpC1ycIM/A +vw1ygkFrij37B+G4nAk6+OIM/F7uNuDe1eC19YyXHCSOjPSaU4ElYvHFJSmQKMuyhAYGNJ1HrOXr +Q0Lul/kEeE/0yia5NFDEYTZTDIihOexiBvYfBz/4xGeCue+F+3jBAr/PwoIL+WMQWb7bQDvBG9an +fNNBJPiP3Qc1aDSQ2C43+HcWJV1C80JzWbWbKQwc7aYAsA8kjV4LBpaoMq63KKKfib41RrO7dwKp +ImNelyunQZmpjDfBpqetEXoDNDKzpeUOCN72RG944MZdff1O8Ib19BcdxADJ1AecRiWJPoBzK/Cy +C3Z50xOYi8c+Id+Gqj8G3GJxhsDO4CYJEHfsi+a0jCL2FbxWdBICWKN8L1gjS/hcatsjQZnj0tgX +i2TuduBO8N5i/e0HDnLZjOVoakcAoz+3xHlK7rpu3T8S5uoSjWbMnvjaOpP1dIAKrQlMP7FQ9D4D +eNsUBoHSSwRxZ4FIUJzhFq0/hCj6IkF/bCkANuC+4cUTtBO8d2JSv+hwciBQMSF9sEuCj4egPRDI +uAJMI5PZb0ZBnstp90S0ly7xdc10pcZ+NDCdnYi7vV5prz9J8N1PyW6D+W9dWIcK3lAXroz7sy97 +eF6rE7zvZoBLgRwG4cFYkQhern7doRZatNJJ9BOrZCvJpbJdpyYG3NKUDoE0BK/5m+wiz7cAr3iL +wYFXLh/tFN2Jw1L+/iK+yuuN3zZBO8H7GDEy5oldxRb5mufCLksL0CAgnOlsUjyh3vkRfHFyGyWI +fbSXoahiYDYDeFvQCspMY8T51EXH5EazHvSwDeTnvn2CdoL3cVqf9I2HWvxRW+SA0fYL9MIuTkZD +2JudCUzR2pTIj82XxdzXUNs84FE8uzZAONZted8YsLqtvw2m85u//Tivxwne9+z6uOcvgqxmJvPB +gbd99AkKH1ZUeqy5TOlY6/Zs5cu/8VE1lYs6C24xfcCqgZh8z/DtgBfM97e8Is3rcIL36q1P/IaD +oL97YO58yQTDtmo9smlOaQUW86P7rfMogIT/QZdRzPhYoCq522Hg2S1ewj9/5QTsBO+Zrc944f0S +TdHaxrdL2CTyZrMKWPGj/G1xZ8L2lVVutAr7mUgobJej7DxKck3ATvBe8/WpL7hfJI8mUfAmTBTL +WCEimsb8yL98Zz6HOmcf4ZJ+aLeZz7Wqw4N3AnaC965aH//c+9pgJBvwXcO+fKdZoku/7IEwJo2K +I+M/aLnplh76te+5Oa+nCd65TgL7q++Vx+IC6Pp5Tzzwl189UzhzzTXXXHPNNddcc80111xzzTXX +XHPNNddcc80111xzzTXXXHPNNddcc80111xzzTXXXHPNNddcc80111xzzTXXXHPNNddcc80111xz +zTXXXHPNNddcc80111xzzTXXXHPNNddcc80111xzzTXXXHPNNddcc80111xzzTXXXHPNNddcc801 +11xzzTXXXHPNNddcc80111xzzTXXXHPNNddcc80111xzzRXX/y/AALAeeJNYLYIQAAAAAElFTkSu +QmCC" transform="matrix(1 0 0 1 16 10)">
+ </image>
+</g>
+<g>
+ <g>
+ <path d="M238.3242188,170.7509766c-0.4863281-3.4130859-1.2421875-6.7626953-2.2470703-9.9580078
+ c-1.8144531-5.7670898-4.3505859-11.3510742-7.5361328-16.597168c-2.3398438-3.8481445-4.2109375-6.7397461-6.0673828-9.378418
+ c-2.0673828-2.9443359-4.1513672-5.5292969-6.5546875-8.1333008c0.0009766,0.0014648-0.1328125-0.1347656-0.28125-0.2856445
+ c0.1308594-0.2387695,0.7373047-1.34375,0.7373047-1.34375l1.2080078-2.1533203l3.7402344-6.3193359
+ c4.0703125-7.0737305,8.0234375-14.6323242,11.7470703-22.4619141c2.0693359-4.3481445,4.0556641-9.0185547,4.0556641-14.3959961
+ c0-0.7041016-0.0341797-1.4204102-0.1064453-2.1494141c-0.2763672-2.7949219-1.3955078-5.6499023-3.3261719-8.484375
+ c-4.8417969-7.1005859-11.5888672-13.8583984-19-19.0307617c-4.7783203-3.3344727-10.0888672-6.3623047-16.234375-9.2563477
+ C187.6757813,35.7275391,176.0195313,31.8125,163.8125,29.1660156c-7.5214844-1.6313477-13.3427734-2.421875-18.8759766-2.5644531
+ c-16.2714844-0.4174805-39.784668,1.0800781-59.3950195,10.5844727
+ c-6.0859375,2.9482422-11.9008789,6.6201172-16.8164063,10.6191406
+ c-8.8164063,7.1743164-16.6972656,16.7324219-22.7905273,27.6401367
+ c-2.4643555,4.4140625-4.4492188,9.1923828-5.7407227,13.8183594c-1.621582,5.8149414-2.3935547,12.1445313-2.3935547,19.7319336
+ c0,0.9545898,0.012207,1.9291992,0.0366211,2.925293l0.1455078,3.3535156
+ c0.4311523,6.9780273,1.6899414,13.8374023,3.7412109,20.3808594c1.0292969,3.2905273,2.277832,6.5473633,3.7099609,9.6767578
+ c2.5429688,5.5595703,5.7880859,10.53125,8.9262695,15.3388672c0,0,0.6425781,0.9882813,1.1674805,1.7958984
+ c-0.0024414,0.0039063-2.0410156,3.5634766-2.0410156,3.5634766l-1.2617188,2.1767578l-2.8959961,5.0175781l-3.9272461,7.1650391
+ l-3.4848633,6.3818359l-1.1582031,2.0244141c-2.9960938,5.2138672-6.09375,10.6054688-7.6479492,16.8857422
+ c-0.5571289,2.2548828-0.8359375,4.4755859-0.8359375,6.6435547c0,1.8125,0.1948242,3.5869141,0.5844727,5.3154297
+ c1.4951172,6.625,5.1640625,12.8642578,11.5463867,19.6367188c2.3134766,2.4580078,4.9384766,4.3056641,7.4765625,6.0927734
+ l2.1196289,1.5136719c13.7827148,10.1074219,31.2319336,15.6796875,44.894043,19.40625
+ c15.1132813,4.1230469,31.800293,5.7529297,48.2568359,4.7138672
+ c22.8818359-1.4433594,64.0292969-9.1513672,82.5136719-44.5664063c2.8603516-5.484375,5.2607422-11.8056641,6.9414063-18.2802734
+ C239.4570313,195.1533203,240.0507813,182.9111328,238.3242188,170.7509766z M216.6748047,192.0722656
+ c0,0-0.0087891,0.2080078-0.0107422,0.2373047l-0.3408203,4.0898438l-0.3730469,2.6201172
+ c0,0-0.8037109,4.0742188-0.8037109,4.0751953c-1.625,6.7929688-4.3740234,12.59375-8.2041016,17.2734375
+ c-1.1103516,1.3574219-2.3818359,2.7177734-4.0068359,4.2900391c0,0-0.3066406,0.2939453-0.3193359,0.3056641
+ c-5.1015625,4.8603516-11.3681641,9.0341797-19.7216797,13.1357422l-0.3466797,0.1708984
+ c0,0-2.0195313,0.9814453-2.0205078,0.9814453l-1.3945313,0.6181641c0,0-0.6679688,0.2880859-0.6640625,0.2871094l-0.75,0.3339844
+ c0,0-1.1357422,0.4941406-1.2304688,0.5302734c0,0-3.8554688,1.4394531-3.8564453,1.4394531l-2.8857422,0.9316406
+ l-3.8974609,1.0429688l-3.6806641,0.7382813c0,0-5.4609375,0.7773438-5.4628906,0.7773438
+ c-3.1816406,0.4023438-6.4560547,0.6845703-10.0048828,0.8623047c-3.9873047,0.2041016-7.6123047,0.2548828-11.0786133,0.15625
+ l-3.0043945-0.1455078l-0.1767578-0.0087891c-4.4165039-0.2548828-8.9550781-0.7822266-13.4873047-1.5693359
+ c0,0-0.7998047-0.1259766-0.800293-0.1259766s-1.9736328-0.40625-1.9736328-0.40625s-1.3232422-0.2832031-1.331543-0.2851563
+ c0,0-0.2788086-0.0625-0.2709961-0.0605469c-2.9213867-0.6005859-5.8657227-1.3056641-8.7524414-2.09375l-1.2602539-0.3330078
+ l-1.9912109-0.5390625l-2.3139648-0.7431641c0,0-1.8422852-0.6035156-1.8583984-0.609375
+ c-3.5068359-1.1503906-6.5629883-2.2539063-9.3413086-3.3691406c-3.7705078-1.5166016-7.5087891-3.1982422-11.1162109-4.9990234
+ c0,0-2.5927734-1.3251953-2.5957031-1.3261719c-3.6123047-1.8896484-6.4765625-3.5458984-9.012207-5.2080078L63.6035156,223.4375
+ c-1.7216797-1.0478516-3.3476563-2.0390625-4.8793945-3.2519531l-0.2324219-0.1728516
+ c0,0-0.2548828-0.1962891-0.2592773-0.2001953l-1.5620117-1.5136719
+ c-1.7856445-2.0126953-2.3237305-3.9091797-1.6240234-5.8466797c0.2553711-0.6923828,0.6523438-1.3466797,1.2915039-2.1289063
+ l0.7573242-0.8984375l0.7382813-0.8974609c0,0,0.168457-0.2109375,0.1665039-0.2089844
+ c0,0,1.8173828-2.4736328,1.8173828-2.4746094l1.2783203-2.046875c0,0,0.8642578-1.5439453,0.8676758-1.5498047
+ l0.4814453-0.8955078c0,0,1.5424805-3.1308594,1.5429688-3.1318359l2.1044922-4.6425781
+ c0,0,0.2011719-0.4511719,0.2021484-0.4550781c0,0,0.2753906-0.6367188,0.2758789-0.6386719l1.8706055-4.421875
+ l0.9248047-2.2421875l0.4121094-1.0429688c0.7661133-1.9853516,1.815918-4.703125,3.4921875-5.3027344
+ c0.2939453-0.1044922,0.6015625-0.1425781,1.0219727-0.1240234c1.2836914,0.0595703,2.5571289,0.9990234,3.8535156,2.0361328
+ l1.277832,0.9853516l0.7138672,0.4804688c0,0,0.4702148,0.3095703,0.4643555,0.3056641c0,0,2.0263672,1.3554688,2.03125,1.3574219
+ l2.5419922,1.5957031c2.5073242,1.5166016,5.2739258,3.0712891,8.7045898,4.8896484l2.1928711,1.1601563l4.6552734,2.453125
+ l4.4331055,2.2382813l4.4614258,1.9755859c2.2294922,0.9013672,4.2744141,1.5869141,6.2460938,2.0986328l3.4492188,0.9072266
+ l1.6484375,0.421875c4.15625,1.0166016,9.0332031,1.8769531,13.746582,0.5351563l1.9580078-0.6660156
+ c1.296875-0.5722656,2.5014648-1.4199219,3.5834961-2.5253906c2.4746094-2.5322266,3.7109375-5.9912109,3.390625-9.4931641
+ c-0.0810547-0.8652344-0.2460938-1.7363281-0.5019531-2.6611328c-0.7802734-2.8144531-2.3330078-5.1923828-4.7470703-7.2753906
+ c-0.859375-0.7412109-1.8271484-1.4443359-2.8774414-2.0927734c-3.5878906-2.2109375-7.7841797-3.6826172-11.8422852-5.1074219
+ l-0.1660156-0.0585938c0,0-4.3666992-1.6044922-4.3569336-1.6005859c0,0-1.6337891-0.6875-1.6542969-0.6972656
+ l-6.7460938-2.9404297l-1.5327148-0.6572266l-1.28125-0.5517578c0,0-0.9624023-0.4140625-0.9702148-0.4179688
+ l-3.4140625-1.5185547c-0.0004883,0-0.1142578-0.0498047-0.1147461-0.0498047c0,0-0.121582-0.0537109-0.1645508-0.0742188
+ c0,0-4.2294922-1.9912109-4.2304688-1.9912109c-4.4619141-2.1689453-8.3154297-4.3710938-11.7792969-6.7304688
+ c0,0-3.5253906-2.5922852-3.5273438-2.5927734c-1.4458008-1.1396484-2.8662109-2.387207-4.2216797-3.7119141
+ c-1.5585938-1.519043-2.9833984-3.1049805-4.2353516-4.7114258l-0.4052734-0.487793c0,0-0.4248047-0.5209961-0.425293-0.5224609
+ c-1.7080078-2.3286133-3.3544922-4.9121094-4.8950195-7.6772461c0,0-2.2373047-4.3515625-2.237793-4.3525391
+ c0,0-1.296875-2.7988281-1.2978516-2.8007813c-0.8193359-1.8979492-1.5439453-3.875-2.1533203-5.8759766l-0.6391602-2.359375
+ c-0.5288086-2.0913086-0.918457-4.2114258-1.1572266-6.3041992c0,0-0.2021484-2.3291016-0.2021484-2.3310547
+ c-0.0556641-0.8857422-0.0839844-1.7758789-0.0839844-2.668457c0-1.3330078,0.0620117-2.668457,0.1865234-3.9951172
+ l0.0229492-0.2646484c0,0,0.137207-1.4306641,0.1376953-1.4321289c0.296875-2.1982422,0.7797852-4.5356445,1.4365234-6.9472656
+ l1.0869141-3.5917969c0.840332-2.4443359,1.8725586-4.9545898,3.0673828-7.4614258
+ c0.921875-1.9331055,1.9399414-3.8227539,3.0253906-5.6181641c3.9272461-6.4907227,8.7275391-11.8056641,14.2685547-15.7963867
+ l3.9677734-2.644043l4.496582-2.6303711c5.996582-3.2944336,11.3974609-5.7592773,16.5136719-7.5366211l1.0913086-0.3393555
+ l0.5854492-0.1738281l0.3710938-0.1162109c0,0,0.6079102-0.1845703,0.6088867-0.1850586l4.0078125-0.987793
+ c2.5537109-0.5185547,5.2875977-0.8701172,8.3574219-1.074707c3.890625-0.2587891,8.1791992-0.2587891,13.4921875,0.0009766
+ c0,0,3.0458984,0.1635742,3.046875,0.1635742l5.6357422,0.5058594l1.8154297,0.2626953l0.8642578,0.1337891
+ c2.9121094,0.4423828,5.8564453,1.0170898,8.7578125,1.7089844c2.7910156,0.6635742,5.5146484,1.3935547,8.09375,2.1679688
+ c3.4755859,1.0454102,7.0214844,2.293457,10.8388672,3.8164063c0,0,0.8310547,0.3442383,0.8310547,0.3447266
+ c2.9736328,1.2099609,5.6816406,2.3891602,8.2792969,3.6069336l2.6738281,1.3178711l0.2900391,0.1455078l0.7714844,0.3779297
+ c0,0,1.1464844,0.5712891,1.1513672,0.5742188l1.7324219,0.9296875l0.6992188,0.3837891l2.4101563,1.3320313l3.5947266,2.112793
+ l0.3867188,0.2421875c0,0,0.3955078,0.2485352,0.3925781,0.246582c0,0,5.9492188,3.887207,5.9570313,3.8935547
+ c0,0,0.8388672,0.5664063,0.8427734,0.5683594l1.171875,0.8417969c0,0,1.3798828,0.9868164,1.3955078,0.9970703
+ l-0.0097656-0.0068359l0.1005859,0.0717773c0.7597656,0.5175781,1.4257813,1.1049805,1.9775391,1.7460938
+ c1.3271484,1.5429688,1.71875,3.1538086,1.1982422,4.9213867c-0.484375,1.6328125-1.1875,3.3530273-2.1708984,5.2983398
+ c-1.2792969,2.5107422-2.8320313,4.9594727-4.3330078,7.3266602l-1.3486328,2.1430664l-4.9794922,8.3652344l-0.125,0.2119141
+ c0,0-3.2802734,5.5458984-3.2822266,5.5488281c-0.7578125,1.2329102-1.5517578,2.2080078-2.3632813,2.8969727
+ c-1.3300781,1.1303711-2.6152344,1.4306641-4.1005859,0.9223633c0,0-0.1660156-0.0756836-0.1787109-0.081543
+ c-0.5224609-0.2099609-1.0058594-0.5078125-1.4765625-0.9101563l-0.6191406-0.5908203l-1.3896484-1.7011719
+ c0,0-0.6289063-0.8364258-0.625-0.831543c0,0-0.890625-1.1152344-0.9472656-1.1831055
+ c0,0-0.1396484-0.1630859-0.1396484-0.1645508c-0.0019531-0.0014648-1.4521484-1.3891602-1.4521484-1.3891602
+ c-1.4023438-1.2265625-3.0800781-2.3383789-5.1308594-3.4013672l-0.3447266-0.1801758l-0.7363281-0.3774414
+ c-2.8828125-1.3969727-5.1220703-2.4140625-7.2597656-3.2988281l-1.4619141-0.5878906
+ c-1.9052734-0.7495117-3.6845703-1.3666992-5.4433594-1.8837891c-2.2636719-0.6694336-4.4628906-1.1621094-6.5390625-1.4624023
+ c-3.4521484-0.496582-6.65625-0.512207-9.7929688-0.0478516c0,0-4.1875,0.7724609-4.1923828,0.7734375l-1.6992188,0.4980469
+ c-1.828125,0.6040039-3.371582,1.3901367-4.8583984,2.4741211c-3.2695313,2.3754883-4.8867188,6.1738281-4.2236328,9.9135742
+ c0,0,0.3251953,1.3598633,0.3271484,1.3647461c0.7158203,2.1577148,2.1308594,4.0019531,4.3256836,5.6376953
+ c1.1030273,0.8237305,2.3969727,1.5800781,3.9526367,2.3125c0,0,1.7841797,0.7919922,1.7919922,0.7958984
+ c0,0,0.1767578,0.0629883,0.2578125,0.0927734c2.4794922,1.0063477,4.9892578,1.7788086,6.8994141,2.3393555
+ c0,0,1.0488281,0.3208008,1.0527344,0.3222656l2.1416016,0.6118164c0,0,5.4042969,1.5527344,5.4833984,1.5766602
+ l1.7470703,0.5361328l1.2001953,0.3706055l1.0585938,0.3212891c0,0,2.90625,0.8974609,2.9082031,0.8974609l2.2851563,0.7646484
+ l1.2089844,0.409668l7.6689453,2.7841797l0.7236328,0.2802734c0,0,3.6494141,1.4555664,3.6503906,1.456543l3.6357422,1.6542969
+ l0.7363281,0.3466797l1.0136719,0.4594727l1.3964844,0.644043l1.6259766,0.8955078l0.3730469,0.2138672
+ c3.4511719,1.9814453,6.7890625,4.4736328,9.5957031,6.6484375l0.9404297,0.7666016l0.8037109,0.6650391
+ c0,0,0.7490234,0.6269531,0.7451172,0.6230469l0.515625,0.4765625l0.3681641,0.3457031
+ c2.8027344,2.5820313,5.1669922,5.3378906,7.0263672,8.1884766c1.6582031,2.5449219,3,5.2783203,3.9980469,8.1474609
+ c0,0,0.0644531,0.1582031,0.1054688,0.2558594c0.7177734,2.1318359,1.3183594,4.4443359,1.7832031,6.8710938l0.3417969,2.0810547
+ c0,0,0.0673828,0.4482422,0.0664063,0.4433594C216.7841797,178.3701172,217.0214844,184.6777344,216.6748047,192.0722656z"/>
+ </g>
+</g>
+</svg>
@@ -17,7 +17,7 @@ ifdef PLUGIN PLUGIN-$(MODULE) := plugins/$(PLUGIN_PREFIX)$(notdir $(MODULE))$(PLUGIN_SUFFIX) $(PLUGIN-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(PLUGIN_EXTRA_DEPS) $(MKDIR) plugins - $(CXX) $(PLUGIN_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) -o $@ + $(CXX) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@ PLUGIN:= plugins: $(PLUGIN-$(MODULE)) diff --git a/sound/adpcm.cpp b/sound/adpcm.cpp index 72564d7022..616ddd6cf9 100644 --- a/sound/adpcm.cpp +++ b/sound/adpcm.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/adpcm.h b/sound/adpcm.h index deab1f8e1c..8367a6d3f6 100644 --- a/sound/adpcm.h +++ b/sound/adpcm.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/aiff.cpp b/sound/aiff.cpp index 5d8d823756..a7489b21ff 100644 --- a/sound/aiff.cpp +++ b/sound/aiff.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/aiff.h b/sound/aiff.h index d2a5dc33fe..852d2074f1 100644 --- a/sound/aiff.h +++ b/sound/aiff.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/audiocd.cpp b/sound/audiocd.cpp index 2635c2a0a6..a3afcbfffd 100644 --- a/sound/audiocd.cpp +++ b/sound/audiocd.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -32,6 +35,8 @@ #include "common/util.h" #include "common/system.h" +DECLARE_SINGLETON(Audio::AudioCDManager); + namespace Audio { AudioCDManager::AudioCDManager() { diff --git a/sound/audiocd.h b/sound/audiocd.h index 281bf1b1b4..ba3e61289c 100644 --- a/sound/audiocd.h +++ b/sound/audiocd.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index 8b92f4f30e..eba02c74f3 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/audiostream.h b/sound/audiostream.h index 7536588894..f3791500f4 100644 --- a/sound/audiostream.h +++ b/sound/audiostream.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/flac.cpp b/sound/flac.cpp index 215ccee26e..2093108fb8 100644 --- a/sound/flac.cpp +++ b/sound/flac.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/flac.h b/sound/flac.h index 4b4acb3228..a949ffdf6a 100644 --- a/sound/flac.h +++ b/sound/flac.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/fmopl.cpp b/sound/fmopl.cpp index 18383f27e0..5b228d0fc4 100644 --- a/sound/fmopl.cpp +++ b/sound/fmopl.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 1999-2000 Tatsuyuki Satoh - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/fmopl.h b/sound/fmopl.h index 851fcae3a3..9b3ff0518f 100644 --- a/sound/fmopl.h +++ b/sound/fmopl.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 1999-2000 Tatsuyuki Satoh - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/iff.cpp b/sound/iff.cpp index 2fd6378b13..b7cab4e01a 100644 --- a/sound/iff.cpp +++ b/sound/iff.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/sound/iff.cpp $ + * $Id:iff.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/sound/iff.h b/sound/iff.h index 592cf9c2f0..f9b1f11ff7 100644 --- a/sound/iff.h +++ b/sound/iff.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/sound/iff.h $ + * $Id:iff.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index 8c2a64f808..a23e277f81 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mididrv.h b/sound/mididrv.h index 09d6e541d8..120b931170 100644 --- a/sound/mididrv.h +++ b/sound/mididrv.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/midiparser.cpp b/sound/midiparser.cpp index 7ad8f3bc1c..7d09f4ec0d 100644 --- a/sound/midiparser.cpp +++ b/sound/midiparser.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/midiparser.h b/sound/midiparser.h index a63b9ee10e..9587d1787f 100644 --- a/sound/midiparser.h +++ b/sound/midiparser.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/midiparser_smf.cpp b/sound/midiparser_smf.cpp index 400215f250..45d0e43182 100644 --- a/sound/midiparser_smf.cpp +++ b/sound/midiparser_smf.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/midiparser_xmidi.cpp b/sound/midiparser_xmidi.cpp index 2ee63d13a0..9e74c48f7e 100644 --- a/sound/midiparser_xmidi.cpp +++ b/sound/midiparser_xmidi.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mixer.cpp b/sound/mixer.cpp index f2ffc65ae6..d942c575ac 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mixer.h b/sound/mixer.h index a0a7c93aed..189fcb27f7 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mods/infogrames.cpp b/sound/mods/infogrames.cpp index 37bfbfe768..b577049657 100644 --- a/sound/mods/infogrames.cpp +++ b/sound/mods/infogrames.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mods/infogrames.h b/sound/mods/infogrames.h index c40f107947..7220c2bf9a 100644 --- a/sound/mods/infogrames.h +++ b/sound/mods/infogrames.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mods/module.cpp b/sound/mods/module.cpp index fdd20cc01f..3aea4797b7 100644 --- a/sound/mods/module.cpp +++ b/sound/mods/module.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project - * Based on code by madmoose +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mods/module.h b/sound/mods/module.h index 09c1e9b945..b25fe87b41 100644 --- a/sound/mods/module.h +++ b/sound/mods/module.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project - * Based on code by madmoose +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mods/paula.cpp b/sound/mods/paula.cpp index b534c334eb..53b8f867ea 100644 --- a/sound/mods/paula.cpp +++ b/sound/mods/paula.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mods/paula.h b/sound/mods/paula.h index b0c9bc96b8..0e89b78db6 100644 --- a/sound/mods/paula.h +++ b/sound/mods/paula.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mods/protracker.cpp b/sound/mods/protracker.cpp index 39c4ba7f8a..806df85b2b 100644 --- a/sound/mods/protracker.cpp +++ b/sound/mods/protracker.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project - * Based on code by madmoose +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mods/protracker.h b/sound/mods/protracker.h index 7fefddd20c..73955a723c 100644 --- a/sound/mods/protracker.h +++ b/sound/mods/protracker.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project - * Based on code by madmoose +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mods/rjp1.cpp b/sound/mods/rjp1.cpp index 8366137b0d..ab5d7430be 100644 --- a/sound/mods/rjp1.cpp +++ b/sound/mods/rjp1.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mods/rjp1.h b/sound/mods/rjp1.h index b9c9ab2a6c..d263d11897 100644 --- a/sound/mods/rjp1.h +++ b/sound/mods/rjp1.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mods/soundfx.cpp b/sound/mods/soundfx.cpp index 27e596ac3b..06104f4838 100644 --- a/sound/mods/soundfx.cpp +++ b/sound/mods/soundfx.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2007 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/sound/mods/soundfx.cpp $ + * $Id:soundfx.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/sound/mp3.cpp b/sound/mp3.cpp index f9efdc4e8c..642c2ba90a 100644 --- a/sound/mp3.cpp +++ b/sound/mp3.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mp3.h b/sound/mp3.h index d4992ce10f..17c521ef37 100644 --- a/sound/mp3.h +++ b/sound/mp3.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mpu401.cpp b/sound/mpu401.cpp index 22c4344bae..c390e807b2 100644 --- a/sound/mpu401.cpp +++ b/sound/mpu401.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/mpu401.h b/sound/mpu401.h index bbdb490585..34bde72a4b 100644 --- a/sound/mpu401.h +++ b/sound/mpu401.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/null.cpp b/sound/null.cpp index 6be4bd03ee..f8da1f2ece 100644 --- a/sound/null.cpp +++ b/sound/null.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/rate.cpp b/sound/rate.cpp index a48e5ac1f6..7d1a7b51cf 100644 --- a/sound/rate.cpp +++ b/sound/rate.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/rate.h b/sound/rate.h index 809e4308f8..b130153b75 100644 --- a/sound/rate.h +++ b/sound/rate.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/softsynth/adlib.cpp b/sound/softsynth/adlib.cpp index 15a99069be..d46309217a 100644 --- a/sound/softsynth/adlib.cpp +++ b/sound/softsynth/adlib.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/softsynth/emumidi.h b/sound/softsynth/emumidi.h index 43161e51e4..3876f69fa0 100644 --- a/sound/softsynth/emumidi.h +++ b/sound/softsynth/emumidi.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/softsynth/fluidsynth.cpp b/sound/softsynth/fluidsynth.cpp index 9d1d3d613e..486f6aaa08 100644 --- a/sound/softsynth/fluidsynth.cpp +++ b/sound/softsynth/fluidsynth.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/softsynth/mt32.cpp b/sound/softsynth/mt32.cpp index 52e9589b50..acf2f0805a 100644 --- a/sound/softsynth/mt32.cpp +++ b/sound/softsynth/mt32.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/softsynth/mt32/freeverb.cpp b/sound/softsynth/mt32/freeverb.cpp index 7c82779dd2..a364f4d45c 100644 --- a/sound/softsynth/mt32/freeverb.cpp +++ b/sound/softsynth/mt32/freeverb.cpp @@ -1,10 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2000 Jezar at Dreampoint - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * This code is public domain - * - * Parts of this code are: + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/softsynth/mt32/freeverb.h b/sound/softsynth/mt32/freeverb.h index bfa99470f5..53c5307c5a 100644 --- a/sound/softsynth/mt32/freeverb.h +++ b/sound/softsynth/mt32/freeverb.h @@ -1,10 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2000 Jezar at Dreampoint - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * This code is public domain - * - * Parts of this code are: + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/softsynth/ym2612.cpp b/sound/softsynth/ym2612.cpp index e48f44ebc0..5d36c9ec28 100644 --- a/sound/softsynth/ym2612.cpp +++ b/sound/softsynth/ym2612.cpp @@ -1,9 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * YM2612 tone generation code written by Tomoaki Hayasaka. - * Used under the terms of the GNU General Public License. - * Adpated to ScummVM by Jamieson Christian. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/softsynth/ym2612.h b/sound/softsynth/ym2612.h index 3d9bb5e50f..c3be131a91 100644 --- a/sound/softsynth/ym2612.h +++ b/sound/softsynth/ym2612.h @@ -1,9 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * YM2612 tone generation code written by Tomoaki Hayasaka. - * Used under the terms of the GNU General Public License. - * Adpated to ScummVM by Jamieson Christian. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/voc.cpp b/sound/voc.cpp index 2c235c05ca..c4f99bbf93 100644 --- a/sound/voc.cpp +++ b/sound/voc.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/voc.h b/sound/voc.h index 357ad73adb..ebd343f05d 100644 --- a/sound/voc.h +++ b/sound/voc.h @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/vorbis.cpp b/sound/vorbis.cpp index 7e9d9dc286..be15039aca 100644 --- a/sound/vorbis.cpp +++ b/sound/vorbis.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/vorbis.h b/sound/vorbis.h index 88ef913360..03d2496fe8 100644 --- a/sound/vorbis.h +++ b/sound/vorbis.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/wave.cpp b/sound/wave.cpp index a0f1f675fb..a55514fc71 100644 --- a/sound/wave.cpp +++ b/sound/wave.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/sound/wave.h b/sound/wave.h index 4c4c4ce644..0d9d89ff76 100644 --- a/sound/wave.h +++ b/sound/wave.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/tools/create_lure/create_lure_dat.cpp b/tools/create_lure/create_lure_dat.cpp index 109b4f268b..89a12be8e9 100644 --- a/tools/create_lure/create_lure_dat.cpp +++ b/tools/create_lure/create_lure_dat.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/tools/create_lure/create_lure_dat.h b/tools/create_lure/create_lure_dat.h index b3fd6d198a..ed66909cd8 100644 --- a/tools/create_lure/create_lure_dat.h +++ b/tools/create_lure/create_lure_dat.h @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/tools/create_lure/process_actions.cpp b/tools/create_lure/process_actions.cpp index 114d96f594..8a194f2ac5 100644 --- a/tools/create_lure/process_actions.cpp +++ b/tools/create_lure/process_actions.cpp @@ -1,5 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License |
