aboutsummaryrefslogtreecommitdiff
path: root/sword2/driver
AgeCommit message (Collapse)Author
2004-09-04Added support for compressed music. I'm sure there are some glitches stillTorbjörn Andersson
to fix, but it should work well enough for now. In this rewrite of the music code, I removed the "save/restore music state" function, since it just complicated things for a very small gain. It wasn't in the original engine, and I added it just for the credits, so that the previously playing music could be resumed afterwards. I might re-add it later, but probably not. svn-id: r14887
2004-08-28Cleanup. Removed the original DipMusic() code. If anyone wants toTorbjörn Andersson
implement it - personally I don't see the need - they can get it from CVS. svn-id: r14819
2004-08-27Use the same code for opening the music clusters as for opening the speechTorbjörn Andersson
clusters. (No, that doesn't mean compressed music is support yet. This is just a tiny little step closer.) svn-id: r14794
2004-08-26Explicitly cast value to uint32, since there was a report about compilationTorbjörn Andersson
problems. Perhaps this will fix it? svn-id: r14762
2004-08-25The original speech clusters are now decoded through a custom AudioStreamTorbjörn Andersson
class, so they are handled the same way as the compressed clusters. The next step will be to migrate the music playback to use the same class, which means the fade-in/out logic needs to be separated from the decoding. Once this is done, adding support for compressed music should be a piece of cake. svn-id: r14740
2004-08-23Fixed the bug that caused Vorbis and FLAC to misbehave with compressedTorbjörn Andersson
speech. (Apparently it was just an accident that MP3 worked.) Unfortunately I had to change the file format of the compressed files to include both the compressed and uncompressed size, but since the tool to create these files has only lived as an item in the patch tracker, no one should have exptected it to be the final, working version, right? Right. svn-id: r14698
2004-08-22Experimental (i.e. slightly broken) code for handling compressed speech.Torbjörn Andersson
The equally experimental compression tool is in patch #854561. Support for compressed music will require some restructuring first. svn-id: r14684
2004-08-17Don't try to free text sprites with the memory manager - it uses standardTorbjörn Andersson
malloc() nowadays! (This only affected the "dummy" player. svn-id: r14638
2004-07-26I shouldn't be mixing cleanups and bug fixes, but I'm doing so anyway, justTorbjörn Andersson
this once. :-) The parameters to drawLine() aren't clipped to the screen size, which meant that it was accessing memory out of bounds when marking the screen as dirty. The function now uses plotPoint(), which does the bounds checking and screen dirtying for us. Apart from being a little easier to read, it dirties only the parts of the screen the line actually passes through, instead of a rectangle defined by the line's end points. Since drawLine() is only used for debugging, I wouldn't consider this a particularly serious bug. Next change is that only the pixels inside the original parallax layer are considered when creating the block surfaces. This may make the drawing slightly more efficient, since fewer surfaces will be labelled as transparent. Plus some other minor cleanups. svn-id: r14340
2004-07-17Allowing both music streams to share the same rate converter only workedTorbjörn Andersson
by accident, and could cause bad noises during music cross-fades. This wasn't a problem in 0.6.0 since all music is sampled at 22050 Hz, which is the most likely output sample rate for ScummVM, so the converter didn't actually have to do anything. Now, however, the output sample rate could be anything. I've given the music streams one converter each. In BS1, which uses similar music code, it was already necessary to do this since some of its music is sampled at 11025 Hz. svn-id: r14237
2004-06-17Itsy-bitsy cleanup.Torbjörn Andersson
svn-id: r13959
2004-06-12CleanupTorbjörn Andersson
svn-id: r13956
2004-06-09Cleaned up the palette handling a bit. Renamed _palCopy to _palette since ITorbjörn Andersson
found the old name misleading (there is only one array that stores the palette in the engine, though it could be argued that it's a copy of the one used by the backend), and removed some code that I'm almost certain was never used. (I've added assert()s to trigger in the cases where it would have been used.) svn-id: r13949
2004-06-07Added comment.Torbjörn Andersson
svn-id: r13946
2004-06-06Cleaned up sprite scaling.Torbjörn Andersson
svn-id: r13944
2004-06-05CleanupTorbjörn Andersson
svn-id: r13933
2004-05-09Forgot to remove this file when I changed input handling.Torbjörn Andersson
svn-id: r13813
2004-05-09Removed the buffering of mouse and keyboard events. I don't think any ofTorbjörn Andersson
our other engines do this, so there is little reason for BS2 to. I did add a filtering mechanism so that mouse button releases and scroll wheeling is ignored during normal gameplay, but I don't know if that was necessary either. Since this left little more than an empty husk where the Input class used to be, I've eliminated that class and buried its remains in Sword2Engine. svn-id: r13812
2004-05-09When drawing lines and points, mark the corresponding screen area as dirtyTorbjörn Andersson
so that it gets properly redrawn. Only the debugging code uses these drawing primitives, so it's no big deal, but it's still the right thing to do. svn-id: r13811
2004-05-05Take advantage of the changes in the backend's mouse cursor handling. ItTorbjörn Andersson
didn't do the change I was hoping for: the coyote stone is still partially see-through, but perhaps it was in the original as well. At least we no longer need to keep the buffer the mouse cursor is decoded to, since that's now handled by the backend. svn-id: r13782
2004-05-01Simplified the handling of sound effects. It's not necessary for the driverTorbjörn Andersson
to keep its own copy of the sound data. It could be even further simplified (I don't really see any reason for having two different sound queues), but I seem to have reached a point of stability here and I don't want to jinx it by making further changes yet. svn-id: r13705
2004-04-23Major revamping of the BS2 memory manager and, some small changes to theTorbjörn Andersson
resource manager. All new code! All new bugs! svn-id: r13603
2004-04-07Cleanup.Torbjörn Andersson
svn-id: r13494
2004-03-29Make clearScene() set the _needFullRedraw variable.Torbjörn Andersson
I think the reason I didn't do this from the start was that BS2 used to call clearScene(), or whatever the function was called back then, between every frame. Nowadays, it simply assumes that each frame will cover the previous one. Anyway, this change prevents the restart/restore dialog from appearing briefly between the two intro cutscene animations. svn-id: r13421
2004-03-28Renamed more OSystem methodsMax Horn
svn-id: r13410
2004-03-28Fixed bug I introduced in the recent cleanup: It's the screen, not theTorbjörn Andersson
overlay, that needs to be cleared at the beginning of the movie. Otherwise what was on the screen may show at the end of the movie. svn-id: r13398
2004-03-24Use the binary .pal file format that was introduced for 0.6.0.Torbjörn Andersson
Invalidate the lookup table when the screen changes. (TODO: We also have to invalidate it if the change happens between cutscenes, don't we?) Some cleanup, particularly in the BS2 cutscene player. More needed, I guess... svn-id: r13377
2004-03-23Unify MPEG2 code even moreMax Horn
svn-id: r13365
2004-03-22share 'init' method, tooMax Horn
svn-id: r13361
2004-03-22Fix crash introduced by recent code unification. (Mind you, I'm stillTorbjörn Andersson
extremely grateful that the BS1 and BS2 cutscene players are finally sharing at least some of their code now.) svn-id: r13360
2004-03-22some more cleanupMax Horn
svn-id: r13359
2004-03-22move commong code into separate source file (more could be done, but it's a ↵Max Horn
start) svn-id: r13358
2004-03-21Moved Surface/Font code into new 'graphics' moduleMax Horn
svn-id: r13357
2004-03-21Unify a bit more...Max Horn
svn-id: r13354
2004-03-15fix doxygen-comment mistakesMax Horn
svn-id: r13286
2004-03-13Fixed a slight logic error in the music fading. At this point the codeTorbjörn Andersson
should only check if the music is fading, not in which direction. (Also made a minor cleanup.) svn-id: r13235
2004-03-04Apply patch #907359 : Broken Sword videos improved frameskipNicolas Bacca
svn-id: r13180
2004-03-01Fix from Roever for bug #892827James Brown
svn-id: r13107
2004-03-01Add fix for error at end of sword2demo (From eriktorbjorn)Travis Howell
Prevent false warnings in demo. svn-id: r13102
2004-02-28renamed more OSystem methods to follow our naming scheme; renamed ↵Max Horn
NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend svn-id: r13087
2004-02-24the OSystem changes we discussed on the ML (note: renaming of the existing ↵Max Horn
OSystem API is not yet finished); porters will have to fix their ports to get them to compile again svn-id: r13036
2004-02-22Avoid deadlock in MPEG-2 cutscenes + slow devicesNicolas Bacca
svn-id: r12996
2004-02-22Patch #885904 (Flac Support) with some tweaks by meMax Horn
svn-id: r12984
2004-02-21unified code a littleMax Horn
svn-id: r12974
2004-02-15Proper handling of BS2 cutscene lead-outs, plus some other minor fixes.Torbjörn Andersson
svn-id: r12907
2004-02-14Paint the overlay black at the end of the movie. Not all movies fade out onTorbjörn Andersson
their own, and sometimes the cutscene player will have to wait for the lead out to finish before returning to the game. (This will probably be true even after we fix the timing of the lead-outs.) svn-id: r12871
2004-02-13Check for MP3 file in Broken Sword cutscenes - useful for WinCE backend as ↵Nicolas Bacca
Tremor crashes for no specific reason (help appreciated :p) here svn-id: r12837
2004-02-12Changed the playback code to use the new "elapsed time" function instead.Torbjörn Andersson
This fixes bug #880484 for me, but may need some fine-tuning. svn-id: r12830
2004-02-08More cutscene fixes from roeverTravis Howell
svn-id: r12773
2004-02-07Patch #874510 from roever, fixes BS2 demo cutscene problems (bug #884568)James Brown
svn-id: r12761