Commit graph

477 commits

Author SHA1 Message Date
Jonathan Gray
a5b1a8a2b5 Move the check for >= v5 further up the calling chain
for deciding whether we want to open an sfxfile.

svn-id: r18823
2005-09-14 10:49:53 +00:00
Jonathan Gray
2b9bf456de Only try opening SfxFile for >= v5 games.
svn-id: r18822
2005-09-14 10:38:07 +00:00
Gregory Montoir
6671e36d8b fixed crash in Sound::openSfxFile()
svn-id: r18771
2005-09-04 15:06:17 +00:00
Eugene Sandulenko
2a041601a5 Implement my own request #1091806 "SCUMM: Eliminate platform-specific targets".
.ini file gets auto-upgraded and user gets a warning to console. Old targets
are still present but get converted immediately. We could remove them maybe
after 2 releases.

Also demos targets were removed as well. Probably next target is HE demos.

I tried my best to test all combinations of files, but bugs still may be
present.

svn-id: r18765
2005-09-04 12:42:19 +00:00
Travis Howell
b0694e4120 The Venice music should not be played in FM TOWNS versions of indy3.
Confirmed by checking original game under UNZ.

svn-id: r18764
2005-09-04 04:18:36 +00:00
Travis Howell
a820400f8c Replace warnings with debug, errors or printfs:
-To catch any missing cases/functions used.
-To prevent users reporting warnings as bugs

svn-id: r18681
2005-08-14 01:41:52 +00:00
Jonathan Gray
603a5e4d6f Don't explicity check for tremor and vorbis everywhere and
require both USE_TREMOR and USE_VORBIS to be defined when
using tremor.

svn-id: r18642
2005-08-10 12:42:56 +00:00
Jonathan Gray
3c1b5648ae Rest of the changes required for tremor to actually work.
Based on patches against 0.7.1 by Jolan Luff.

svn-id: r18641
2005-08-10 06:16:26 +00:00
Eugene Sandulenko
6b4484472b Remove trailing whitespaces.
svn-id: r18604
2005-07-30 21:11:48 +00:00
Max Horn
8b1d7b9166 When including files from common/, explicitly use the common/ prefix
svn-id: r18444
2005-06-24 15:23:51 +00:00
Travis Howell
52a61dda39 The sound queue needs to be processed, before sfx queue in HE games, since speech is queued.
svn-id: r18330
2005-06-04 06:30:35 +00:00
Travis Howell
4821b9908f Only sound types 0 - 2 are used by FM Towns games.
svn-id: r18299
2005-05-30 08:03:23 +00:00
Max Horn
e3db264d89 cleanup
svn-id: r18251
2005-05-25 19:40:30 +00:00
Travis Howell
3833202950 Adjust for HE73.
svn-id: r18208
2005-05-21 14:28:21 +00:00
Travis Howell
3e0ec05ae6 Switch to errors, music/sound file is required in many games.
svn-id: r18203
2005-05-21 11:13:46 +00:00
Travis Howell
b575dba642 Remove newline from debug.
svn-id: r18168
2005-05-18 15:50:03 +00:00
Eugene Sandulenko
80ee8188d3 Improvements to --disable-* stuff. Now less ugly #ifdefs with #includes.
svn-id: r18100
2005-05-14 23:28:22 +00:00
Eugene Sandulenko
3588b96d4f Added --disable-hq and --disable-scumm-7-8 options. Also improved
DISABLE_HE so more HE-specific code gets excluded.

svn-id: r18099
2005-05-14 22:56:41 +00:00
Travis Howell
739e0640ad HE demos sometimes call music tracks that don't exist.
svn-id: r18080
2005-05-13 08:45:42 +00:00
Max Horn
2de46dc8eb Moved some more stuff to namespace Audio (enough for tonight)
svn-id: r18040
2005-05-11 00:01:44 +00:00
Max Horn
1a615346ab Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)
svn-id: r18039
2005-05-10 23:48:48 +00:00
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