aboutsummaryrefslogtreecommitdiff
path: root/sword2/driver
AgeCommit message (Collapse)Author
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-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-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-06It's a new year in BS2 land, too!Torbjörn Andersson
svn-id: r12181
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-03cleanupMax Horn
svn-id: r12116
2004-01-03fix for BE systemsMax Horn
svn-id: r12115
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-31oops, forgot one caseTorbjörn Andersson
svn-id: r12056
2003-12-31When saving the music state, remember the name of the music file that wasTorbjörn Andersson
open so that it can be re-opened afterwards. It's not so much that it may have changed, but it may have been closed. This should fix a crash when escaping the credits. svn-id: r12055
2003-12-28Hopefully the last big renaming. Now the datatypes have names likeTorbjörn Andersson
"StandardHeader" instead of "_standardHeader". svn-id: r11997
2003-12-24turned PlayingSoundHandle into an 'opaque' (well not really :-) data type, ↵Max Horn
mainly because people kept (accidentally and sometimes on purpose :-) misusing them svn-id: r11881
2003-12-19Fixed bug with looping music. It must have been there all along, but maybeTorbjörn Andersson
the recent mixer changes made it more audible. Or maybe I just didn't listen until now. svn-id: r11763
2003-12-19Implemented scroll wheel handling for save/load dialogs. (This turned up aTorbjörn Andersson
few other hitherto harmless bugs, which I've hopefully managed to fix.) svn-id: r11762
2003-12-19distinguish between end of stream and end of dataMax Horn
svn-id: r11756
2003-12-19unregister the premix proc when you go awayMax Horn
svn-id: r11755
2003-12-19I am going to remove the default implementation of readBuffer() ↵Max Horn
(AudioInputStream subclasses really really should implement readBuffer() for good performance) svn-id: r11753
2003-12-17My last commit didn't work on big-endian. Maybe this one does...Torbjörn Andersson
svn-id: r11711
2003-12-17The mixer handles little-endian samples now. Take advantage of that.Torbjörn Andersson
svn-id: r11707
2003-12-17Made sure that *all* AudioInputStream 'know' their sample rate; removed ↵Max Horn
pointless MusicStream class; removed various specific Channel subclasses and instead generalized the base class some more svn-id: r11699
2003-12-14Fixed a potential crash bug where an audio buffer would be freed at the endTorbjörn Andersson
of an animated cutscene while the mixer was still using it. Oddly enough, I didn't encounter this bug when I played through the game recently, but today it happened every time at the end of the cutscene where Nico finds the jaguar stone. svn-id: r11637
2003-12-10Restored some relevant information to a comment that was removed by myTorbjörn Andersson
previous commit. svn-id: r11551
2003-12-10Sprite surfaces (as opposed to standard sprites) are always displayTorbjörn Andersson
aligned, never flipped and never RLE16-compressed. Simplified the code accordingly. (Displaying the restore dialog when specifying an unused save slot from the command-line works again now.) Plus some minor cleanups. svn-id: r11550
2003-12-09I've played through the whole game, and I've scanned through the clusterTorbjörn Andersson
files with a primitive and incomplete tool to present resource information. (It may evolve into something useful and/or presentable later. Much later.) I've found no evidence whatsoever that the mysterious blend & 0x02 case is ever used. Since the code makes no sense to me, I've removed it. svn-id: r11538
2003-12-08Shut up Valgrind warnings.Torbjörn Andersson
svn-id: r11528
2003-12-02cleanupTorbjörn Andersson
svn-id: r11457
2003-11-25More cleanup. Another unused file bites the dust.Torbjörn Andersson
svn-id: r11363
2003-11-16More cleanup. I've eliminated all the temporary global variables I've addedTorbjörn Andersson
over the past few weeks, except for g_sword2. (Of course, this doesn't necessarily make the code any prettier, but we can work on that later.) svn-id: r11309
2003-11-13Re-enabled the CD swapping code, after rewriting it a bit.Torbjörn Andersson
If a cluster file isn't found the resource manager will first check if it's one of the files that it expects to find on the hard disk. If so, it's considered a fatal error. Otherwise it will present the user with an "Insert CD1" or "Insert CD2" message, just like the original did. Unlike the original, the user will have to press a button or click the mouse to indicate when he's done. I don't know if we even can detect the CD automatically in any portable way. As far as I can see, we'll need at least two separate path settings for this to actually work: one for the HD install directory, and one or two for the CDs. The file that are supposed to be found on the HD are only on one of the CDs, so the amount of CD swapping would probably be unbearable otherwise. As a consequence, I haven't actually tried running the game from CD yet. By the way, the old caching code has been removed completely now. All it did was to copy the cluster file to HD for faster access. ScummVM never did that, but so far no one has complained. svn-id: r11273
2003-11-12cleanupTorbjörn Andersson
svn-id: r11266
2003-11-11Removed SVM_timeGetTime(). We may as well call get_msecs() directly.Torbjörn Andersson
svn-id: r11260
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-26 09:29:53 +0000