Commit Graph

29 Commits

Author SHA1 Message Date
Max Horn
d02e4d7f7c Removed CHECK_HEAP
svn-id: r23979
2006-09-23 11:29:32 +00:00
Max Horn
51017cf1b2 Renamed ScummEngine::res to _res and allocate the ResourceManager on the heap (i.e. _res is a pointer now)
svn-id: r23922
2006-09-17 20:36:48 +00:00
Max Horn
723ec24093 Turned some sound conversion methods into static functions (cleanup)
svn-id: r23854
2006-09-09 17:21:19 +00:00
Torbjörn Andersson
49a2f44944 Applied my own patch #1508018. I don't know for sure that it's exactly right,
but it improves the Adlib sound effects in early games, e.g. the door opening
and closing sounds in Indy 3 and MI1 floppy. There still appears to be some
kind of looping/repeating mechanism that we don't implement, though.

svn-id: r23204
2006-06-20 21:36:09 +00:00
Torbjörn Andersson
2462289c50 Updated comments to correspond with recent Adlib renamings.
svn-id: r23166
2006-06-18 10:06:45 +00:00
Torbjörn Andersson
02f1555dbe Added missing (but unimportant) breaks to switch default cases.
svn-id: r23161
2006-06-18 06:23:22 +00:00
Torbjörn Andersson
2531fd5873 Added player for the Kyra 3 VQA cutscenes, based on my earlier prototype. It
could use some cleanup, and there are a couple of TODOs sprinkled throughout
the code, but it seems to work reasonably well. Until the Kyra 3 main menu is
implemented, it won't actually be used though.

It uses the appendable audio stream class, which I have moved out of the SCUMM
engine.

svn-id: r22526
2006-05-18 21:46:07 +00:00
Max Horn
27307acd7c Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio
svn-id: r22231
2006-04-29 22:33:31 +00:00
Max Horn
e80d24aa22 Some more cleanup in class Scumm::Sound
svn-id: r22125
2006-04-23 23:00:32 +00:00
Max Horn
f776b903d1 Fix access to .he2 in Sound::openSfxFile, too
svn-id: r22119
2006-04-23 21:58:01 +00:00
Max Horn
d68f95b3be Move HE specific stuff from class Sound to its new subclass SoundHE
svn-id: r22115
2006-04-23 18:52:39 +00:00
Max Horn
0891a91acc Change some uses of ScummFile to the more generic BaseScummFile
svn-id: r22113
2006-04-23 17:47:40 +00:00
Max Horn
4b6f90945b Modified openFile and openResourceFile to take a Common::String instead of a char pointer
svn-id: r22112
2006-04-23 17:39:31 +00:00
Max Horn
0d67640a58 Behold, the new SCUMM detector finally has arrived. Unified detection & engine instantiation, reduced code duplication, more powerful detection in case MD5 is not known / can't be computed, and many other nifty improvements.
svn-id: r22110
2006-04-23 17:33:16 +00:00
Eugene Sandulenko
8fa9bd6728 Removed extra exclamation marks in warning() calls as well.
svn-id: r21608
2006-04-04 22:21:10 +00:00
Travis Howell
f9797f3ac3 Correct mistake in md5 tables for Simon the Sorcerer 2 (DOS Floppy)
svn-id: r21219
2006-03-12 00:53:30 +00:00
Travis Howell
259e3cf301 Adjust talk sound check in CHARSET_1(), since processSfxQueues() doesn't exist in HE games. Fixes glitch when time machine is used in putttime.
svn-id: r21195
2006-03-10 06:05:49 +00:00
Jamieson Christian
5e25b3b679 Restructured IMuse and IMuseInternal.
* IMuse is no longer a concurrency front-end.
* IMuseInternal now derives from IMuse.
* Common::StackLock used to protect thread-sensitive interface methods (same as IMuseDigital).
* clear_queue() included in stopAllSounds() so it can be removed from the public interface.
* Game ID now specified at init using property().
* Timer callbacks receive a struct containing IMuseInternal and MidiDriver refs, instead of just the latter.
* OSystem pointer from init is now cached and used instead of global.

All references to the g_system and g_scumm globals are now gone. BOOYAH!

Tested with MI2, DOTT and S&M, under Windows, in Native MIDI, Adlib, and Mixed modes. No regressions or concurrency issues observed. Manifestations of the latter are the biggest concern at this point.

svn-id: r21104
2006-03-05 21:30:44 +00:00
Max Horn
feeaa2c35e Removed unnecessary strcpy calls
svn-id: r21071
2006-03-04 12:34:14 +00:00
Max Horn
bb38ea2c17 Renamed SubstResFileNames::winName and macName to almostGameID / expandedName (the old names were misleading; the new ones aren't great either :)
svn-id: r21062
2006-03-04 10:38:05 +00:00
Max Horn
bac32d1a5c Moved ScummFile etc. to the new file.cpp / file.h
svn-id: r21038
2006-03-03 15:16:02 +00:00
Max Horn
2ae0f79de3 Split SCUMM's generateSubstResFileName into two functions: findSubstResFileName and applySubstResFileName
svn-id: r20879
2006-02-25 17:36:32 +00:00
Max Horn
6914121f61 Replaced MKID by MID_BE in most places in the SCUMM engine
svn-id: r20862
2006-02-25 02:12:58 +00:00
Max Horn
81e8a2860e Moved iMUSE code to the new directory engines/scumm/imuse/
svn-id: r20801
2006-02-20 20:57:26 +00:00
Max Horn
e389bcf497 Replaced _gameId, _version, _heversion, _features, _midi, _platform with a simple ScummGameSettings instance: _game
svn-id: r20795
2006-02-20 16:51:30 +00:00
Travis Howell
37cc74db39 Use simplier method of checking sound status in HE60/61 games
svn-id: r20723
2006-02-16 08:47:19 +00:00
Travis Howell
448ea4f16e Only DOS & Macintosh versions of HE60/61 games require XMIDI support
svn-id: r20720
2006-02-16 06:00:46 +00:00
Travis Howell
e77fc9b9aa Clear sound queue when stopping sound channel in HE games
svn-id: r20718
2006-02-16 05:52:39 +00:00
Max Horn
26ee630756 Moved engines to the new engines/ directory
svn-id: r20582
2006-02-11 22:45:04 +00:00