Commit Graph

3967 Commits

Author SHA1 Message Date
Paweł Kołodziejski
cd0c2dfdeb _allreadyInit was not initializedin smush player
svn-id: r13919
2004-06-01 20:28:20 +00:00
Paweł Kołodziejski
3f5c651551 better fix for unloaded sound resources in imuse digi
svn-id: r13918
2004-06-01 20:22:48 +00:00
Paweł Kołodziejski
136c7593d2 fix for imuse digi bug 952775
svn-id: r13917
2004-06-01 19:32:36 +00:00
Gregory Montoir
60954319fe minor changes
svn-id: r13916
2004-06-01 17:56:33 +00:00
Travis Howell
6c0f223440 HE games use slightly different E1 opcode
Move HE7 specific opcodes to he7, as requested.

svn-id: r13915
2004-06-01 08:37:57 +00:00
Eugene Sandulenko
654099e7d6 Preliminary versions of HE opcodes kernelGetFunctions and
kernelSetFunctions. Somewhat buggy.

svn-id: r13914
2004-06-01 06:38:36 +00:00
Eugene Sandulenko
4c8c01fa41 Forgot to commit
svn-id: r13913
2004-05-31 15:07:10 +00:00
Travis Howell
0552b10590 Switch to _heversion
svn-id: r13911
2004-05-31 08:56:49 +00:00
Eugene Sandulenko
f3014b9f4c Add stub for HE o6_quitPauseRestart.
svn-id: r13908
2004-05-31 08:44:04 +00:00
Eugene Sandulenko
50b39e3095 Added separate HE versioning.
svn-id: r13907
2004-05-31 08:24:05 +00:00
Nicolas Bacca
72b01684a7 Remove unnecessary WinCE tweaks
svn-id: r13901
2004-05-30 13:03:35 +00:00
Paweł Kołodziejski
b559e5e58f apply mixer vol/pan at first time
svn-id: r13897
2004-05-28 20:46:50 +00:00
Torbjörn Andersson
ddc104d4ef Use the same volume and panning values when starting the sound as when
adjusting these values later. I don't know about the volume thing, but I've
noticed that new sounds would often play their first fraction of a second
in the right speaker only. This change should fix that.

svn-id: r13896
2004-05-28 14:42:49 +00:00
Paweł Kołodziejski
5c9fd89feb forgot it
svn-id: r13894
2004-05-26 17:09:12 +00:00
Paweł Kołodziejski
5edb86d6bd decreased usage of stack mutex locks for imuse digital
svn-id: r13893
2004-05-26 17:03:31 +00:00
Paweł Kołodziejski
916dec37ac moved stacklock to allocSlot() from startSound(). there is no need lock track which is not yet used
svn-id: r13853
2004-05-23 21:28:32 +00:00
Paweł Kołodziejski
a6fd5a3fa9 ops
svn-id: r13852
2004-05-23 19:44:10 +00:00
Paweł Kołodziejski
a26cfc8a38 some optimisations in imuse digi
svn-id: r13851
2004-05-23 19:32:11 +00:00
Travis Howell
f7a06d2d54 COMI demo doesn't auto set this var.
svn-id: r13838
2004-05-15 01:14:35 +00:00
Max Horn
14cc9b6e3e fix warning
svn-id: r13836
2004-05-13 19:33:24 +00:00
Paweł Kołodziejski
576e2986dd back to old method
svn-id: r13832
2004-05-11 06:23:51 +00:00
Paweł Kołodziejski
8d86693893 forgot to remove
svn-id: r13805
2004-05-07 07:40:37 +00:00
Travis Howell
628a4cb3c3 Simpler check
svn-id: r13804
2004-05-07 07:33:10 +00:00
Paweł Kołodziejski
b672cf26fb increase a little limit for better lipsync
svn-id: r13803
2004-05-07 07:32:17 +00:00
Torbjörn Andersson
701bd797b7 Only access VAR_VOICE_MODE if there actually is one.
svn-id: r13802
2004-05-07 06:54:47 +00:00
Travis Howell
e78421b66c Fix bug #910216
svn-id: r13798
2004-05-06 10:07:17 +00:00
Travis Howell
163dc349b6 Fix insane regression.
svn-id: r13774
2004-05-04 14:56:47 +00:00
Paweł Kołodziejski
eec8b61b8d tuned a little
svn-id: r13754
2004-05-02 17:48:30 +00:00
Paweł Kołodziejski
8e56e7b0bb - fix for cuting voices in comi,
- fix for lipsync stuff (compromise append buffer ahead to sync position)

svn-id: r13753
2004-05-02 16:46:51 +00:00
Torbjörn Andersson
fb1b2efb49 Applied my suggested fix for #933168, since I'm tired of waiting for
feedback. It *is* a bit of a hack, but it does emulate the old behaviour,
and we can always make a better fix later, if there is one.

svn-id: r13747
2004-05-02 14:39:48 +00:00
Paweł Kołodziejski
7da4eccb1d enabled save/load code for imuse digital
svn-id: r13746
2004-05-02 14:03:21 +00:00
Paweł Kołodziejski
f6b8830158 forgot it
svn-id: r13745
2004-05-02 13:58:57 +00:00
Paweł Kołodziejski
ffb842c026 this too
svn-id: r13743
2004-05-02 13:17:02 +00:00
Paweł Kołodziejski
8c6f3ddc0a changed from int to int32 to be sure
svn-id: r13742
2004-05-02 13:15:33 +00:00
Paweł Kołodziejski
7701fece20 disabled reset state while change bundle disks
svn-id: r13741
2004-05-02 13:06:40 +00:00
Paweł Kołodziejski
6c682fcfba fixed two arrays
svn-id: r13740
2004-05-02 12:52:19 +00:00
Paweł Kołodziejski
351eaff329 start only used tracks
svn-id: r13739
2004-05-02 12:46:01 +00:00
Paweł Kołodziejski
8bdab25b7a ops
svn-id: r13738
2004-05-02 12:23:51 +00:00
Paweł Kołodziejski
054acfbbd3 added rest of save/load code
svn-id: r13737
2004-05-02 12:20:55 +00:00
Paweł Kołodziejski
24ccdb85e9 ops
svn-id: r13736
2004-05-02 11:53:10 +00:00
Paweł Kołodziejski
b877df6da4 added some save/load code (in progress)
svn-id: r13735
2004-05-02 11:49:08 +00:00
Paweł Kołodziejski
cdc7324951 stub for digital imuse save/load
svn-id: r13734
2004-05-02 10:07:59 +00:00
Paweł Kołodziejski
78f2d34825 remove useless mutex
svn-id: r13722
2004-05-01 18:53:03 +00:00
Paweł Kołodziejski
0b86e3e69c - update names
- remove nonused access to atributes sequence in comi

svn-id: r13721
2004-05-01 18:36:13 +00:00
Paweł Kołodziejski
319ae4deed cleanup
svn-id: r13659
2004-04-28 05:39:53 +00:00
Paweł Kołodziejski
1e83b30b98 that is not need anymore
svn-id: r13656
2004-04-27 17:31:28 +00:00
Torbjörn Andersson
707e9a403b Fixed warning by removing unused variable.
svn-id: r13650
2004-04-27 09:53:44 +00:00
Paweł Kołodziejski
88643e3363 imuse audio stream are use dynamic append size now
svn-id: r13647
2004-04-26 21:29:49 +00:00
Jamieson Christian
4ee0365a23 Tweaked a few things to accommodate
MSVC6's idiosyncracies.

svn-id: r13644
2004-04-26 20:28:34 +00:00
Paweł Kołodziejski
e256a54205 fixed logic code bug. it should not try start sound if not free slot
svn-id: r13641
2004-04-26 19:30:12 +00:00
Paweł Kołodziejski
f90a2a30c2 locking resource sounds while using them to prevent expire
svn-id: r13640
2004-04-26 19:22:27 +00:00
Paweł Kołodziejski
17332e393e added mutex into smush player
svn-id: r13639
2004-04-26 09:04:08 +00:00
Paweł Kołodziejski
883fdfdb7c rename
svn-id: r13638
2004-04-26 08:58:03 +00:00
Paweł Kołodziejski
2ee813b7c2 forgot it
svn-id: r13637
2004-04-26 08:17:19 +00:00
Paweł Kołodziejski
6ca5f9a38e mixer buffer size depend on format of sound, it's 1 second timed buffer
svn-id: r13636
2004-04-26 08:06:53 +00:00
Paweł Kołodziejski
32d7c8c181 fixed stopping imuse sounds
svn-id: r13635
2004-04-26 07:47:12 +00:00
Paweł Kołodziejski
d2aa9b91b5 fixed cue music in FT
svn-id: r13633
2004-04-26 06:26:18 +00:00
Paweł Kołodziejski
bdf9867041 added some indexed comments
svn-id: r13632
2004-04-26 05:18:45 +00:00
Paweł Kołodziejski
7251d5324e - added workaround for strange regions length in some FT voc samples
- increased regions up to 70

svn-id: r13631
2004-04-25 19:51:46 +00:00
Paweł Kołodziejski
cc5fb7fc58 dropped pull method for imuse
svn-id: r13628
2004-04-25 17:24:17 +00:00
Max Horn
0773177bba Fix regression in DIG demo
svn-id: r13627
2004-04-25 16:54:59 +00:00
Max Horn
f9cd78cedd Workaround for bug #864030 (COMI: ASCII 0xb (11) not handled)
svn-id: r13621
2004-04-25 13:34:19 +00:00
Max Horn
e39cfbd864 Updated the 'report to fingolfin' message
svn-id: r13620
2004-04-25 13:22:09 +00:00
Max Horn
a0647bd6b4 Patch #937443 (Monkey Island SegaCD Sound Fix), and some changes by me
svn-id: r13619
2004-04-24 20:57:42 +00:00
Paweł Kołodziejski
bcb5005c31 few corrections, more debug
svn-id: r13618
2004-04-24 20:41:30 +00:00
Paweł Kołodziejski
be28bc0403 add check if track is meanwhile stoped
svn-id: r13617
2004-04-24 20:02:17 +00:00
Paweł Kołodziejski
5241ae7368 forgot removed hack
svn-id: r13616
2004-04-24 20:00:15 +00:00
Paweł Kołodziejski
24e49664e4 in pull method code also
svn-id: r13615
2004-04-24 16:17:10 +00:00
Paweł Kołodziejski
415a0f6880 c&p bug, it should not break loop but continue
svn-id: r13614
2004-04-24 16:15:01 +00:00
Paweł Kołodziejski
443d7ec553 fixed bug related to regions. sound of status for remove should not processed anymore
svn-id: r13613
2004-04-24 15:58:51 +00:00
Paweł Kołodziejski
e369538e34 free slot and return NULL when it can't open bundle file
svn-id: r13612
2004-04-24 15:33:36 +00:00
Torbjörn Andersson
14f74bb568 Increased _numNewNames to 150. Judging by bug #941275 it wasn't enough to
increase it to 100, like we did recently.

svn-id: r13611
2004-04-24 12:54:02 +00:00
Jonathan Gray
d044393235 remove old zak256 target, if you're still using this its time to start using the zakTowns target
svn-id: r13604
2004-04-23 09:23:17 +00:00
Torbjörn Andersson
dfe25fbfd8 Added note that the previous commit probably fixed bug #933610 as well.
svn-id: r13599
2004-04-20 07:21:25 +00:00
Torbjörn Andersson
ac967bde63 Increased _numNewNames from 50 to 100 to prevent overflow in MI2 endgame.
This should fix bug #936323. (There are still some game versions that use
50, but that can be fixed later, if the need arises.)

svn-id: r13598
2004-04-20 07:10:13 +00:00
Max Horn
9defe4fc18 Removed XOR encoding stuff from File class; instead the new Scumm::XORFile class provides this functionality now
svn-id: r13597
2004-04-17 16:29:03 +00:00
Travis Howell
9b904682b1 Amiga Monkey Island 1 sound update from Quietust:
Allows MP3 music support in demo and full game.

svn-id: r13593
2004-04-17 07:22:02 +00:00
Max Horn
f8d9bc6bcd Revert debug levels
svn-id: r13590
2004-04-16 21:05:09 +00:00
Max Horn
bcb7878f10 Unify some code
svn-id: r13589
2004-04-16 20:49:14 +00:00
Chris Apers
5af7979f0b Fixed illegal access to protected/private member on PalmOS (??)
svn-id: r13588
2004-04-16 12:47:55 +00:00
Jonathan Gray
0a1cefb04e Fix regression introduced with the mac loom copy protection changes in rev 1.155, afaik all non mac versions of loom should be using that check not just pc. Fixes bug #934913
svn-id: r13581
2004-04-16 05:48:31 +00:00
Torbjörn Andersson
2de9cbf9fd Changed the type of value from char to int8. Otherwise, if char happens to
be unsigned, the test for if value == -31 will always fail.

svn-id: r13580
2004-04-15 15:56:21 +00:00
Paweł Kołodziejski
fae6675c5b forgot that
svn-id: r13578
2004-04-14 06:37:00 +00:00
Paweł Kołodziejski
6ea29bc7f8 added support for compressed FOBJ chunks in smush movie files.
the *.san files from 'data' dir in FT can NOT be compressed !

svn-id: r13577
2004-04-13 19:20:16 +00:00
Paweł Kołodziejski
6c94b42f90 added experimental and buggy pull method to imuse, it's disabled by default, to enable uncoment in dimuse.h define #ENABLE_PULLMETHOD
svn-id: r13571
2004-04-13 06:29:34 +00:00
Paweł Kołodziejski
8d6a1c1245 disabled wait in stopAllSounds in imuse digital, it can cause deadlock
svn-id: r13562
2004-04-12 13:34:34 +00:00
Max Horn
fd3ff5b58a Workaround for bug #847827 (FOA: Wrong sprite z-order at specific place)
svn-id: r13553
2004-04-11 23:19:19 +00:00
Max Horn
8fc35a9a84 Fixing up the mess I made out of the branches <sigh>
svn-id: r13551
2004-04-11 22:20:41 +00:00
Max Horn
560ab5384c oops
svn-id: r13550
2004-04-11 22:13:20 +00:00
Max Horn
e4942c4b69 Oops! Accidentally copied the HEAD sound.cpp into the 0.6.0 branch
svn-id: r13548
2004-04-11 20:55:46 +00:00
Paweł Kołodziejski
f41e7a1e81 pull not pool
svn-id: r13547
2004-04-11 18:58:50 +00:00
Paweł Kołodziejski
f489a2ae75 pull not pool
svn-id: r13546
2004-04-11 18:57:44 +00:00
Paweł Kołodziejski
b05cc19d0d add initial code for pull procedure
svn-id: r13545
2004-04-11 18:56:32 +00:00
Paweł Kołodziejski
908e80060d forgot that
svn-id: r13544
2004-04-11 18:07:03 +00:00
Paweł Kołodziejski
3a04ee24cd exclude for FT sound loops
svn-id: r13543
2004-04-11 14:56:11 +00:00
Paweł Kołodziejski
def44acc6f implemented 'fade buffers' stuff
svn-id: r13542
2004-04-11 14:48:50 +00:00
Max Horn
26c8f9340d Fix for bug #907266 (MI Mac Music Bug)
svn-id: r13540
2004-04-11 12:31:46 +00:00
Travis Howell
25df782332 Allow copy protection in FOA (Disk) to be enabled.
svn-id: r13536
2004-04-11 04:20:09 +00:00
Paweł Kołodziejski
a3aead899e special case for 384x242 smush resolution for ft pc demo, it use additional buffer
svn-id: r13532
2004-04-10 09:17:36 +00:00
Max Horn
2bc99154fb oops
svn-id: r13530
2004-04-10 01:45:00 +00:00
Max Horn
d78e9bb0ac cleanup
svn-id: r13529
2004-04-10 00:51:12 +00:00
Max Horn
a78fb36798 cleanup
svn-id: r13528
2004-04-10 00:17:42 +00:00
Max Horn
3b7af85adf Cleanup Sound constructor; change search order of SFX files
svn-id: r13527
2004-04-10 00:07:58 +00:00
Paweł Kołodziejski
95c17148ae fixed 'region' code
svn-id: r13526
2004-04-09 21:44:29 +00:00
Paweł Kołodziejski
6d4839d376 it seems to be needed for comi too, hmm
svn-id: r13525
2004-04-09 21:42:37 +00:00
Paweł Kołodziejski
e795a7ce65 revert
svn-id: r13523
2004-04-09 18:19:22 +00:00
Paweł Kołodziejski
c4383474cf refreshScripts only for full game dig, and cmi demo
svn-id: r13522
2004-04-09 18:18:42 +00:00
Paweł Kołodziejski
c2e0647f6a -fix for dig demo
-handle some music opcodes without filename

svn-id: r13514
2004-04-09 06:17:20 +00:00
Paweł Kołodziejski
5763122a69 back refreshScript only for DIG, add stopping music while changing bundle
svn-id: r13513
2004-04-09 05:43:24 +00:00
Paweł Kołodziejski
d368d2e7fa refreshScript was wrong used
svn-id: r13512
2004-04-09 04:56:18 +00:00
Paweł Kołodziejski
5f89f5b2b7 correction for stoping sequence
svn-id: r13511
2004-04-09 04:20:17 +00:00
Paweł Kołodziejski
6a175f294c rename to _nextSeqToPlay
svn-id: r13510
2004-04-09 03:57:18 +00:00
Max Horn
333a2aaea8 Fix for bugs #929722 (MI2: Difficulty selection screen regression) and #930385 (Subtitles are not shown correctly) by changing restoreCharsetBg() to only restore the screen area which is actually masked by text
svn-id: r13508
2004-04-08 23:43:30 +00:00
Max Horn
3dcd7bbfa8 Record on which virtual screen we last drew masked text
svn-id: r13507
2004-04-08 23:41:10 +00:00
Max Horn
2b94290c97 cleanup
svn-id: r13506
2004-04-08 23:38:09 +00:00
Max Horn
650dc2117c seems it is 'endianness' and not 'endianess'
svn-id: r13504
2004-04-08 22:46:46 +00:00
Paweł Kołodziejski
263bd0d0e7 another fix
svn-id: r13503
2004-04-08 22:46:22 +00:00
Paweł Kołodziejski
6da153dc12 fix for music code
svn-id: r13502
2004-04-08 21:59:40 +00:00
Paweł Kołodziejski
83b7d7f84c fix for region code
svn-id: r13501
2004-04-08 21:13:25 +00:00
Chris Apers
5ab0ba430b Can't do that on PalmOS, exit is event based
svn-id: r13499
2004-04-08 11:48:35 +00:00
Max Horn
bf0e879aa1 Semi-experimental change: revised _hasMask handling -> simpler code (after removing those FIXME's that is :-), which should still produce identical results (let's wait for the regressions rolling in :-)
svn-id: r13498
2004-04-08 01:38:07 +00:00
Paweł Kołodziejski
c210064420 ops and forgot :)
svn-id: r13496
2004-04-07 17:49:22 +00:00
Paweł Kołodziejski
ad65c8e6b2 corections to music code
svn-id: r13492
2004-04-07 07:17:16 +00:00
Max Horn
fa87f49784 cleanup
svn-id: r13490
2004-04-06 22:02:02 +00:00
Paweł Kołodziejski
2b9311aa26 - split imuse digital code,
- cleanup a little,
- added pool method for FT voc sample from resource,
- make struct sync, jump, regions dynamic memory allocation

svn-id: r13486
2004-04-06 19:46:43 +00:00
Max Horn
86dd5c56f6 voice_volume is now speech_volume
svn-id: r13485
2004-04-06 18:42:53 +00:00
Torbjörn Andersson
349f63ebfc Changed "voice_volume" to "speech_volume" for consistency with the Broken
Sword games. (The digial iMUSE code still calls it voice volume, though.)

svn-id: r13483
2004-04-06 11:50:35 +00:00
Paweł Kołodziejski
b973869456 that is not needed anymore
svn-id: r13481
2004-04-06 06:20:51 +00:00
Paweł Kołodziejski
1470818bc0 that is not needed anymore
svn-id: r13480
2004-04-06 06:19:52 +00:00
Max Horn
cc954a70ae Fix for bug #929724 (MI2: Intro regression) -> since _outheight can be negative, negative y values aren't filtered out automatically anymore, so we have to explicitly check for them
svn-id: r13478
2004-04-06 01:06:54 +00:00
Max Horn
92301bff74 Replaced FIXME with proper explanation and code (the previous hack was actually correct, just incomplete)
svn-id: r13477
2004-04-05 23:56:28 +00:00
Max Horn
17fe0497f5 Renamed StringTab::backup to StringTab::_default, as that describes better what it does
svn-id: r13476
2004-04-05 23:54:58 +00:00
Max Horn
ce8099c89f Paranoid fix for potential 64bit issue; some possibly useful debug output added
svn-id: r13474
2004-04-05 22:02:58 +00:00
Paweł Kołodziejski
f44291f6b6 remove usage VAR_SYNC. in scripts used only one time, it's set to 0
svn-id: r13472
2004-04-05 20:07:04 +00:00
Paweł Kołodziejski
924f47ccdd there is no imuse in he engine
svn-id: r13470
2004-04-05 18:54:51 +00:00
Paweł Kołodziejski
74d902c62b removed exception for no used nut font
svn-id: r13469
2004-04-05 18:45:40 +00:00
Paweł Kołodziejski
f141ad488b added voice group volume to scumm engine for imuse digital and implemeted volume groups control
svn-id: r13468
2004-04-05 18:24:36 +00:00
Max Horn
781809ee2b pedantic const correction
svn-id: r13467
2004-04-05 00:24:26 +00:00
Max Horn
18b35e57c8 these debug() calls look as if they should be debugC() calls
svn-id: r13466
2004-04-04 23:29:10 +00:00
Max Horn
21b81b9ef4 Fix signedness issue (lead to incorred address computations on 64 bit machines)
svn-id: r13465
2004-04-04 22:43:54 +00:00
Max Horn
71bbdbfae4 Removed CharsetRenderer::_mask (this was used to optimize charset mask handling). This shouldn't cause any noticable slowdowns, but allows us to get rid of two nasty hacks, and fixes bug #895355 (DIG: Subtitles sometimes stay on the screen), maybe also others
svn-id: r13464
2004-04-04 20:20:09 +00:00
Max Horn
749d75cdcb Added TODO/FIXME comment
svn-id: r13463
2004-04-04 19:50:52 +00:00
Max Horn
4de4353c39 My recent change to _draw_bottom caused a regression in The Dig (and maybe elsewhere). Ah well, probably better to draw one line more than one line less anyway
svn-id: r13462
2004-04-04 19:41:02 +00:00
Max Horn
70237e74c9 Implement V8 queryQuit opcode
svn-id: r13461
2004-04-04 19:24:03 +00:00
Max Horn
d859bebb90 Fix for last part of bug #766749 (COMI: Text should not always have a shadow): do not draw shadow for charset 3
svn-id: r13460
2004-04-04 19:17:28 +00:00
Max Horn
5858a919a2 allow disabling of text shadow in NUT font renderer
svn-id: r13459
2004-04-04 18:07:26 +00:00
Max Horn
f1ee3c0163 let compiler optimize code better <g>
svn-id: r13458
2004-04-04 17:56:30 +00:00
Max Horn
55bbd875db Exit quietly if we just told the user we are going to exit; no need to call error() (which pops up the console etc.)
svn-id: r13456
2004-04-04 12:36:50 +00:00
Max Horn
e3e9ba99ee Fix for bug #885466 (FT: Text gets drawn under moving bits), by making AKOS codec 16 honor the charset mask
svn-id: r13455
2004-04-04 01:11:27 +00:00
Max Horn
a4e424a4fe got rid of _msgPtrToAdd; slightly improved error checking in addMessageToStack()
svn-id: r13454
2004-04-04 00:29:13 +00:00