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
32,188 Commits 45 Branches 139 Tags
57504cb699c98d3257d5cb39aa6971b6aacf211c
Commit Graph
61 Commits
Author SHA1 Message Date
Max Horn cbea1a1193 Added more GCC_PRINTF attributes, and fixed resulting warnings in format strings 
svn-id: r42054
 2009-07-03 10:40:49 +00:00
Eugene Sandulenko cda17beff5 Patch #1365914: "SCUMM: CMS support." Disabled by default. Still plenty to do. 
svn-id: r41282
 2009-06-06 18:21:49 +00:00
Max Horn 7d5f3e1714 Turned some static tables into static const tables; added some FIXME comments to global static vars that should be removed (many more exist in SCI, Tinsel, and some other engines) 
svn-id: r40908
 2009-05-26 11:30:21 +00:00
Travis Howell 4131d3d07f Fix sound noise regression in CD32 version of Simon the Sorcerer 1. 
svn-id: r36236
 2009-02-07 05:05:14 +00:00
Travis Howell 4e15c8df35 Fix bug #1925322 - DIG: Subtitle speed affects speech when subtitles are off. 
svn-id: r35820
 2009-01-11 06:15:30 +00:00
Max Horn 6837416556 Made Engine::_timer protected 
svn-id: r35543
 2008-12-25 20:53:59 +00:00
Christopher Page 45525e7d18 SCUMM: Fixed a memory leak in the SCUMM engine 
svn-id: r32680
 2008-06-12 19:43:54 +00:00
Jordi Vilalta Prat 38a8aa516e Allow static and dynamic plugins to be used at the same time 
svn-id: r31888
 2008-05-06 03:00:26 +00:00
Travis Howell a525b5bdd5 Allow mixed Adlib/MIDI mode in VGA version of SOMI. 
svn-id: r31483
 2008-04-11 08:13:47 +00:00
Jordi Vilalta Prat 66e9d4f5e8 Removed trailing spaces. 
svn-id: r30664
 2008-01-27 19:47:41 +00:00
Max Horn 3c5d0b1afb Enhanced support for Indy3 Mac sounds (added functionality disabled for now) 
svn-id: r29976
 2007-12-24 15:36:50 +00:00
Max Horn d973d3736c cleanup; workaround for bug #1852635 (INDY3 Mac: Crash When Playing Sound 54) 
svn-id: r29975
 2007-12-24 14:40:39 +00:00
Max Horn 138263ec03 cleanup 
svn-id: r29974
 2007-12-24 14:20:53 +00:00
Gregory Montoir c0920e0224 don't use str functions with binary data, should fix bug #1845760 
svn-id: r29752
 2007-12-07 23:39:19 +00:00
Nicola Mettifogo 258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated. 
svn-id: r28966
 2007-09-19 08:40:12 +00:00
Travis Howell feb07bb1d8 Fix disabling speech in FOA. 
svn-id: r28439
 2007-08-04 05:56:38 +00:00
Max Horn f4c0b853cc Fixed sound factory messup caused by my previous commit 
svn-id: r28111
 2007-07-15 19:24:00 +00:00
Max Horn a7e0fbe1a8 Fix for bug #1734064 (FOA: Speech volume can not be set) -- we played speech as SFX, not speech, in many SCUMM games 
svn-id: r27253
 2007-06-09 18:09:12 +00:00
Max Horn 218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots 
svn-id: r27024
 2007-05-30 21:56:52 +00:00
Paweł Kołodziejski ae7c640671 fixed warnings 
svn-id: r26506
 2007-04-15 15:40:24 +00:00
Max Horn 2447752a51 Reverted my roomoffs changes (broke the Loom intro), and instead added the constant RES_INVALID_OFFSET to indicate an invalid room offset 
svn-id: r26353
 2007-04-01 15:58:34 +00:00
Max Horn a08feb9f70 Got rid of some 0xFFFF -> 0xFFFFFFFF conversions and similiar nonsense by using a clever technique called 'signed ints' for room offsets (and this won't cause any regressions; any you may encounter are merely the products of a deranged imagination) 
svn-id: r26331
 2007-03-31 14:00:34 +00:00
Travis Howell 8e70329ce3 Fix level selection in PC Engine version of Loom. 
svn-id: r25954
 2007-03-03 23:02:54 +00:00
Torbjörn Andersson 60e0f7624a As Fingolfin pointed out, we no longer need two different CD timer intervals 
for Loom and everything else. Adjusted the value, taking advantage of the
greater timer resolution, and clarified which two scenes need to be tested if
we ever want to adjust this value further.

svn-id: r25731
 2007-02-19 21:09:23 +00:00
Travis Howell abd20d59fa Move SCUMM version checks for settings up monst.er.sou file, to higher level. 
svn-id: r25716
 2007-02-19 09:46:45 +00:00
Travis Howell dadaf08b29 Reduce amount of attempts to open various speech filenames. 
svn-id: r25644
 2007-02-17 01:23:52 +00:00
Max Horn 7b7c27bc0c SCUMM: Fix opening of *.tlk files 
svn-id: r25643
 2007-02-17 01:21:00 +00:00
Max Horn 6899e72be9 Got rid of GF_DIGI_IMUSE and GF_NEW_CAMERA 
svn-id: r25454
 2007-02-10 02:05:59 +00:00
Max Horn cb49cbdd45 * Reimplemented Mixer::pauseAll to simply invoke pause on all channels 
(implying change of semantics)
* Reordered the params of Mixer::playRaw (the SoundType now comes first, not last)
* Removed Mixer::isPaused
* Removed Mixer::getSoundElapsedTimeOfSoundID
* Added some doxygen comments to the Mixer

svn-id: r25356
 2007-02-03 19:05:53 +00:00
Torbjörn Andersson e61526555c More whitespace. 
svn-id: r24682
 2006-11-12 02:34:09 +00:00
Max Horn 9edf1e6a1a cleanup 
svn-id: r24407
 2006-10-21 12:44:10 +00:00
Max Horn 84874caf06 Got rid of ScummEngine::_confirmExit, and some other minor cleanup 
svn-id: r24319
 2006-10-15 00:50:22 +00:00
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