thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
62317 commits 35 branches 0 tags 1.4 GiB
Commit graph

163 commits

Author SHA1 Message Date
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
Filippos Karapetis
1bbab8f191 Some renaming: 
getresourceManager -> getResourceManger
resourceManager -> resMan
segmentManager ->segMan

svn-id: r43908
 2009-09-02 12:02:37 +00:00
Max Horn
6c44eafa97 SCI: funct_nr is not used in 99% of all opcodes -- hide it in those (to be removed eventually) 
svn-id: r43905
 2009-09-02 11:33:25 +00:00
Walter van Niftrik
cf5483c3d8 SCI: Add SetCursor detection. Cleanup. 
svn-id: r43812
 2009-08-30 01:37:52 +00:00
Filippos Karapetis
ac025f4294 - Replaced more cases of EngineState parameters 
- Made some version comparisons for old SCI0 versions easier to read
- Removed the GET_SEL32SV macro

svn-id: r43729
 2009-08-25 15:14:29 +00:00
Filippos Karapetis
ed66cad677 - Simplified the parameters of some functions 
- Replaced some EngineState parameters
- The SCI version is now obtained from the resource manager or the segment manager, thereby simplifying several functions
- Plugged 2 leaks in the fallback detector
- Renamed the segment manager and resource manager to "segmentManager" and "resourceManager" in all places, for consistency

svn-id: r43722
 2009-08-25 08:38:14 +00:00
Walter van Niftrik
260a2019b6 SCI: Add autodetection for DoSound. Cleanup. 
svn-id: r43482
 2009-08-17 15:49:22 +00:00
Walter van Niftrik
00f4794c0a SCI: Stage 1 of the game detection overhaul. The end goal is to autodetect 
as much as possible. All SCI_VERSION_* information was removed from
detection.cpp (much of it was incorrect anyway).

svn-id: r43449
 2009-08-16 19:18:19 +00:00
Filippos Karapetis
31a0c80905 Moved the kernel and the vocabulary outside of the engine state (they're static data, which never changes during a game) 
svn-id: r42398
 2009-07-11 23:45:54 +00:00
Willem Jan Palenstijn
8dd3492194 SCI: don't let TimerSongIterator loop forever, and don't immediately 
signal completion when starting it. This fixes a sync issue with
the departing spaceship at the start of SQ4CD (after the intro).

svn-id: r42385
 2009-07-11 15:00:40 +00:00
Filippos Karapetis
2b5fac58d5 Applied patch 2818733 - "SCI: Timer iterator for audio resources played via doSound" 
svn-id: r42375
 2009-07-11 06:53:39 +00:00
Filippos Karapetis
a62b26ea80 Silenced the very chatty song iterator console messages by converting them to appropriate debug messages 
svn-id: r42240
 2009-07-07 20:43:27 +00:00
Filippos Karapetis
a9aaf56b3e Cleanup: added an enum for the auto-detected features, removed the selectors which are only used for auto-detection from the convenience selector map and placed feature auto-detection in a separate function. Also, now the automatically detected graphics resources are shown in the console. 
svn-id: r42212
 2009-07-07 11:14:18 +00:00
Filippos Karapetis
c716e43a2b - Added auto-detection for EGA graphics. As a result of this, GF_SCI1_EGA has been removed and versions SCI_VERSION_01_EGA and SCI_VERSION_01_VGA have been merged into SCI_VERSION_01 
- Simplified the checks for EGA and VGA graphics
- Fixed a bug in script_adjust_opcode_formats()
- Simplified the code in GfxResManager::getView() a bit

svn-id: r42206
 2009-07-07 07:44:25 +00:00
Filippos Karapetis
219b0de0d2 Renamed SCI_VERSION_01 -> SCI_VERSION_01_EGA 
svn-id: r42181
 2009-07-06 16:22:14 +00:00
Filippos Karapetis
30d1462da0 Swapped the music and audio resource check for SCI1.1 games. Digital sound effects are now preferred over the synthesized ones 
svn-id: r42179
 2009-07-06 15:50:44 +00:00
Filippos Karapetis
b38c5f8c5c Proper handling of sound effects marked as music resources 
svn-id: r42174
 2009-07-06 12:44:55 +00:00
Filippos Karapetis
250a1a915a When a song isn't found, send a "stop handle" event so that the engine won't wait forever (e.g. in SQ4CD, perhaps others) 
svn-id: r42172
 2009-07-06 11:33:28 +00:00
Filippos Karapetis
522b161bec Replaced sciprintf() calls with printf, DebugPrintf, warning and error calls 
svn-id: r42167
 2009-07-06 10:39:22 +00:00
Filippos Karapetis
c31d1b3180 - Fixed feature auto-detection for Conquests of Camelot 
- Auto-detected features are now printed in the console (to ease debugging)

svn-id: r42132
 2009-07-05 11:49:05 +00:00
Filippos Karapetis
230e7a8d2c Newer DoSound() semantics are now detected automatically, by the existence of the "setVol" selector. Removed game flag GF_SCI1_NEWDOSOUND 
svn-id: r42087
 2009-07-04 11:24:09 +00:00
Walter van Niftrik
1fb78d577f SCI: Moved audio code from AudioResource to the sfx core. 
svn-id: r41486
 2009-06-12 23:46:23 +00:00
Walter van Niftrik
5e68fbfe87 SCI: Moved SCI1 audio map handling into the resource manager. 
svn-id: r41408
 2009-06-09 19:18:48 +00:00
Walter van Niftrik
a6ed05740f SCI: Moved resource36 handling into resource manager. 
svn-id: r41349
 2009-06-07 19:15:55 +00:00
Max Horn
d07e9dfb13 SCI: Objectified SongLibrary 
svn-id: r41343
 2009-06-07 17:06:51 +00:00
Max Horn
f2ca788004 SCI: Renamed various song/songlib related structs and members 
svn-id: r41342
 2009-06-07 17:06:32 +00:00
Filippos Karapetis
3b687a7a04 Replaced KP_ALT, SKPV_OR_ALT and UKPV_OR_ALT 
svn-id: r41340
 2009-06-07 16:50:34 +00:00
Filippos Karapetis
744323ca33 Replaced/removed KP_UINT, KP_SINT, SKPV and UKPV as well as the VIEW_PRIORITY and PRIORITY_BAND_FIRST wrappers 
svn-id: r41338
 2009-06-07 15:53:30 +00:00