Commit Graph

8738 Commits

Author SHA1 Message Date
Gregory Montoir
b218cb93fe cleanup
svn-id: r12378
2004-01-14 10:40:25 +00:00
James Brown
8cc0b7163c Move SCUMM debugger init later on. With this _numVariables is set, so theoretically the Debugger's scumm_vars[] array should work again. Although it
doesn't, for some reason I have yet to look into.

svn-id: r12377
2004-01-14 10:02:33 +00:00
Travis Howell
7bd3a50049 Add better method.
svn-id: r12376
2004-01-14 10:01:39 +00:00
Travis Howell
f6f3ea8da3 Add missing code for samnmax screen saver, fixes bug #781683
svn-id: r12375
2004-01-14 09:54:45 +00:00
Torbjörn Andersson
15738c13d3 I wanted to Valgrind the cutscene code, so I had to fix the warnings about
uninitialized values. Now the only warnings I got were from libmpeg2
itself, and I don't know how serious that is.

I've also added some code - disabled by default - to allow the cutscenes to
run with libmpeg 0.3.1, since that's what I've got on my Linux box. It
appears to work on that one, though I only have the "eye" cutscene on it
yet.

Ogg Vorbis playback is still broken for me under Windows, though. I wonder
if it is because I don't have the very latest Ogg Vorbis libraries on it
(since I didn't manage to compile them under MinGW). But surely the file
format hasn't changed in any important way...?

svn-id: r12374
2004-01-14 08:14:25 +00:00
Torbjörn Andersson
2fb7d4c553 Changed the music fading so that the volume is increased when ABS(_fading)
grows larger, both when fading up and down. This fixes the problem where
the volume would "jump" when changing the fading "direction" of a stream.

svn-id: r12373
2004-01-14 08:09:03 +00:00
Torbjörn Andersson
b17d77eae9 Changed the music fading so that volume is increased when ABS(_fading)
grows larger, both when fading up or down. This fixes the problem where the
volume would "jump" when changing the fading "direction" of a stream.

Also changed the logic for deciding which music stream to stop if both
streams are playing and a third stream is started. Before it always tried
to pick the one that was fading down. Now it will pick the one with the
lowest volume, assuming that the more faded a stream is the lower its
volume.

Together, this should fix some abrupt music changes at the watchman's hut,
where it would sometimes start two music streams in rapid succession.

svn-id: r12372
2004-01-14 08:06:56 +00:00
Jonathan Gray
4746920c74 fix path specifiers
svn-id: r12371
2004-01-14 06:47:23 +00:00
Jonathan Gray
d48891b9cd number implies version
svn-id: r12370
2004-01-14 06:27:28 +00:00
Travis Howell
718bdd1829 Add back missing line.
svn-id: r12369
2004-01-14 04:24:57 +00:00
Eugene Sandulenko
a1e39b988d Implemented o6_localizeArray for HE games
svn-id: r12368
2004-01-14 03:50:58 +00:00
Max Horn
e3a28ad4b7 ... and so we are back at precisely my original code, wasn't it fun? :-)
svn-id: r12367
2004-01-14 03:07:29 +00:00
Eugene Sandulenko
05b9f4ddf6 Fix libmpeg2 version check. FreeBSD ports collection usually lags with
newer package version, so current one has libmpeg2 0.3.1. Although it
got passed by configure script. Now it is fixed.

svn-id: r12366
2004-01-14 02:29:49 +00:00
Travis Howell
683a1561a2 Slight change to match disasm. exactly.
svn-id: r12365
2004-01-14 01:54:04 +00:00
Travis Howell
9db5e22986 Missed one.
svn-id: r12364
2004-01-14 01:42:31 +00:00
Travis Howell
1fa4231c47 Remove INSANE define.
svn-id: r12363
2004-01-14 01:41:44 +00:00
Torbjörn Andersson
51434558f4 Updated BS2 issues. (I'm too tired to fix the cutscene lead-out music
right now, but I don't want to forget it.)

svn-id: r12362
2004-01-13 17:29:01 +00:00
Gregory Montoir
2f85714c60 - wrong sentence was spoken when Joe was trying to 'pick up' a person
- clear command before switching rooms
- clear texts at the end of cutaway (fix minor glitch in interview intro)

svn-id: r12361
2004-01-13 14:43:13 +00:00
Max Horn
c39aa04c31 cut down pointless header interdependencies
svn-id: r12360
2004-01-13 14:22:29 +00:00
Max Horn
34960cf375 Moved some methods into class AnimationState (where they really belong - nicely shown by the fact that now all member vars of AnimationState are private)
svn-id: r12359
2004-01-13 14:16:40 +00:00
Torbjörn Andersson
dca14d9532 Some more formatting cleanups. Made the Ogg file handle part of the
animation state so that it can be deleted in doneAnimation().

svn-id: r12358
2004-01-13 13:12:40 +00:00
Torbjörn Andersson
13481b82c4 As an experiment, I've added a delay of 0 milliseconds when drawing
interpolation frames. It shouldn't delay anything, but I'm hoping it will
allow the other threads some breathing room, which might help bug #875683.

Or not. We'll see.

svn-id: r12357
2004-01-13 10:27:13 +00:00
Torbjörn Andersson
8a66ba33cf Moved the rest of the MoviePlayer class into animation.cpp/.h, plus some
minor cleanups. (Mostly spacing and indentation).

Unfortunately the Ogg Vorbis playback causes ScummVM to crash for me, so I
can't say for certain that I didn't break anything.

svn-id: r12356
2004-01-13 10:09:53 +00:00
Travis Howell
73d73982af Revert last change, misread code.
svn-id: r12355
2004-01-13 05:30:46 +00:00
Travis Howell
d758f12fcc Typo
svn-id: r12354
2004-01-13 04:59:40 +00:00
Travis Howell
a57810c854 Fix #775662, actor frame should always be reset to 0 for tentacle.
svn-id: r12353
2004-01-13 04:57:31 +00:00
Jonathan Gray
9f6cdccc84 add autodetection for libmpeg2, while it checks for 0.4.0 and up it doesn't warn the user to upgrade if they have an older version just disables
svn-id: r12352
2004-01-13 02:23:37 +00:00
Max Horn
b04dac03f2 added legal header; fixed incorrect fscanf use; C++ification (the code still is quite Cish, though :-)
svn-id: r12351
2004-01-13 01:26:18 +00:00
Travis Howell
9471d58720 Add mpeg2 option to mingw makefile
Fix compile on mingw

svn-id: r12350
2004-01-12 23:41:05 +00:00
Paweł Kołodziejski
b4655ff7f9 - fix: correct range
svn-id: r12349
2004-01-12 20:20:33 +00:00
Oliver Kiehl
d794488645 fixed bug that was causing lots of havoc on BE machines. Thanks eriktorbjorn
svn-id: r12348
2004-01-12 20:04:22 +00:00
Paweł Kołodziejski
a60c66564b - fix - proper place for stopallsound
- fix - correct fade value

svn-id: r12347
2004-01-12 19:32:44 +00:00
Paweł Kołodziejski
278ea4808e forgot this one
svn-id: r12346
2004-01-12 19:18:24 +00:00
Paweł Kołodziejski
0058057d41 - added delay at stopAllsounds
- changes some struct names
- improved hadling FT music tables(seqence, cue point, ...)
- moved some music part into seperate file
- added fadeOut music for FT

svn-id: r12345
2004-01-12 19:15:07 +00:00
Paweł Kołodziejski
b8e3dda84c - whitespaces
- fix for compilation at MAX, at include types
- changed to our types

svn-id: r12344
2004-01-12 19:08:04 +00:00
Paweł Kołodziejski
e4628fbb07 - indent
- fix for compilation, is it proper ?

svn-id: r12343
2004-01-12 18:51:15 +00:00
Torbjörn Andersson
cc67c13711 Don't hog the CPU when playing cutscenes.
svn-id: r12342
2004-01-12 16:36:01 +00:00
Travis Howell
5552b628a6 Wrong SO_*
svn-id: r12341
2004-01-12 15:52:58 +00:00
Travis Howell
3180834549 Add skipLimb actor var, which is used by puttmoon.
Use forceClip for actorOps case 218, since it should have same effect.

svn-id: r12340
2004-01-12 14:09:39 +00:00
Gregory Montoir
95de2117a2 New save/load code, this *breaks* compatiblity with the previous
savefile format. Use the 'qsc' tool to convert your old files
(http://0x.7fc1.org/fotaq/qsc.[cpp|exe]).

svn-id: r12339
2004-01-12 13:40:02 +00:00
James Brown
a685422a13 Initial libmpeg2 cutscene support based on patch #874510.
Pre-converted cutscenes w/ palette files available - ask LeChuck about Cutscenes :)

svn-id: r12338
2004-01-12 11:11:19 +00:00
Gregory Montoir
bbf32c0076 oops
svn-id: r12337
2004-01-12 09:43:06 +00:00
Gregory Montoir
a6d1540d49 turned Logic::useJournal() into a virtual method
svn-id: r12336
2004-01-12 09:40:57 +00:00
Travis Howell
48eb63d29a Add missing case.
Add another HE games specific.

svn-id: r12335
2004-01-12 09:00:31 +00:00
Torbjörn Andersson
c75f5efd2f Sync the credits so that the text scroll and music will last for about the
same amount of time. I don't think the original did this, but it turned out
to be pretty easy.

svn-id: r12334
2004-01-12 08:01:25 +00:00
Paweł Kołodziejski
e792b1c715 update
svn-id: r12333
2004-01-12 07:51:34 +00:00
Paweł Kołodziejski
441fc1a0d7 some changes to ft music sequences
svn-id: r12332
2004-01-12 07:48:39 +00:00
Joost Peters
14eeb574d3 fixes compilation for our *cough* favourite *cough**cough* compiler: MSVC!
svn-id: r12331
2004-01-12 00:34:27 +00:00
Max Horn
c55d5d6465 pedantic corrections
svn-id: r12330
2004-01-11 21:57:24 +00:00
Max Horn
87e8ccd8c1 stupid me shouldn't write fixes, then in the last minute decide to put them into another place, then commit it before recompiling once more <sigh>
svn-id: r12329
2004-01-11 21:55:26 +00:00