Commit Graph

506 Commits

Author SHA1 Message Date
Max Horn
b75c969e66 Moved class File and the MD5 stuff to namespace Common
svn-id: r18037
2005-05-10 22:56:25 +00:00
Travis Howell
bb8ca7e8ab Check that speech file is open.
svn-id: r18028
2005-05-10 08:42:23 +00:00
Travis Howell
c80f614981 Add a few more md5s
Set sfxMode mode for speech in HE games again.

svn-id: r17985
2005-05-09 00:42:11 +00:00
Travis Howell
f52ef27fe8 Should be an error now.
svn-id: r17966
2005-05-08 14:38:56 +00:00
Travis Howell
01b2f38670 HE games queue speech as sound resource 1.
svn-id: r17965
2005-05-08 14:31:27 +00:00
Travis Howell
cb6c2b9da5 Add extra cases for readdemo.
svn-id: r17879
2005-05-01 03:17:45 +00:00
Travis Howell
ce909a35b3 Some sound resources in soccer2004 are compressed too.
Add Moonbase demo, as testing target only.

svn-id: r17866
2005-04-29 15:33:07 +00:00
Travis Howell
3065bab0cb Add some basic support for pjgames.
svn-id: r17831
2005-04-27 04:47:02 +00:00
Travis Howell
8e36728526 No music file in lost/smaller.
svn-id: r17799
2005-04-25 05:59:01 +00:00
Travis Howell
9380304832 Read index of music file in HE games at startup.
Only reliable way to always get correct music tracks.

svn-id: r17798
2005-04-25 05:44:12 +00:00
Travis Howell
29532320c1 Corection a few more heversion checks, caused music regression.
svn-id: r17785
2005-04-24 10:26:31 +00:00
Max Horn
c46ea8bc40 Replaced the platform specific GF_FOO switches (using _platform instead now)
svn-id: r17716
2005-04-20 18:21:30 +00:00
Travis Howell
2009b72679 Replace all GF_HUMONGOUS use with _heversion.
Make HE60 specific to puttdemo, since it is unqie.
Other HE60 games changed to HE 61.

svn-id: r17698
2005-04-20 01:33:44 +00:00
Travis Howell
c3bc118dc8 Add RIFF sound type.
svn-id: r17688
2005-04-19 10:35:25 +00:00
Travis Howell
d4ba67a497 Use correct music offsets for HE games, only a few demos use wrong tunes now.
Get all music details for HE games from one function only.

svn-id: r17662
2005-04-18 07:18:33 +00:00
Travis Howell
e9be61a465 Disable again, some sounds loop forever.
svn-id: r17619
2005-04-16 11:31:00 +00:00
Max Horn
871e278f8b Reduce dependencies on scumm/util.h; modified ScummNESFile a bit so that it complies a bit better with our code formatting rules
svn-id: r17508
2005-04-10 12:59:17 +00:00
Max Horn
34098ae3c7 Simplify the substResFileName system a bit
svn-id: r17475
2005-04-09 11:59:43 +00:00
Travis Howell
4f08551643 Add comment to TODO
Check that string pointer exists, before reading data.
Don't attempt to play speech in soccer2004, since it uses compression.

svn-id: r17470
2005-04-09 07:25:41 +00:00
Max Horn
3d5b5f2ad8 Moved createResource, resourceStats, expireResources to ResourceManager
svn-id: r17420
2005-04-06 17:31:35 +00:00
Max Horn
9e2e00881f Renamed getActiveChannelSoundID to getSoundID and fixed its semantics to avoid race conditions
svn-id: r17377
2005-04-04 17:43:00 +00:00
Travis Howell
172e558050 Missed a function.
svn-id: r17374
2005-04-04 11:58:42 +00:00
Travis Howell
74c124628a Muddled ifs
svn-id: r17373
2005-04-04 11:47:38 +00:00
Travis Howell
f230fe65e8 Add 8 sound channel support for HE games
-Allows sound looping to work

Added support for WAVE format musuc used in later HE100 games.

svn-id: r17372
2005-04-04 11:43:25 +00:00
Max Horn
ac247c9b94 Started to move some resource related code into a new class ResourceManager (hypothetic goal for the future: use ResourceManager in ScummEx)
svn-id: r17311
2005-03-31 21:39:31 +00:00
Eugene Sandulenko
7ae3da082e Support for direct reading from NES ROM:
o extend MemoryReadStream with XOR facility
  o implement MemoryWriteStream
  o _fileHandle now is a reference to BaseScummFile class and is created on the fly
  o implement ScummNESFile class which is basically extract_mm_nes utility
  o update NES MM md5's due to above changes

NOTE: to run MM NES now you need to remove *.LFL files and (probably) rename
ROM to standard conventional name 'Maniac Mansion (XXX).nes'

svn-id: r17300
2005-03-30 21:59:12 +00:00
Travis Howell
c9424192c4 Fix spyozon regression
svn-id: r17113
2005-03-13 06:07:25 +00:00
Max Horn
7cd2cb2b17 PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method
svn-id: r17106
2005-03-12 18:56:09 +00:00
Travis Howell
7ee1a2d495 Broke HE music looping
svn-id: r17089
2005-03-12 11:06:07 +00:00
Travis Howell
c39a92933d Add key to toggle speech/subtitles
svn-id: r17082
2005-03-12 00:47:17 +00:00
Max Horn
0ec193b4be changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names
svn-id: r17052
2005-03-09 18:12:54 +00:00
Travis Howell
f5b493d735 Add HE sound todos
svn-id: r17050
2005-03-09 13:41:33 +00:00
Travis Howell
d2dab23510 Add HE100 difference in opcode.
svn-id: r17033
2005-03-08 03:52:02 +00:00
Torbjörn Andersson
d1f6a40583 Re-phrased comment to make it sound more like the fact it is and less like
a "FIXME".

svn-id: r16797
2005-02-15 10:32:55 +00:00
Torbjörn Andersson
e3ed9f7b32 This should keep ScummVM from trying to free invalid pointers. I hope.
svn-id: r16796
2005-02-15 08:15:35 +00:00
Travis Howell
0e1a22729b Correct sound TAG for Backyard sports games
Fix memory leak.

svn-id: r16789
2005-02-14 10:02:34 +00:00
Travis Howell
40768ac29d Add basic support for DISK index block in later HE games.
svn-id: r16784
2005-02-14 03:12:41 +00:00
Eugene Sandulenko
a9ceee26d8 Turned HE Mac resource filename generator into generall, whole SCUMM-purpose
method. Right now it is used to eliminate those Windows HE titles which
have different target base names.

If you want to use it, then define another entry in substDataFileNameTable[].
If your version with different base name has other features then you need
to define GF_MULTIPLE_VERSIONS for main entry and add any additional
entries to multiple_versions_md5_settings based on MD5 of the entry.

svn-id: r16764
2005-02-11 03:45:10 +00:00
Travis Howell
339df486e1 Ooops
svn-id: r16707
2005-01-30 11:10:50 +00:00
Travis Howell
bebad400d6 Check sound queue for music in HE games.
Avoid extra sound channel.

svn-id: r16706
2005-01-30 11:03:49 +00:00
Travis Howell
0199bf70fe Music regression in some HE games.
svn-id: r16705
2005-01-30 09:11:38 +00:00
Travis Howell
f23cf81ace HE100 difference
svn-id: r16703
2005-01-30 05:34:04 +00:00
Travis Howell
ee3baf60ec Speech filename difference in Macintosh version of HE60 games.
svn-id: r16699
2005-01-30 02:06:41 +00:00
Eugene Sandulenko
66c524f0ee Add support for Humongous Mac titles in native format. Please test :)
svn-id: r16693
2005-01-29 17:58:47 +00:00
Max Horn
abd12dd1b6 Use class Mutex instead of MutexRef
svn-id: r16679
2005-01-28 22:05:51 +00:00
Travis Howell
b9356bbe14 Check for negative sound offset.
svn-id: r16602
2005-01-20 12:56:27 +00:00
Max Horn
cffd917165 system.h was being included in tons of places, without any good reason; reduced this (total dependencies on system.h went down from 193 to 85 files)
svn-id: r16527
2005-01-10 22:06:49 +00:00
Max Horn
32f0dbdcb2 Moving AppendableAudioStream into SCUMM engine, as it is only used there
svn-id: r16494
2005-01-09 03:15:59 +00:00
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Max Horn
bc3b3517b2 Merge startSfxSound into startTalkSound
svn-id: r16338
2004-12-27 16:24:49 +00:00
Max Horn
67b311713d Added 'sound types' to the mixer - for now, only plain (for the premixer), SFX and music; volume is now controlled based on the sound type
svn-id: r16330
2004-12-27 00:27:00 +00:00
Max Horn
b93dd59a44 Reduce code size of resource.cpp to help PalmOS port, by moving util code to a new file util.cpp and sound resource code to sound.cpp
svn-id: r16105
2004-12-17 22:27:15 +00:00
Max Horn
3891c0fa39 change loadVOCFromStream to take a reference instead of a pointer (to a stream)
svn-id: r16035
2004-12-11 23:34:34 +00:00
Max Horn
10dd548b85 Changed parameter order of SoundMixer::playInputStream to match that of playRaw
svn-id: r15950
2004-11-28 23:02:28 +00:00
Travis Howell
cb12a2a0a1 Rename opcode
svn-id: r15581
2004-10-17 06:32:58 +00:00
Travis Howell
9005514601 Add initual sound looping support for HE 70+ games.
svn-id: r15538
2004-10-13 07:52:42 +00:00
Travis Howell
39fad0387b Unfortunately still not perfect.
svn-id: r15460
2004-10-08 01:07:44 +00:00
Max Horn
468758fa6c Use FM-TOWNS consistently
svn-id: r15345
2004-09-29 09:47:38 +00:00
Max Horn
ce8c99bf62 Rename remaining OSystem methods to match our coding guidelines
svn-id: r15332
2004-09-28 20:19:37 +00:00
Max Horn
6a50ba2308 Changed more of the actor class members to match our coding guidelines (in the future, when adding new member vars here, please always use our conventions, i.e. prefix them with _ and use CamelBackStyle
svn-id: r15331
2004-09-28 19:28:59 +00:00
Max Horn
92c17aecd4 Fix endian problems with some HE sound code; also: better code to determine the size of the SDAT chunk
svn-id: r15315
2004-09-27 23:38:19 +00:00
Max Horn
62ff56804c Fix memory leak
svn-id: r15221
2004-09-21 12:29:02 +00:00
Travis Howell
d7085acea1 Switch order to prevent warning
svn-id: r15213
2004-09-21 01:07:29 +00:00
Travis Howell
860d1c67a0 No longer needed.
svn-id: r15212
2004-09-21 01:04:09 +00:00
Travis Howell
dd45c42721 Ooops, was off by one again.
svn-id: r15200
2004-09-20 09:54:21 +00:00
Travis Howell
e22230e223 Actually check if a sound is active, if the sound is outside music engine.
Add some more HE differences

svn-id: r15188
2004-09-19 12:22:47 +00:00
Travis Howell
3605440f9a *** empty log message ***
svn-id: r15126
2004-09-15 12:14:25 +00:00
Travis Howell
d7ccfd0350 Ooops
svn-id: r15125
2004-09-15 12:12:43 +00:00
Travis Howell
dd78319ee0 A bit safer
svn-id: r15124
2004-09-15 11:56:07 +00:00
Travis Howell
fde215e106 Sound ids 10000 - 10008 seems to be sound channels in HE70+ games.
svn-id: r15085
2004-09-13 02:32:13 +00:00
Travis Howell
71866c1287 Correct HSHD sounds
svn-id: r14995
2004-09-10 12:07:53 +00:00
Travis Howell
3be4ae1d1d stubs
svn-id: r14930
2004-09-06 08:53:19 +00:00
Travis Howell
5a4548ed14 Not every speech file has the extra header.
svn-id: r14929
2004-09-06 07:54:26 +00:00
Travis Howell
35e364dc6e Skip extra speech header in HE 80+ games
svn-id: r14928
2004-09-06 07:31:51 +00:00
Travis Howell
8db0a7bb79 Caused music regression.
svn-id: r14901
2004-09-05 03:46:00 +00:00
Travis Howell
ae4105de50 Should use _numSounds too.
svn-id: r14886
2004-09-04 09:26:08 +00:00
Travis Howell
c4467d8e43 *** empty log message ***
svn-id: r14861
2004-09-02 07:00:57 +00:00
Travis Howell
0c5db81d0d Add extra sound check for HE games
svn-id: r14860
2004-09-02 04:23:13 +00:00
Travis Howell
a8a75eb009 HE games should check _numSounds to check whether sound type is music.
Set maximum resource idx at 8000 for now, some HE games include huge amounts of sound resources.

svn-id: r14859
2004-09-02 03:54:29 +00:00
Travis Howell
2a219cc701 HE 80+ speech files aren't encoded
svn-id: r14853
2004-09-01 06:21:07 +00:00
Travis Howell
e0bb88b91c Add some WIP code for HE games.
Add some music adjustments

svn-id: r14839
2004-08-30 11:52:33 +00:00
Travis Howell
8b34cb4a6a HE 7.0+ games don'yt use imuse
svn-id: r14837
2004-08-30 09:43:21 +00:00
Travis Howell
cbf5a60bab Add a few akos codes
Give unknown akos codes better names
Rename actor variable
Remove hack (Use multi-version flag instead)
Another sound correction for HE games.

svn-id: r14827
2004-08-29 11:27:16 +00:00
Travis Howell
4d4dd4fe02 Add some charset codes for HE 7.2 gasmes
Later HE 7.2 games use hard coded sound rate for speech (Rate never changes anyway)

svn-id: r14822
2004-08-29 01:24:17 +00:00
Travis Howell
0f71f50d37 Sound change for later HE 7.x games
Revert cursor change, later games have no .he3 file.
Add some stubs/opcodes
Later HE games use hard code value for _numRoomVariables

svn-id: r14808
2004-08-28 09:19:53 +00:00
Travis Howell
75fd690c20 Safety check
svn-id: r14804
2004-08-28 04:34:34 +00:00
Travis Howell
c89bfad61d Correct music skip value for HE 7.2
Play TALK sounds

svn-id: r14792
2004-08-27 00:08:43 +00:00
Travis Howell
6384093878 HE 7.2 games use @ as charset code
Small sound fix

svn-id: r14767
2004-08-26 10:51:11 +00:00
Travis Howell
b1d8b144ba More code/stubs for HE 7.2 games
Add another temp hack
Add id for water, uses more actors
Another small correction to music playback for HE 7.2 games

svn-id: r14764
2004-08-26 08:47:07 +00:00
Travis Howell
8e2e48e40c Add some stubs for HE 7.2
Fix warning
Add music support for later HE 7.2 games

svn-id: r14761
2004-08-26 06:08:41 +00:00
Travis Howell
bdd0dfef43 init var.
avoid valgrind warning

svn-id: r14722
2004-08-24 00:58:28 +00:00
Travis Howell
4f51ae9988 Basic start on freddemo (old version)
svn-id: r14685
2004-08-22 15:02:53 +00:00
Travis Howell
a13966d64c Switch to debug channel
svn-id: r14678
2004-08-22 09:30:08 +00:00
Max Horn
d35ef7c7f1 Removed some obsolete TODO comments
svn-id: r14669
2004-08-21 22:33:23 +00:00
Travis Howell
49d31d7fbe Missed a spot
svn-id: r14660
2004-08-21 04:15:03 +00:00
Travis Howell
3158a9c1d0 Missed one spot
svn-id: r14659
2004-08-21 03:35:08 +00:00
Travis Howell
d63d23ed07 Add patch #999887 - Possible fix for bug #998276
Also saves _currentMusic

svn-id: r14525
2004-08-09 01:07:48 +00:00
Travis Howell
dc476abe60 Fix bug #780922 - SAM: Conroy doesn't stop singing when escaping cutscene
svn-id: r14524
2004-08-09 00:58:21 +00:00
Max Horn
908723cc84 Load SMUSH files and NUT fonts from mac container files, too (done that by adding a new high level method openFile to class ScummEngine)
svn-id: r14346
2004-07-26 23:15:01 +00:00
Max Horn
f045cbf17c Add support for the mac (rescumm) container file format used by Sam&Max and DOTT, making it possible to play those directly from the original CDs (no game detector support yet, so you have to add them to your config file manually for now)
svn-id: r14342
2004-07-26 17:14:57 +00:00