libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-16 23:19:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
13,598 Commits 5 Branches 5 Tags
Commit Graph

643 Commits

Author SHA1 Message Date
Torbjörn Andersson
9b9ebb3a91 Make sure looping music is restarted after loading a savegame, regardless 
of how the savegame is loaded. (ScummVM adds two alternative methods: the
-x command-line parameter, and the restart/restore dialog at the beginning
of the game, which is only shown when there are savegames available.)

svn-id: r13386
 2004-03-27 12:07:07 +00:00
Torbjörn Andersson
56ae88d5c7 cleanup 
svn-id: r13385
 2004-03-27 12:02:38 +00:00
Torbjörn Andersson
afefe7dcfa Use the binary .pal file format that was introduced for 0.6.0. 
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-24 07:29:59 +00:00
Max Horn
3fddbc18d6 Unify MPEG2 code even more 
svn-id: r13365
 2004-03-23 00:10:18 +00:00
Max Horn
d24be923f3 share 'init' method, too 
svn-id: r13361
 2004-03-22 20:46:30 +00:00
Torbjörn Andersson
8f9ffdf43a Fix crash introduced by recent code unification. (Mind you, I'm still 
extremely grateful that the BS1 and BS2 cutscene players are finally
sharing at least some of their code now.)

svn-id: r13360
 2004-03-22 15:57:51 +00:00
Max Horn
838d3e3a93 some more cleanup 
svn-id: r13359
 2004-03-22 01:40:24 +00:00
Max Horn
4466a85598 move commong code into separate source file (more could be done, but it's a start) 
svn-id: r13358
 2004-03-22 01:28:45 +00:00
Max Horn
a9789acfc6 Moved Surface/Font code into new 'graphics' module 
svn-id: r13357
 2004-03-21 21:20:25 +00:00
Max Horn
b94448514e Unify a bit more... 
svn-id: r13354
 2004-03-21 18:49:04 +00:00
Torbjörn Andersson
4c3a68027f Use the same syntax for accessing script variables as BS1 does, i.e. now 
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-17 09:03:15 +00:00
Max Horn
f8610cd1c5 fix doxygen-comment mistakes 
svn-id: r13286
 2004-03-15 00:55:44 +00:00
Torbjörn Andersson
0fc86ef674 Fixed a slight logic error in the music fading. At this point the code 
should only check if the music is fading, not in which direction. (Also
made a minor cleanup.)

svn-id: r13235
 2004-03-13 12:05:01 +00:00
Nicolas Bacca
9e1fa63575 Apply patch #907359 : Broken Sword videos improved frameskip 
svn-id: r13180
 2004-03-04 18:54:35 +00:00
Torbjörn Andersson
ece97788ac If the user has previous savegames, display a restart/restore dialog when 
the game starts. (I know it could look prettier, but I don't have much to
work with here...)

svn-id: r13178
 2004-03-04 08:03:32 +00:00
Torbjörn Andersson
1bdcc3e5ef Removed the test for non-existing demo cutscenes: param[0] is an offset 
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-02 07:02:31 +00:00
Nicolas Bacca
85f888e582 Display keyboard when saving 
svn-id: r13118
 2004-03-01 07:56:33 +00:00
James Brown
b77231a9a3 Fix from Roever for bug #892827 
svn-id: r13107
 2004-03-01 04:05:10 +00:00
Travis Howell
2f01efd9f3 Add fix for error at end of sword2demo (From eriktorbjorn) 
Prevent false warnings in demo.

svn-id: r13102
 2004-03-01 00:32:47 +00:00
Max Horn
c6752cccf5 renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend 
svn-id: r13087
 2004-02-28 12:58:13 +00:00
Max Horn
d158280425 the OSystem changes we discussed on the ML (note: renaming of the existing OSystem API is not yet finished); porters will have to fix their ports to get them to compile again 
svn-id: r13036
 2004-02-24 22:39:42 +00:00
Nicolas Bacca
e469cd43a7 Avoid deadlock in MPEG-2 cutscenes + slow devices 
svn-id: r12996
 2004-02-22 18:13:54 +00:00
Max Horn
aa6ec62e9d Patch #885904 (Flac Support) with some tweaks by me 
svn-id: r12984
 2004-02-22 14:11:16 +00:00
Max Horn
1d7eafe675 unified code a little 
svn-id: r12974
 2004-02-21 20:00:51 +00:00
Torbjörn Andersson
a75b84dc1b Use unsigned characters when drawing the text in the control panel etc. 
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-21 08:30:10 +00:00
Torbjörn Andersson
55556c813c Proper handling of BS2 cutscene lead-outs, plus some other minor fixes. 
svn-id: r12907
 2004-02-15 14:22:54 +00:00
Torbjörn Andersson
7d9105b7ba Paint the overlay black at the end of the movie. Not all movies fade out on 
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-14 10:37:21 +00:00
Nicolas Bacca
3c6114bd9c Check for MP3 file in Broken Sword cutscenes - useful for WinCE backend as Tremor crashes for no specific reason (help appreciated :p) here 
svn-id: r12837
 2004-02-13 00:54:58 +00:00
Torbjörn Andersson
5447cd09b5 Changed the playback code to use the new "elapsed time" function instead. 
This fixes bug #880484 for me, but may need some fine-tuning.

svn-id: r12830
 2004-02-12 16:55:18 +00:00
Travis Howell
a745b3a7d0 More cutscene fixes from roever 
svn-id: r12773
 2004-02-08 14:02:43 +00:00
James Brown
91f201af29 Patch #874510 from roever, fixes BS2 demo cutscene problems (bug #884568) 
svn-id: r12761
 2004-02-07 15:09:13 +00:00
Torbjörn Andersson
802a301a16 Removed some of the #includes from sword2.h 
svn-id: r12739
 2004-02-05 14:19:07 +00:00
Max Horn
f59eb3b219 renamed (Const)Iterator to (const_)iterator; changed size() to return an uint 
svn-id: r12722
 2004-02-05 00:19:57 +00:00
Max Horn
da76ac5890 Various changes to the build system which allow building ScummVM in an 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-30 21:54:28 +00:00
Max Horn
2f8d19d004 avoid using huge static structs - they can't be stripped, and increase the exe size (in this case, 16 MB...) 
svn-id: r12678
 2004-01-30 20:57:23 +00:00
Max Horn
4dab40f123 fix whitespaces (we should eventually try to remove this code duplication again, folks. maybe add a 'video' global module or so...) 
svn-id: r12676
 2004-01-30 20:47:21 +00:00
Max Horn
176aa74827 Renamed the 'pan' effect of the mixer to 'balance', since that is what we actually do; applied patch #886786 which corrects a bug in the balance code 
svn-id: r12665
 2004-01-29 18:15:27 +00:00
Max Horn
90b96a94ab whitespaces 
svn-id: r12575
 2004-01-22 21:02:29 +00:00
Torbjörn Andersson
255e1f9036 Some minor cleanups (comments and spacing), and fixed CPU usage in synced 
cutscene playback.

svn-id: r12536
 2004-01-20 13:26:00 +00:00
Torbjörn Andersson
4b9602615c This should make subtitles work again in "overlay" cutscene mode. 
svn-id: r12506
 2004-01-18 21:09:57 +00:00
Paweł Kołodziejski
2c3dd03d26 fix warnings 
svn-id: r12504
 2004-01-18 20:57:46 +00:00
Paweł Kołodziejski
ce3e6d7fd8 fix warning 
svn-id: r12498
 2004-01-18 20:11:52 +00:00
Torbjörn Andersson
4ff60e231d I know we're not supposed to make cleanup commits at this point, but surely 
we can make an exception for removing self-described hacks and utterly
misleading comments? :-)

svn-id: r12497
 2004-01-18 19:50:59 +00:00
James Brown
5a4c5e1485 Don't allow overlapping voice in cutscenes. Fixes crash in carib cutscene. 
svn-id: r12474
 2004-01-18 12:07:21 +00:00
James Brown
ad46828d1c BS1 cutscene support. Also bugfixes (don't crash if cutscene ogg unavailable) 
svn-id: r12465
 2004-01-18 05:52:04 +00:00
James Brown
04f2bc0276 Update BS2 cutscene player with changes from roever: overlay support (default, 8bit backends should define BACKEND_8BIT for fast colour remapping) and sound syncronisation. 
svn-id: r12456
 2004-01-17 14:20:32 +00:00
Nicolas Bacca
051d5fe2d8 Yet Another EVC fix 
svn-id: r12452
 2004-01-17 11:15:38 +00:00
Paweł Kołodziejski
4270eebbb4 fix compilation for msvc when libmpeg2 enabled 
svn-id: r12447
 2004-01-17 09:15:42 +00:00
Torbjörn Andersson
673862dbfd Made a separate function out of the code that retrieves information about 
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-16 08:16:23 +00:00
Torbjörn Andersson
4980331ecf I accidentally introduced a bug when I changed the fading that would cause 
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-14 18:33:30 +00:00