aboutsummaryrefslogtreecommitdiff
path: root/sword2
AgeCommit message (Collapse)Author
2004-01-17Update BS2 cutscene player with changes from roever: overlay support ↵James Brown
(default, 8bit backends should define BACKEND_8BIT for fast colour remapping) and sound syncronisation. svn-id: r12456
2004-01-17Yet Another EVC fixNicolas Bacca
svn-id: r12452
2004-01-17fix compilation for msvc when libmpeg2 enabledPaweł Kołodziejski
svn-id: r12447
2004-01-16Made a separate function out of the code that retrieves information aboutTorbjörn Andersson
an in-memory WAV file. At the moment it's only used in one place, which is a bit silly, but I hope to use it for the cutscene player to figure out when to start the lead-out music. (To do that I'll need to know how long the cutscene is, though. I haven't looked into how to find that out yet.) svn-id: r12424
2004-01-14I accidentally introduced a bug when I changed the fading that would causeTorbjörn Andersson
fading-up music to distort and eventually deteriorate into white noise. This was because I allowed _fade to be set on channels that weren't playing and because I only checked _fade for equality when deciding when to stop the fading. It should work much better now, I think. svn-id: r12392
2004-01-14Increased the delay I added to interpolation frames from 0 to 10. This willTorbjörn Andersson
probably make the scrolling less smooth (I don't yet know how much), but it does seem to fix bug #875683. svn-id: r12381
2004-01-14I wanted to Valgrind the cutscene code, so I had to fix the warnings aboutTorbjörn Andersson
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-14Changed the music fading so that volume is increased when ABS(_fading)Torbjörn Andersson
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-13cut down pointless header interdependenciesMax Horn
svn-id: r12360
2004-01-13Moved some methods into class AnimationState (where they really belong - ↵Max Horn
nicely shown by the fact that now all member vars of AnimationState are private) svn-id: r12359
2004-01-13Some more formatting cleanups. Made the Ogg file handle part of theTorbjörn Andersson
animation state so that it can be deleted in doneAnimation(). svn-id: r12358
2004-01-13As an experiment, I've added a delay of 0 milliseconds when drawingTorbjörn Andersson
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-13Moved the rest of the MoviePlayer class into animation.cpp/.h, plus someTorbjörn Andersson
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-13added legal header; fixed incorrect fscanf use; C++ification (the code still ↵Max Horn
is quite Cish, though :-) svn-id: r12351
2004-01-12Add mpeg2 option to mingw makefileTravis Howell
Fix compile on mingw svn-id: r12350
2004-01-12fixed bug that was causing lots of havoc on BE machines. Thanks eriktorbjornOliver Kiehl
svn-id: r12348
2004-01-12- whitespacesPaweł Kołodziejski
- fix for compilation at MAX, at include types - changed to our types svn-id: r12344
2004-01-12Don't hog the CPU when playing cutscenes.Torbjörn Andersson
svn-id: r12342
2004-01-12Initial libmpeg2 cutscene support based on patch #874510.James Brown
Pre-converted cutscenes w/ palette files available - ask LeChuck about Cutscenes :) svn-id: r12338
2004-01-12Sync the credits so that the text scroll and music will last for about theTorbjörn Andersson
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-11cleanupTorbjörn Andersson
svn-id: r12322
2004-01-10I forgot this in the previous cleanup.Torbjörn Andersson
svn-id: r12311
2004-01-10cleanupTorbjörn Andersson
svn-id: r12309
2004-01-09Removed redundant comment.Torbjörn Andersson
svn-id: r12282
2004-01-09Removed redundant comments.Torbjörn Andersson
svn-id: r12279
2004-01-09Make it possible to quit while showing in-game dialogs. (Regression fix.)Torbjörn Andersson
svn-id: r12273
2004-01-09Fix a harmless clipping bug (block surfaces were drawn even when theirTorbjörn Andersson
width or height was 0), and use consistent naming for clip rect parameters. svn-id: r12272
2004-01-08Allow quitting during cutscenes and credits again. This is getting a bitTorbjörn Andersson
hackish... svn-id: r12247
2004-01-07Valgrind fixes. Mostly about memory not being freed when the engine isTorbjörn Andersson
deleted. svn-id: r12211
2004-01-06Never call _system->quit() directly. Let ScummVM handle that so that theTorbjörn Andersson
engine can be properly deleted first. Apart from being the nice thing to do, this should make it easier to Valgrind for memory leaks. svn-id: r12184
2004-01-06It's a new year in BS2 land, too!Torbjörn Andersson
svn-id: r12181
2004-01-06Made sure the screen is really cleared when drawing a dialog window, plusTorbjörn Andersson
some other cleanups. (This was a regression caused by the less stupid screen updates implemented recently.) svn-id: r12180
2004-01-05Marked some more structs as packed. I don't know if it makes anyTorbjörn Andersson
difference, as they contain only 32-bit integers, but I also believe it does no harm. svn-id: r12159
2004-01-05Changed some memmove()s to memcpy(), since the memory areas were notTorbjörn Andersson
overlapping. Enabled some sanity-checking code. Fixed clearWalkGridList() so that it clears the entire walk grid list. That was a really stupid bug of mine, and I hope it had at least some bearing on the rare (for me, at least) walk problems I've seen. svn-id: r12154
2004-01-05Tiny cleanup.Torbjörn Andersson
svn-id: r12153
2004-01-05Fixed some debugging messages so they refer to the correct function.Torbjörn Andersson
svn-id: r12152
2004-01-05Slowed down the credits slightly. With the recent optimizations, the musicTorbjörn Andersson
lasted longer than the text. Now the text lasts longer than the music. svn-id: r12151
2004-01-04Adapted LavosSpawn's idea for more efficient screen updating. It stillTorbjörn Andersson
renders the entire screen every frame, but it tries to update (i.e. copy to the backend) only the parts of the screen that actually changed. At least approximately so. svn-id: r12142
2004-01-04Some cleanup and Valgrind warning fixes.Torbjörn Andersson
svn-id: r12141
2004-01-04Update a comment to reflect that some functions have different names now.Torbjörn Andersson
svn-id: r12140
2004-01-04renamed global var _debugLevel to g_debugLevel; let Engine constructor init ↵Max Horn
it (this way all engines get it for free, allows further cleanup); removed some useless/duplicate member vars in SwordEngine svn-id: r12134
2004-01-03cleanupMax Horn
svn-id: r12116
2004-01-03fix for BE systemsMax Horn
svn-id: r12115
2004-01-03Fixed bug that made ScummVM crash when loading a savegame where the mainTorbjörn Andersson
character was walking. (I had missed a case where pointers were cast to integers.) svn-id: r12113
2004-01-03It was pointed out to me that we can't use the DEMO variable here, becauseTorbjörn Andersson
the missing file may be the one with the resource for the global variables. svn-id: r12112
2004-01-03renamed AudioInputStream -> AudioStreamMax Horn
svn-id: r12110
2004-01-03Made the music code more like the one in BS1, i.e. the fade time is longerTorbjörn Andersson
and it now fades both up and down. Plenty of cleanups, simplifications and just moving code around to group it in what I hope is a more logical fashion. Fixed a long-standing bug where spot effects would eventually use up all available sound effect handles. (I may have introduced this when I removed the expiration of sound effects from FxServer().) svn-id: r12108
2004-01-01Oops, that was the wrong data type. (Not that it should matter, but...)Torbjörn Andersson
svn-id: r12069
2003-12-31Some tweaking of the new credits code. It is no longer necessary to haveTorbjörn Andersson
to have the credits.bmp file, though if you don't you won't see the "Smacker" logo. (Whether or not this is a feature is open to debate.) Happy New Year! svn-id: r12062
2003-12-31oops, forgot one caseTorbjörn Andersson
svn-id: r12056