Commit Graph

506 Commits

Author SHA1 Message Date
Max Horn
2ce2bac35c cleanup
svn-id: r20300
2006-01-29 17:47:38 +00:00
Travis Howell
4d8861b909 Fix memory leak on exit.
svn-id: r20212
2006-01-27 08:39:29 +00:00
Travis Howell
548961ecc3 A
Fix memory leaks in HE games on exit.

svn-id: r20208
2006-01-27 06:05:03 +00:00
Max Horn
ec476b1fd0 Removing GID_ZAK256 and GID_LOOM256
svn-id: r20153
2006-01-23 20:09:25 +00:00
Max Horn
0b39c0ea9f Fix various incorrect usages of the word 'target' instead of 'gameid'; change the ambigiuous 'GameSettings::name' to 'GameSettings::gameid'
svn-id: r20115
2006-01-21 13:01:20 +00:00
Eugene Sandulenko
ea42bad781 Update copyright notice
svn-id: r20088
2006-01-18 17:39:49 +00:00
Travis Howell
b88a79750b Sound queue order is different in HE72+ games.
Fixes wrong music been played in some locations.

svn-id: r20075
2006-01-18 06:06:14 +00:00
Travis Howell
4f286a4bcc Add support for another sound flag in HE games.
svn-id: r20045
2006-01-15 11:19:15 +00:00
Travis Howell
ad14c53110 Add SegaCD platform and remove SegaCD specific game Id.
svn-id: r20015
2006-01-14 09:28:38 +00:00
Travis Howell
97a3e7c06d A few fixes for sound opcodes in HE games.
svn-id: r20010
2006-01-14 04:29:30 +00:00
Travis Howell
202b739c36 No longer used by HE games.
svn-id: r19940
2006-01-07 23:53:38 +00:00
Travis Howell
86bc87c70a Adjustments to createSound().
svn-id: r19925
2006-01-06 05:40:40 +00:00
Travis Howell
5e7ef4dea6 Fix sound resource loading in HE games.
The main resource header and size was been cut off in some cases.

svn-id: r19916
2006-01-05 11:38:45 +00:00
Travis Howell
5551e5d14c Enable sound priority in HE games.
svn-id: r19910
2006-01-05 07:49:52 +00:00
Travis Howell
e01afb0bd4 Initial support for sound code in HE games.
Split HE sound functions into separate file.

svn-id: r19909
2006-01-05 07:06:47 +00:00
Travis Howell
27877ad89e Update comments
Add missing akos case.

svn-id: r19905
2006-01-04 05:03:46 +00:00
Max Horn
60fcd5a171 * Replaced MDT_PREFER_NATIVE/MDT_NATIVE by MDT_PREFER_MIDI/MDT_MIDI).
* Changed MidiDriver::createMidi so that if MD_ADLIB is passed, it
  now *does* instantiate the adlib driver.
* Rewrote MidiDriver::detectMusicDriver (code should be clearer now,
  and hopefully easier to adapt/maintain). Note that the behavior
  changed slightly (this may require some tweaking).
* Added MidiDriver::findMusicDriver which works similar to the old
  MidiDriver::parseMusicDriver but returns the full MidiDriverDescription
  and ignores all characters in the passed driver name following a colon ":".
* Changed MidiDriver::parseMusicDriver to use MidiDriver::findMusicDriver.
* Changed game engines to match the changes made to MidiDriver.
* Modified SCUMM engine to not record the selected midi/music driver
  (in _midiDriver), but rather the music *type* (in _musicType).

svn-id: r19859
2005-12-30 14:18:21 +00:00
Max Horn
e173a05e46 Revert to warnings when certain music/speech files aren't found
svn-id: r19630
2005-11-17 23:41:53 +00:00
Max Horn
c1ff7c8367 Workaround for bug #1311447
svn-id: r19268
2005-10-23 14:21:20 +00:00
Travis Howell
53e08e9a70 Remove talkSound from the sound queue in HE games, when stopping the talkSound.
Fixes bad talkSound in freddi when changing rooms.

svn-id: r19263
2005-10-23 13:16:39 +00:00
Max Horn
2e6b615c91 Make sure error message is consistent regardless of endianess
svn-id: r19258
2005-10-23 11:14:25 +00:00
Max Horn
b5e63f5bfb Turn class Sound into a Serializable
svn-id: r19225
2005-10-21 23:04:58 +00:00
Eugene Sandulenko
37fbcf61ad Fix MS IMA ADPCM decoder. I like Microsoft so much for reinventing another
standard.

svn-id: r19203
2005-10-21 02:00:12 +00:00
Travis Howell
3fbfad767c -Allow no speech in HE games.
-Added extra XMIDI control change cases for HE61 games.

svn-id: r19193
2005-10-20 14:08:35 +00:00
Eugene Sandulenko
12a66937cc Fix crash in ADPCM decoder.
svn-id: r19167
2005-10-19 05:16:50 +00:00
Eugene Sandulenko
4306c9344c Improved IMA ADPCM decoder. It appeared that MS violated yet another standard
and nibbles order in samples appeared to be swapped. Had to untemplate
whole thing over again because I have no idea how to speicalize one of two
parameters in templates.

Now voices are clean but have some ticks, looks like overload. ITE wasn't
broken ;)

svn-id: r19166
2005-10-19 04:59:18 +00:00
Eugene Sandulenko
13246d0dad Attempt to play IMA ADPCM speech in later HE games. For some reason
sound is noisy and all samples are cut in half. mplayer plays it with
same format without any noise but still half sample. It may happen
that original just played 2 consecutive samples or we read them wrong
from resources.

svn-id: r19165
2005-10-19 03:29:55 +00:00
Eugene Sandulenko
b36677af71 Update FSF address. Eek. Actually that took place on May 1, 2005
svn-id: r19142
2005-10-18 01:30:26 +00:00
Travis Howell
e077fdd9ed Rename & update opcode in C64 maniac.
Remove unused SCUMM vars in C64 maniac

svn-id: r18873
2005-09-24 05:26:12 +00:00
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