thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33464 commits 35 branches 0 tags 1.4 GiB
Commit graph

56 commits

Author SHA1 Message Date
Joost Peters
e1ad748f0d SWORD2: Don't show a pop-up if the 'eye' movie is missing - it was omitted in later re-releases. 
svn-id: r44187
 2009-09-18 16:39:14 +00:00
Torbjörn Andersson
7a6329a29b Broken Sword 2, unsurprisingly, had the same subtitle drawing glitch for small 
cutscenes that Broken Sword 1 had. And a memory leak. This should fix both.

svn-id: r42861
 2009-07-28 17:53:59 +00:00
Johannes Schickel
b3c6751b9b Strip trailing whitespaces in the whole code base. 
svn-id: r40867
 2009-05-24 15:17:42 +00:00
Filippos Karapetis
6ec870303f - Reverted commit #40730, as it introduced rounding errors 
- Properly fixed the FLIC player
- The sound chunk tag of DXA files is now read by the DXADecoder's loadFile() method

svn-id: r40736
 2009-05-20 10:43:18 +00:00
Torbjörn Andersson
caf9bf0941 Removed the rest of the hard-coded cutscene information. It was only needed to 
get the number of frames of a cutscene (to find the "lead out frame"), but this
information is already provided by both the DXA and the SMK players. (It wasn't
provided by the now obsolete MPEG player.)

svn-id: r40735
 2009-05-20 04:29:09 +00:00
Torbjörn Andersson
358b1a7c7e Removed the "seamless" flag. It was something I added to cope with the fade 
in/out behaviour of the MPEG cutscene player, and no longer seems to be needed.

svn-id: r40734
 2009-05-20 04:07:34 +00:00
Filippos Karapetis
e358b13ef9 Changed calculations based on frame delay to be based on the scale of 1ms, not 1/100. This fixes the FLIC player and also makes the overall code a bit clearer and easier to understand 
svn-id: r40730
 2009-05-19 19:56:53 +00:00
Fabio Battaglia
dc9c538a62 Sword2: PSX version support, and GMM loading/saving 
svn-id: r39896
 2009-04-07 19:52:46 +00:00
Max Horn
e080a59337 Renamed SMKPlayer -> SmackerDecoder and DXAPlayer -> DXADecoder, as well as some other tweaks 
svn-id: r39255
 2009-03-09 03:45:23 +00:00
Max Horn
f9ecd95d69 Whitespace cleanup: Convert space followed by tab to just tab 
svn-id: r39203
 2009-03-07 19:24:31 +00:00
Torbjörn Andersson
041af01f7d Don't show a warning dialog for missing cutscenes in the demo. As noted in bug 
#2669360, the demo tries to play cutscenes which really aren't there.

svn-id: r39194
 2009-03-07 17:27:18 +00:00
Torbjörn Andersson
6e2848ff98 Rewrote the cutscene player to be more like the one in Broken Sword 1. This fixes 
a subtitle colour regression, but mainly it simplifies the code. The "dummy"
player has been removed. There are almost certainly regressions, but I'm hoping
it's stable enough for testing now.

svn-id: r38697
 2009-02-21 15:07:05 +00:00
Filippos Karapetis
781d7da6b1 Applied my patch for the BS1/2 video player 
- Support for the MPEG2 videos in BS1/2 has been dropped. The MPEG2 videos were lossy, and support for them complicated the code a lot.
- Support for the non-existing enhanced MPEG cutscene packs for BS1 has been dropped. As a consequence, the credits player and the splitted audio stream players used for these packs has been removed
- The original Smacker videos for both games are now supported, using our Smacker player (which is based off publically available specs and FFMPEG)
- The animations now use the common video player code. Both the Smacker videos and our DXA video packs are supported

svn-id: r38236
 2009-02-15 13:29:48 +00:00
Max Horn
abc06ca18e Moved Graphics::PixelFormat into its own header file; turned RGBToColor etc. into methods, and added an operator== 
svn-id: r35993
 2009-01-22 04:35:10 +00:00
Travis Howell
9c20a533bb Enable Smacker support, and switch later HE games to Smacker support (since they aren't supported yet). 
svn-id: r35368
 2008-12-14 23:41:48 +00:00
Torbjörn Andersson
db3438f2c9 Allow pausing during cutscene movies. (This will need an update to the mixer's 
getSoundElapsedTime() function to work better.)

svn-id: r34954
 2008-11-09 13:20:43 +00:00
Max Horn
edf9f24926 Got rid of OSystem::colorToRGB and RGBToColor; added implementations for OSystem::getOverlayFormat to several ports (pending testing by the porters) 
svn-id: r34912
 2008-11-06 15:02:50 +00:00
Max Horn
9b160804ab Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit 
svn-id: r34700
 2008-09-30 12:27:38 +00:00
Christopher Page
7f480ac571 Quit and RTL code is more modular now. EVENT_RTL no longer sets _shouldQuit, shouldQuit is only set if there's an EVENT_QUIT. EVENT_RTL and EVENT_QUIT are completely separate from each other. Engine::quit() method now checks both _shouldQuit and _shouldRTL to determine if the engine should exit. There is no longer a need for resetQuit(), so it's removed 
svn-id: r33082
 2008-07-16 04:22:56 +00:00
Christopher Page
796e606971 SWORD2 works with the new GMM implementation 
svn-id: r33044
 2008-07-13 22:00:39 +00:00
Torbjörn Andersson
323aafcf78 The dummy ("narration only") cutscene player misbehaved a bit if the cutscene 
soundtrack was present. It should work better now.

svn-id: r30455
 2008-01-12 20:18:41 +00:00
Travis Howell
9aa0a47846 Revert patch #1709219 - DXA Player: double size scaling option. 
svn-id: r29351
 2007-11-01 06:00:16 +00:00
Eugene Sandulenko
3318c4b474 Slighly modified patch #1709219: "DXA Player: double size scaling option" 
svn-id: r29347
 2007-10-31 21:37:40 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated. 
svn-id: r28966
 2007-09-19 08:40:12 +00:00
Torbjörn Andersson
db8e5332fc Use the KEYCODE constants. 
svn-id: r27593
 2007-06-21 19:33:05 +00:00
Travis Howell
12c9fb0382 Add support for pausing/resume cutscenes shown on the OmniTV in The Feeble Files. 
svn-id: r27371
 2007-06-12 06:08:47 +00:00
Max Horn
22c0403e0d Re-added Revolution Software copyright to BS2 engine 
svn-id: r27030
 2007-05-31 20:28:29 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots 
svn-id: r27024
 2007-05-30 21:56:52 +00:00
Torbjörn Andersson
4b4d7dec8e I must have accidentally broken frame skipping when I added DXA playback. Made 
frame skipping actually skip the updateScreen() call.

svn-id: r26469
 2007-04-14 14:07:11 +00:00
Max Horn
ed54ea9155 Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again 
svn-id: r26180
 2007-03-17 19:02:05 +00:00
Max Horn
15d9bc42ea Force all code to use EventManager::pollEvent instead of OSystem::pollEvent 
svn-id: r26156
 2007-03-17 00:53:21 +00:00
Max Horn
8366420474 Remove unneeded #includes 
svn-id: r25838
 2007-02-24 23:41:20 +00:00
Torbjörn Andersson
98a8e88f61 Instead of pre-rendering all subtitles and pre-loading all sounds for a movie 
cutscene, render the text and play the speech when needed. It probably won't
play as nicely from CD now, but using less memory seems more important to me.

svn-id: r25428
 2007-02-08 21:55:37 +00:00
Max Horn
73c3625f1f Fixing various doxygen warnings 
svn-id: r25362
 2007-02-03 21:37:52 +00:00
Max Horn
cb49cbdd45 * Reimplemented Mixer::pauseAll to simply invoke pause on all channels 
(implying change of semantics)
* Reordered the params of Mixer::playRaw (the SoundType now comes first, not last)
* Removed Mixer::isPaused
* Removed Mixer::getSoundElapsedTimeOfSoundID
* Added some doxygen comments to the Mixer

svn-id: r25356
 2007-02-03 19:05:53 +00:00
Torbjörn Andersson
d2910fe758 Added separate function for playing cutscene lead-in/out sounds, and made sure 
that these are stopped whenever the engine is going to do a mass killing of
game resources, e.g. when restoring or restarting the game. Should fix bug
#1645480. (This was a regression added during the rewrite to support DXA.)

svn-id: r25204
 2007-01-26 18:21:41 +00:00
Torbjörn Andersson
4c46f4a878 The MPEG player no longer handles frame syncing/dropping, so this comment is 
obsolete now.

svn-id: r24872
 2006-12-18 07:55:31 +00:00
Torbjörn Andersson
60aee54bfe Fixed bug #1569594 ("BS2 DXA Movie Exit/Crash"). That's what I get for only 
testing with subtitles enabled... :-)

svn-id: r24089
 2006-10-02 23:07:43 +00:00
Torbjörn Andersson
cc3b4cdf99 Now that the cutscene handling in both BS1 and BS2 has been extended to play 
DXA movies (the MPEG movies still work, of course), there is no longer any need
for the MPEG decoder to handle sound and frame syncing. That is now the
responsibility of the player, not the decoder.

The obvious next step, then, would be to put that in a new player class, and
have both BS1 and BS2 use that. Maybe FF as well.

svn-id: r23757
 2006-08-26 12:29:00 +00:00
Torbjörn Andersson
4f9576e033 The DXA player now bases subtitle position on screen size, rather than frame 
size. This should help people who want to use the smaller, low-quality
cutscenes instead of the high-quality ones.

The MPEG player probably doesn't know this trick. Maybe later.

svn-id: r23742
 2006-08-23 21:13:11 +00:00
Oystein Eftevaag
17f8c7067a Removing redundant paranthesis 
svn-id: r23543
 2006-07-21 11:04:21 +00:00
Torbjörn Andersson
6c0edab41e Some cleanups and restructuring. The clearScreen() function has been renamed 
clearFrame(), and is only responsible for clearing the frame buffer. Frame
syncing and frame drawing are now separate from each other.

svn-id: r23525
 2006-07-15 23:44:44 +00:00
Torbjörn Andersson
961e56c636 Fixed regression: Test if there's a text object to close before closing it. 
svn-id: r23524
 2006-07-15 23:18:11 +00:00
Torbjörn Andersson
c7babbea99 Close the current text object when the movie is ended, to avoid potential 
memory leak, and be a bit more robust about handling text objects in the dummy
player.

svn-id: r23523
 2006-07-15 22:42:28 +00:00
Torbjörn Andersson
700953cff7 Oops. I just noticed I was using _black to track the white colour, and _white 
to track the black colour.

svn-id: r23522
 2006-07-15 22:22:39 +00:00
Torbjörn Andersson
68c150df3c This is more consistent with how we usually initialize arrays of structs, and 
seems to still keep msvc8 happy.

svn-id: r23521
 2006-07-15 22:04:42 +00:00
Johannes Schickel
59d0ddf806 Fix building with msvc8. 
svn-id: r23518
 2006-07-15 21:23:08 +00:00
Torbjörn Andersson
cd020a688e Moved the initial screen clearing from play() to load(), so that it will be 
done before the MPEG player calls showOverlay().

svn-id: r23482
 2006-07-10 18:57:40 +00:00
Torbjörn Andersson
d8e974ba72 Fixed bug #1519817, "ALL: Build failure if libmpeg2 is disabled". 
svn-id: r23470
 2006-07-10 09:29:12 +00:00
Torbjörn Andersson
5658e71f4d Added support for DXA cutscenes, while still retaining support for the old MPEG 
cutscenes and the "dummy" (subtitles and voice-over) mode. Several tweaks and
cleanups were made in this process, and there may very well be regressions, but
it should be stable enough to commit.

svn-id: r23420
 2006-07-08 11:42:07 +00:00