ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
137,148 Commits 45 Branches 139 Tags
de151ea3fddd6a2d36a41400a55366bd2a6a94de
Commit Graph
190 Commits
Author SHA1 Message Date
Max Horn bb528d894c SCI: Rewrap some overlong comments 
svn-id: r50012
 2010-06-18 09:37:06 +00:00
Filippos Karapetis 2d61dd8608 Fixed invalid memory access in SQ6 
svn-id: r49986
 2010-06-18 01:38:08 +00:00
Filippos Karapetis 9c1ec81d76 Strict mode: Turned several severe errors (almost all detection related) into errors, instead of warnings 
svn-id: r49972
 2010-06-17 23:45:38 +00:00
Filippos Karapetis 0e365131ac Fixed wPlayAudio, and added some documentation on the 3 new kDoAudio subops. Digital sounds in Pharkas work again 
svn-id: r49928
 2010-06-17 12:29:58 +00:00
Filippos Karapetis f4739f9f68 Added debug output to kDoAudio and some music commands. Also added a warning when an audio stream can't be created. Finally, the debug level of the MIDI parser debug output has been raised to 4, as it's too verbose 
svn-id: r49605
 2010-06-12 11:41:22 +00:00
Matthew Hoops 9f907aac09 kSciAudioWPlay should not actually play the song, but 'pre-load' it. We fake the pre-loading with a flag that will return 0 if the song has been called with kSciAudioWPlay. Fixes the dream sequence sound in MUMG. 
svn-id: r49583
 2010-06-10 20:26:59 +00:00
Filippos Karapetis 93f33c7dab Resolved a FIXME with getSciLanguage(), by creating a separate setter. Also, some camelCase changes 
svn-id: r49568
 2010-06-10 11:18:10 +00:00
Filippos Karapetis 83f31e4e44 Added the number of parameters passed in unknown kDoAudio subops 
svn-id: r49083
 2010-05-18 15:52:45 +00:00
Max Horn 975dbef0e5 SCI: Remove sound/audio.h include from engine/state.h 
svn-id: r48063
 2010-02-15 00:20:53 +00:00
Filippos Karapetis 07e405588d Moved the reference to AudioPlayer inside SciEngine (as it doesn't have a state, per se, and is static) 
svn-id: r48059
 2010-02-14 12:23:22 +00:00
Max Horn b9a11ddb0b SCI: Move language related code from EngineState to SciEngine 
svn-id: r48052
 2010-02-13 17:46:44 +00:00
Max Horn 9575cc08a2 SCI: Move GameFeatures from EngineState to SciEngine 
svn-id: r48049
 2010-02-13 17:44:58 +00:00
Max Horn a82939c9be SCI: Get rid of EngineState::resMan 
svn-id: r48048
 2010-02-13 17:44:19 +00:00
Filippos Karapetis 2fb37063a4 Placed all the game feature detection code in a separate class 
svn-id: r47850
 2010-02-03 11:02:43 +00:00
Matthew Hoops 12d983eaf4 Make EngineState::getLanguage() check from the resource manager as to what language it has loaded before checking from what ScummVM has set and make kDoAudio use EngineState::getLanguage() 
svn-id: r47782
 2010-01-31 22:14:35 +00:00
Walter van Niftrik 1d50acaa50 SCI: Handle -1 properly when passed as a language id to DoAudio 
svn-id: r47774
 2010-01-31 19:45:51 +00:00
Lars Skovlund 39ebb168a1 SCI: Make SQ6 sound work. The meaning of these extra parameters is not yet understood. 
svn-id: r47660
 2010-01-28 23:11:55 +00:00
Johannes Schickel aed02365ec Strip trailing spaces/tabs. 
svn-id: r47541
 2010-01-25 01:39:44 +00:00
Filippos Karapetis 84cd8d2dc7 Renamed /gui to /graphics and /sfx to /sound, to better illustrate their purpose 
svn-id: r47007
 2010-01-05 01:22:16 +00:00
Martin Kiewitz 44dc3f9bfb SCI: kDoAudio now also clips volume and adjusts to mixer volume 
svn-id: r46852
 2010-01-01 21:26:46 +00:00
Martin Kiewitz 2a9e835695 SCI: Added TODO within kDoAudio 
svn-id: r46847
 2010-01-01 20:26:18 +00:00
Filippos Karapetis 0de0abb5d3 Case kSciAudioLanguage in kDoAudio always checks for audio capability in SCI1.1 games, regardless of parameters. Fixes a warning in SQ4CD 
svn-id: r46584
 2009-12-26 13:50:52 +00:00
Filippos Karapetis 0c1b646c7f - Started wrapping the current sound code around appropriate defines 
- Introduced a new resource type, SoundResource, used in the new music code

svn-id: r46421
 2009-12-19 16:19:53 +00:00
Filippos Karapetis e2985a4173 Removed sfx/misc.h 
svn-id: r45885
 2009-11-14 03:15:20 +00:00
Filippos Karapetis fbfafb576e Started objectifying kDoSound() 
svn-id: r45862
 2009-11-12 15:24:11 +00:00
Filippos Karapetis 1f49679db5 Moved the audio related command enums inside audio.h 
svn-id: r45676
 2009-11-05 00:04:53 +00:00
Matthew Hoops d2b76368e1 Fix CD Audio in JonesCD and add some comments. 
svn-id: r45669
 2009-11-04 15:41:40 +00:00
Filippos Karapetis 7d00c4a7f1 Moved the audio CD handling code inside the AudioPlayer class. Some cleanup 
svn-id: r45656
 2009-11-04 11:22:46 +00:00
Filippos Karapetis 2dbf6662fc Moved the sound sync code inside the AudioPlayer class 
svn-id: r45655
 2009-11-04 10:20:25 +00:00
Filippos Karapetis 611f5dd95f Moved sound sync related variables inside the AudioPlayer class and fixed compilation 
svn-id: r45654
 2009-11-04 09:49:28 +00:00
Filippos Karapetis 597524b255 Moved most of the code for playing sound effects and speech into a separate class 
svn-id: r45653
 2009-11-04 09:36:18 +00:00
Filippos Karapetis ff284c9f5b Remove unused includes when INCLUDE_OLDGFX is not set. Implemented the full screen updates that the current menu code is doing using new graphics functions (still unfinished). Some cleanup. 
svn-id: r45536
 2009-10-30 12:33:05 +00:00
Matthew Hoops 55e0efeb8f Add support for CD Audio in Jones in the Fast Lane CD and KQ6 CD. 
svn-id: r45367
 2009-10-25 03:26:20 +00:00
Filippos Karapetis 93517e7649 Applied a modified version of patch #2881486 - "Add volume changing to SCI" 
svn-id: r45329
 2009-10-22 07:18:37 +00:00
Martin Kiewitz c6d2086815 SCI: kDoSound typo fixed 
svn-id: r45238
 2009-10-18 20:33:02 +00:00
Martin Kiewitz cdcd465a95 SCI: kDoSound doesnt reset nodePtr on fade anymore, fixes lsl5 endless music loop at patti exam scene 
svn-id: r45237
 2009-10-18 20:30:31 +00:00
Max Horn f3ab3051d8 SCI: Make the implicit segMan param to GET_SEL32(V) and PUT_SEL32(V) explicit 
svn-id: r45234
 2009-10-18 19:42:56 +00:00
Max Horn 8191c04056 SCI: Merge some sfx related global funcs into SfxState. 
This allows us to get rid of "static SfxPlayer *s_player".

svn-id: r45038
 2009-10-13 18:51:59 +00:00
Walter van Niftrik b2a148e12c SCI: Fix hang in KQ6 book worm scene 
svn-id: r44889
 2009-10-11 02:47:07 +00:00
Max Horn 6ad5840181 SCI: Rename EngineState::segMan to _segMan 
svn-id: r44629
 2009-10-04 18:38:18 +00:00
Max Horn 8ba75fc522 Fix code formatting (esp. 'if(' -> 'if (' etc., but also indention and other things) 
svn-id: r44495
 2009-09-30 16:16:53 +00:00
Filippos Karapetis f9296a6445 - Changed the unimplemented debug SCI kernel functions (InspectObj, ShowSends, ShowObjs, ShowFree, StackUsage and Profiler) to be dummy functions - we have our own debugger, and don't use these functions for debugging 
- Removed the function number parameter from all kernel functions, as it's no longer needed, and removed the FAKE_FUNCT_NR hack
- Removed kUnknown() and kStub()
- Dummy/unknown kernel functions are no longer invoked, and a warning is shown instead, with the paremeters passed to them

Note: there is an evil hack used for debugging scripts in invoke_selector(), which probably no longer works now

svn-id: r44461
 2009-09-29 14:24:07 +00:00
Filippos Karapetis 180b3f1247 Create a define for the special "signal" offset used throughout the engine, and fixed the arbitrary 0 values from commit #44294, set when some math functions do invalid calculations 
svn-id: r44359
 2009-09-25 16:15:57 +00:00
Johannes Schickel ade3204b56 Fix warnings. 
svn-id: r44304
 2009-09-24 13:59:09 +00:00
Filippos Karapetis 13ad217cdd - Moved the SCI version in a global variable 
- Changed all the SCI version checks to use getSciVersion()
- Also made getSciVersionDesc a global function (removes some ugly accessing of the SCI engine)

The fallback detector should work correctly now

svn-id: r44269
 2009-09-23 10:55:35 +00:00
Max Horn 9651562e72 SCI: Rename WAS_FUNCT_NR to FAKE_FUNCT_NR; turn some #defines into enums 
svn-id: r44169
 2009-09-17 16:49:31 +00:00
Filippos Karapetis 15cb36a7ee Made is_object() a method of the segment manager 
svn-id: r44042
 2009-09-12 17:42:04 +00:00
Max Horn 029e3a5703 SCI: cleanup 
svn-id: r43984
 2009-09-06 12:59:34 +00:00
Max Horn d04b5d2c9b SCI: Rename resManager -> resMan; segManager -> segMan 
svn-id: r43980
 2009-09-06 12:57:42 +00:00
Walter van Niftrik dd0ebb7116 SCI: Reset signal before playing song. 
svn-id: r43940
 2009-09-04 14:57:27 +00:00