aboutsummaryrefslogtreecommitdiff
path: root/sword2
AgeCommit message (Collapse)Author
2004-03-21Unify a bit more...Max Horn
svn-id: r13354
2004-03-17Use the same syntax for accessing script variables as BS1 does, i.e. nowTorbjörn Andersson
it's Logic::_scriptVars[ID] instead of just ID. Apart from looking cool, it makes it much easier to tell the difference between variables and constants when looking at the code. Of course, this sort of sweeping changes is jolly good for introducing truly weird regressions, which is why I waited until after 0.6.0. svn-id: r13331
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-04If the user has previous savegames, display a restart/restore dialog whenTorbjörn Andersson
the game starts. (I know it could look prettier, but I don't have much to work with here...) svn-id: r13178
2004-03-02Removed the test for non-existing demo cutscenes: param[0] is an offsetTorbjörn Andersson
into the chunk of memory handled by the memory manager, not a well-defined value. Also, it introduced a theoretical memory leak as fnPlaySequence() wouldn't get to clean up after itself. The correct place for this check is probably in MoviePlayer::play(), where you can test the name of the cutscene. On the other hand, the original demo will gladly play eye.smk if there is one, so why shouldn't we? svn-id: r13139
2004-03-01Display keyboard when savingNicolas Bacca
svn-id: r13118
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-21Use unsigned characters when drawing the text in the control panel etc.Torbjörn Andersson
This is consistent with how the in-game text is drawn, and might possibly fix the control panel text in the Spanish version (though I have no way of actually testing this). svn-id: r12957
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
2004-02-05Removed some of the #includes from sword2.hTorbjörn Andersson
svn-id: r12739
2004-02-05renamed (Const)Iterator to (const_)iterator; changed size() to return an uintMax Horn
svn-id: r12722
2004-01-30Various changes to the build system which allow building ScummVM in an ↵Max Horn
external directory (and as such, allow you to have a debug, a profiling, and a release build from the same set of source files in parallel). Work in progress svn-id: r12680
2004-01-30avoid using huge static structs - they can't be stripped, and increase the ↵Max Horn
exe size (in this case, 16 MB...) svn-id: r12678
2004-01-30fix whitespaces (we should eventually try to remove this code duplication ↵Max Horn
again, folks. maybe add a 'video' global module or so...) svn-id: r12676
2004-01-29Renamed the 'pan' effect of the mixer to 'balance', since that is what we ↵Max Horn
actually do; applied patch #886786 which corrects a bug in the balance code svn-id: r12665
2004-01-22whitespacesMax Horn
svn-id: r12575
2004-01-20Some minor cleanups (comments and spacing), and fixed CPU usage in syncedTorbjörn Andersson
cutscene playback. svn-id: r12536
2004-01-18This should make subtitles work again in "overlay" cutscene mode.Torbjörn Andersson
svn-id: r12506
2004-01-18fix warningsPaweł Kołodziejski
svn-id: r12504
2004-01-18fix warningPaweł Kołodziejski
svn-id: r12498
2004-01-18I know we're not supposed to make cleanup commits at this point, but surelyTorbjörn Andersson
we can make an exception for removing self-described hacks and utterly misleading comments? :-) svn-id: r12497
2004-01-18Don't allow overlapping voice in cutscenes. Fixes crash in carib cutscene.James Brown
svn-id: r12474
2004-01-18BS1 cutscene support. Also bugfixes (don't crash if cutscene ogg unavailable)James Brown
svn-id: r12465
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