From f9bbc2ca37f40692d555d3b355209a7f2538afda Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Thu, 31 Oct 2013 07:25:25 +0200 Subject: SCI: Update ScummVM's game audio options for SCI1.1 CD games This ensures that ScummVM's game audio options for speech and subtitles get updated when they are changed in the game GUI --- engines/sci/sci.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/sci/sci.h') diff --git a/engines/sci/sci.h b/engines/sci/sci.h index 0a75e115fd..5f11d119bc 100644 --- a/engines/sci/sci.h +++ b/engines/sci/sci.h @@ -251,6 +251,7 @@ public: * - King's Quest 6 CD */ void syncIngameAudioOptions(); + void updateScummVMAudioOptions(); const SciGameId &getGameId() const { return _gameId; } const char *getGameIdStr() const; -- cgit v1.2.3 From f1abc0c302a8576415086626f6805acfe997459d Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Fri, 1 Nov 2013 13:25:31 +0100 Subject: SCI: improved patcher, inventory patch for kq6/mac Also added new debug flag for script patcher --- engines/sci/sci.h | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) (limited to 'engines/sci/sci.h') diff --git a/engines/sci/sci.h b/engines/sci/sci.h index 5f11d119bc..a487336f54 100644 --- a/engines/sci/sci.h +++ b/engines/sci/sci.h @@ -82,28 +82,29 @@ class GfxFrameout; // our engine debug levels enum kDebugLevels { - kDebugLevelError = 1 << 0, - kDebugLevelNodes = 1 << 1, - kDebugLevelGraphics = 1 << 2, - kDebugLevelStrings = 1 << 3, - kDebugLevelMemory = 1 << 4, - kDebugLevelFuncCheck = 1 << 5, - kDebugLevelBresen = 1 << 6, - kDebugLevelSound = 1 << 7, - kDebugLevelBaseSetter = 1 << 8, - kDebugLevelParser = 1 << 9, - kDebugLevelSaid = 1 << 10, - kDebugLevelFile = 1 << 11, - kDebugLevelTime = 1 << 12, - kDebugLevelRoom = 1 << 13, - kDebugLevelAvoidPath = 1 << 14, - kDebugLevelDclInflate = 1 << 15, - kDebugLevelVM = 1 << 16, - kDebugLevelScripts = 1 << 17, - kDebugLevelGC = 1 << 18, - kDebugLevelResMan = 1 << 19, - kDebugLevelOnStartup = 1 << 20, - kDebugLevelDebugMode = 1 << 21 + kDebugLevelError = 1 << 0, + kDebugLevelNodes = 1 << 1, + kDebugLevelGraphics = 1 << 2, + kDebugLevelStrings = 1 << 3, + kDebugLevelMemory = 1 << 4, + kDebugLevelFuncCheck = 1 << 5, + kDebugLevelBresen = 1 << 6, + kDebugLevelSound = 1 << 7, + kDebugLevelBaseSetter = 1 << 8, + kDebugLevelParser = 1 << 9, + kDebugLevelSaid = 1 << 10, + kDebugLevelFile = 1 << 11, + kDebugLevelTime = 1 << 12, + kDebugLevelRoom = 1 << 13, + kDebugLevelAvoidPath = 1 << 14, + kDebugLevelDclInflate = 1 << 15, + kDebugLevelVM = 1 << 16, + kDebugLevelScripts = 1 << 17, + kDebugLevelGC = 1 << 18, + kDebugLevelResMan = 1 << 19, + kDebugLevelOnStartup = 1 << 20, + kDebugLevelDebugMode = 1 << 21, + kDebugLevelScriptPatcher = 1 << 22 }; enum SciGameId { -- cgit v1.2.3 From 4e2b1f02001676663d9c66c3809bbc234519ee88 Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Wed, 20 Nov 2013 23:31:36 +0100 Subject: SCI: script patch for laura bow 2 for audio+text at the same time needs indepth testing --- engines/sci/sci.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/sci/sci.h') diff --git a/engines/sci/sci.h b/engines/sci/sci.h index a487336f54..c91606fbc9 100644 --- a/engines/sci/sci.h +++ b/engines/sci/sci.h @@ -245,12 +245,13 @@ public: * and we add this functionality in ScummVM: * - Space Quest 4 CD * - Freddy Pharkas CD + * - Laura Bow 2 CD * SCI1.1 games which don't support simultaneous speech and subtitles, * and we haven't added any extra functionality in ScummVM because extra * script patches are needed: - * - Laura Bow 2 CD * - King's Quest 6 CD */ + bool speechAndSubtitlesEnabled(); void syncIngameAudioOptions(); void updateScummVMAudioOptions(); -- cgit v1.2.3 From 8bdffcb2fb7aefc96aa10fde1bebd372233cac9d Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Wed, 4 Dec 2013 20:42:16 +0100 Subject: SCI: script patcher is now a separate class --- engines/sci/sci.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/sci/sci.h') diff --git a/engines/sci/sci.h b/engines/sci/sci.h index c91606fbc9..418f8c5e50 100644 --- a/engines/sci/sci.h +++ b/engines/sci/sci.h @@ -55,6 +55,7 @@ class AudioPlayer; class SoundCommandParser; class EventManager; class SegManager; +class ScriptPatcher; class GfxAnimate; class GfxCache; @@ -269,6 +270,7 @@ public: bool hasMacIconBar() const; inline ResourceManager *getResMan() const { return _resMan; } + inline ScriptPatcher *getScriptPatcher() const { return _scriptPatcher; } inline Kernel *getKernel() const { return _kernel; } inline EngineState *getEngineState() const { return _gamestate; } inline Vocabulary *getVocabulary() const { return _vocabulary; } @@ -400,6 +402,7 @@ private: const ADGameDescription *_gameDescription; const SciGameId _gameId; ResourceManager *_resMan; /**< The resource manager */ + ScriptPatcher *_scriptPatcher; /**< The script patcher */ EngineState *_gamestate; Kernel *_kernel; Vocabulary *_vocabulary; -- cgit v1.2.3 From 8fc7d60febcadcaff901b331c5d1f454c073aef2 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 18 Feb 2014 02:34:24 +0100 Subject: SCI: Make GPL headers consistent in themselves. --- engines/sci/sci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/sci/sci.h') diff --git a/engines/sci/sci.h b/engines/sci/sci.h index 418f8c5e50..48bc4819d2 100644 --- a/engines/sci/sci.h +++ b/engines/sci/sci.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- cgit v1.2.3