Commit graph

98 commits

Author SHA1 Message Date
Max Horn
1baa7e30d0 cleanup
svn-id: r6836
2003-03-18 22:07:49 +00:00
Max Horn
0602882b18 cleanup
svn-id: r6832
2003-03-18 16:13:52 +00:00
Max Horn
8073abd096 clean up / some more sanity checks
svn-id: r6760
2003-03-08 00:05:27 +00:00
Max Horn
7ec34ab1a9 refactored some stuff (and made readMAXS virtual, with V2/V3 code having own implementations); cleaned up V6 array shuffle code; made more Scumm member vars/methods protected
svn-id: r6751
2003-03-07 21:38:46 +00:00
Paweł Kołodziejski
39510ce4cc changed voice buffer allocation to needed size
svn-id: r6737
2003-03-07 07:49:10 +00:00
Paweł Kołodziejski
26144eda33 decreased sound buffer for imuse digital, bundle music, and cmi smush audio
svn-id: r6735
2003-03-07 06:41:44 +00:00
Max Horn
dd24a5d797 overlooked one
svn-id: r6730
2003-03-07 01:36:42 +00:00
Max Horn
7222d05d68 uhh - code did modify ptr, then free() it (even before my change, which exposed the problem by always freeing, not just upon errors
svn-id: r6729
2003-03-07 01:35:54 +00:00
Max Horn
fd2e1c2413 fixed memory leak (1 MB each time a bundle sound was plyed... ouch)
svn-id: r6728
2003-03-07 01:21:55 +00:00
Paweł Kołodziejski
aa3766018f updated copyrights headers
svn-id: r6726
2003-03-06 21:46:56 +00:00
Paweł Kołodziejski
093428ae9a and more cleanup
svn-id: r6718
2003-03-06 17:58:13 +00:00
Jonathan Gray
91786c253d add bundle file names for comi demo, and only add .IMX when playing the full version
svn-id: r6688
2003-03-04 06:10:07 +00:00
Jonathan Gray
d31b7439e1 we were reading 8 bytes too much on DIGI sounds
svn-id: r6648
2003-03-01 13:32:45 +00:00
Jonathan Gray
88906b0360 hacky support for humongous talkie format
svn-id: r6646
2003-03-01 12:44:52 +00:00
Jonathan Gray
0e5a19e13e change rate for humongous DIGI sounds to 11025
svn-id: r6644
2003-02-28 11:32:43 +00:00
Max Horn
5863805e2c more stuff made 'protected'
svn-id: r6592
2003-02-08 00:38:17 +00:00
Jonathan Gray
b5d15825d3 revert part of the no sound device present stuff that was causing speech to finish prematurely
svn-id: r6583
2003-02-03 12:59:54 +00:00
James Brown
afec98c655 Stop the sound que stuff erroring(). This code was nasty, it LET itself write out of bounds -then- error()'ed. Youch.
There is still a problem, as this warning will come up quite frequently - leading me to believe the que is not being processed
properly?

svn-id: r6564
2003-01-29 04:00:45 +00:00
Paweł Kołodziejski
dc7a876136 added "implementation" of imGetMusicPosition
svn-id: r6550
2003-01-26 14:26:03 +00:00
James Brown
8d9b84b98e Patch 671701: SO_TALK_FREQUENCY
svn-id: r6547
2003-01-26 10:54:34 +00:00
Paweł Kołodziejski
091c7089f8 added assert for voice samples
svn-id: r6541
2003-01-25 20:01:23 +00:00
Paweł Kołodziejski
8e8575003b implemented properly comi sound codecs
svn-id: r6538
2003-01-25 18:41:32 +00:00
Paweł Kołodziejski
d942441f7f applied patch #674141: CMI: Smush sync tuning
svn-id: r6537
2003-01-25 12:13:41 +00:00
James Brown
5f7cd1c93d LCA'03 commit: Fix talking where no sound hardware is present
svn-id: r6536
2003-01-24 06:41:10 +00:00
Jonathan Gray
846d73c536 patch #670660 by Daniel Schepler, properly handle disc switching wrt voice file in comi
svn-id: r6522
2003-01-20 05:59:25 +00:00
Paweł Kołodziejski
050a3fcd12 fix compilation under VC6
svn-id: r6494
2003-01-18 14:00:59 +00:00
James Brown
35d3d26f0c Fix old-game resource error dialog
svn-id: r6441
2003-01-13 13:13:36 +00:00
James Brown
374e3a3f26 Fix ComI music bundle switching on disk change
svn-id: r6434
2003-01-12 19:15:30 +00:00
Paweł Kołodziejski
a8f4c821cf added missing SYNC opcode
svn-id: r6380
2003-01-10 08:25:16 +00:00
James Brown
9df455ce38 Plop in some better disk switching code for CMI - I have no idea how well this will work transitioning from a disk1 room to a disk2
room in-game, but it works for bootparams and saved games..

svn-id: r6322
2003-01-02 10:36:17 +00:00
Max Horn
d59dc6cf17 endian fix
svn-id: r6318
2003-01-01 20:59:59 +00:00
Max Horn
cdeaf66794 cleaned up soundKludge
svn-id: r6303
2002-12-31 21:56:58 +00:00
Paweł Kołodziejski
edacf91d7f fixed play CMI music
svn-id: r6246
2002-12-29 01:28:44 +00:00
Paweł Kołodziejski
8969d5e59c added missing return
svn-id: r6243
2002-12-28 21:55:32 +00:00
Paweł Kołodziejski
3102fd42e3 added more stuff for CMI music
svn-id: r6241
2002-12-28 21:46:49 +00:00
Max Horn
b794c3c375 fixed warning
svn-id: r6238
2002-12-28 16:38:15 +00:00
Paweł Kołodziejski
9d664c9003 added 16 bits samples to playVoice
svn-id: r6235
2002-12-28 15:48:37 +00:00
Paweł Kołodziejski
642cfec556 fix playVoice
svn-id: r6234
2002-12-28 15:42:44 +00:00
Paweł Kołodziejski
b90ef60f2a added CMI sound codec
svn-id: r6232
2002-12-28 15:02:23 +00:00
James Brown
540667567e Voice sample support, again missing a required codec
svn-id: r6195
2002-12-27 12:10:22 +00:00
James Brown
d3ade5b23e Add skeleton music support for CMI (but codec not implemented)
svn-id: r6193
2002-12-27 11:47:00 +00:00
Max Horn
c44512ff71 added FIXME comment
svn-id: r6178
2002-12-26 22:02:58 +00:00
Max Horn
ad7fefd34e map V8 talk opcodes to the right V6 opcodes; however, talking still locks up after the first sentence is uttered (looking into that now); various cleanup; added a guess at VAR_EGO (based on what cmidec says is the 'default_actor')
svn-id: r6176
2002-12-26 21:50:13 +00:00
Max Horn
004ea9f8eb converted heaps of int16 to int for V8 compatibility; fixed defineArray for V8; added some work in o8_kludge2
svn-id: r6132
2002-12-25 14:46:39 +00:00
Jamieson Christian
50b69cb2db Fixed inappropriate expiration of sound resources,
which fixes concurrency issues esp. in PocketPC and MorphOS.
Stubbed SysEx command 2 (start of song) to get rid of annoying warning.
Changed MT-32 instrument warnings to fit on one (80-char) line.

svn-id: r5842
2002-12-05 21:45:55 +00:00
Max Horn
1a97719ae5 fix warning when compiling w/o vorbis/mp3 support
svn-id: r5603
2002-11-19 01:52:22 +00:00
Jamieson Christian
5da9c10dab Fixes to Master/SFX/Music volumes:
- All are in 0-255 range now. No 0-127 mismatches.
- Master volume now affects SFX and Music, consistent with LEC behavior.
- The [ and ] keys now affect Music volume, not Master. Consistent with LEC behavior.
Also changed [ and ] increment to 16, for 256/16 = 16 volume increments outside the GUI.

svn-id: r5592
2002-11-17 17:59:00 +00:00
Max Horn
775adc7a4f more initialisation fixes
svn-id: r5533
2002-11-13 15:08:22 +00:00
Max Horn
973032dd90 fixed warnings
svn-id: r5425
2002-11-05 21:29:44 +00:00
Max Horn
4bde7140a2 fix for bug #633082; added some asserts to catch similiar problems in the future
svn-id: r5417
2002-11-05 13:39:09 +00:00