Commit Graph

247 Commits

Author SHA1 Message Date
Torbjörn Andersson
ab11da0602 Allocate the background sound handle dynamically. Otherwise, it seems to me as if
it should be invalid as soon as the makeMoviePlayer() function ends. While that
never caused any noticeable problems for me in Broken Sword 1, it broke things
in amusing ways when I tried to rewrite the Broken Sword 2 cutscene player along
the same lines.

svn-id: r38684
2009-02-21 11:27:04 +00:00
Torbjörn Andersson
c3068549da Cleanup.
svn-id: r38680
2009-02-21 11:22:56 +00:00
Torbjörn Andersson
9b2029a7a8 Minor consistency change.
svn-id: r38650
2009-02-20 23:47:11 +00:00
Torbjörn Andersson
dbb8ad9da1 If the DXA cutscene audio fails to play for whatever reason (shouldn't happen in
BS1 since all the cutscenes have an audio track), assume audio and video are in
sync.

svn-id: r38384
2009-02-16 21:57:22 +00:00
Torbjörn Andersson
a57e773a0e Removed unnecessary tests. (It's ok to free a NULL pointer.)
svn-id: r38344
2009-02-16 06:11:37 +00:00
Torbjörn Andersson
de0c772a01 Blank the palette correctly. (Fixes Valgrind warning.)
svn-id: r38343
2009-02-16 06:02:21 +00:00
Willem Jan Palenstijn
d2e8256439 defer BS1 palette update from newScreen to updateScreen, based on patch by eriktorbjorn for bug #2599963. Maybe suitable for branch-0-13-0 after more testing.
svn-id: r38320
2009-02-15 22:33:18 +00:00
Johannes Schickel
5417f6bacb - Replace OSystem::clearScreen with OSystem::fillScreen as discussed on -devel.
- Update BaseBackend and DC port to properly implement OSystem::fillScreen (now only PalmOS has to be updated).
- Update all client code which relied on OSystem::clearScreen so far.

svn-id: r38304
2009-02-15 21:20:21 +00:00
Filippos Karapetis
2ef26fcd4a Oops, fixed Smacker video playing in BS1
svn-id: r38237
2009-02-15 13:43:44 +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
Willem Jan Palenstijn
af900a2e14 clear full screen before playing movie in BS1 (fixes #2599573)
svn-id: r36334
2009-02-14 18:34:10 +00:00
Torbjörn Andersson
6d70045228 Fixed bug #2599531 ("SWORD1: truck.dxa plays striped"). The last parameter to
copyFrameToBuffer() is the pitch of the destination buffer, not the frame.

svn-id: r36330
2009-02-14 15:52:31 +00:00
Max Horn
716f88f571 Avoid using g_engine if possible
svn-id: r36149
2009-01-30 16:04:39 +00:00
Max Horn
341bc64aaf do not include common/debug.h from common/util.h
svn-id: r36143
2009-01-30 05:25:17 +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
Torbjörn Andersson
a2c671da97 Clear the list of savegames before re-populating it. Otherwise, even save names
that have been entered before cancelling the dialog will remain in it.

svn-id: r35987
2009-01-21 20:00:26 +00:00
Torbjörn Andersson
248605800e Don't allow the nul character in savegame names, since that terminates the
string. This happens, for instance, when pressing the Shift key. (I usually start
my savegame names with an upper-case letter, and I couldn't understand why it
didn't seem to register any of my keypresses.)

svn-id: r35986
2009-01-21 19:46:51 +00:00
Filippos Karapetis
4b24b4d06f Updated SWORD1 with the latest changes to video players
svn-id: r35760
2009-01-06 17:49:41 +00:00
Johannes Schickel
690b88f982 Renamed gui/newgui.cpp -> gui/GuiManager.cpp and gui/newgui.h -> gui/GuiManager.h
svn-id: r35668
2009-01-02 03:21:40 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Max Horn
df20d264fd Pushing down some header deps (on common/system.h, mostly)
svn-id: r35542
2008-12-25 20:40:00 +00:00
Eugene Sandulenko
829cbc4110 Move all video players to separate directory
svn-id: r35470
2008-12-21 21:08:17 +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
Johannes Schickel
3bdef4f9a2 Fixed compilation.
svn-id: r35200
2008-12-01 21:35:17 +00:00
Max Horn
4b7d455580 Got rid of Stream::readLine_OLD calls in two places (mostly untested, please check/test for regressions)
svn-id: r35198
2008-12-01 21:13:02 +00:00
Torbjörn Andersson
72a847797d Committed by patch #2219361 ("BS1: Simplified subtitles"). It uses the
lockScreen() / unlockScreen() backend API, instead of copyRectToScreen().
Before, it had to copy a piece of the engine's screen to draw on to simulate
transparency, which was awkward.

However, this means we're now forcing full-screen updates on each frame. There
may be performance regressions, particularly if the frames are much smaller
than the screen. Hopefully, it's the decoding that's the bottleneck, but if
this causes problems on low-end devices... well, Fingolfin had some ideas about
that when he first proposed the lockScreen() / unlockScreen() API.

svn-id: r35115
2008-11-18 17:48:19 +00:00
Johannes Schickel
d99ab163cc Fixed meta engine related save functions (some where relying on "target.???" instead of "sword1.???").
svn-id: r35113
2008-11-18 17:03:55 +00:00
Filippos Karapetis
2463c550ac Reverted to old behavior: save games for sword1 can be shared again across all versions (since they're exactly the same) - they're now named sword1.* and no longer named after the game ID
svn-id: r35112
2008-11-18 16:57:57 +00:00
Filippos Karapetis
7650b61d27 Applied a slightly modified version of my patch #2307224 - "BS1: Save/load overhaul"
svn-id: r35111
2008-11-18 16:31:55 +00:00
Johannes Schickel
2ef8a32a01 Fixed various g++ warnings ("format not a string literal and no format arguments").
svn-id: r35096
2008-11-16 20:20:31 +00:00
Johannes Schickel
5a0556f09c Committed my patch #2123680 "SDL: Backend transaction / rollback support".
svn-id: r35062
2008-11-14 22:08:10 +00:00
Filippos Karapetis
ebb72cdfdf Moved sword1 detection and meta engine specific code from sword1.cpp into detection.cpp, like other engines
svn-id: r35043
2008-11-13 12:22:58 +00:00
Vicent Marti
b98f89c7f0 Merged GUI::Theme and Gui::ThemeEngine into the same class, GUI::ThemeEngine.
Massive cleanup.

svn-id: r34983
2008-11-10 11:24:55 +00:00
Filippos Karapetis
7d8e4ca59b Added a getMaximumSaveSlot() implementation for sword1 and sword2
svn-id: r34969
2008-11-09 19:30:09 +00:00
Max Horn
40136f2590 Switched various Engine APIs to use Common::Error
svn-id: r34916
2008-11-06 17:05:54 +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
f32be87633 Turned enum PluginError into Common::Error, which in the future is to be used in more places. Help with this is highly welcome
svn-id: r34906
2008-11-05 17:24:56 +00:00
Max Horn
fe2935ad4b Got rid of the unused 'filename' attribute in SaveStateDescriptor
svn-id: r34905
2008-11-05 15:41:12 +00:00
Max Horn
61aadb378d Fixed the EngineFeature vs. MetaEngineFeature mess, clarified some EngineFeature comments
svn-id: r34896
2008-11-04 16:11:40 +00:00
Filippos Karapetis
b7a219ebc6 Renamed engine feature kSupportsDirectLoad to kSupportsLoadingDuringStartup, as discussed in patch #2122869
svn-id: r34854
2008-10-26 16:42:08 +00:00
Torbjörn Andersson
331c38e1c7 Added semi-ugly workaround for bug #2182450 ("BS1 Demo: Crash due to missing
speech segment").

svn-id: r34853
2008-10-26 15:20:24 +00:00
Torbjörn Andersson
c8312fdacc Another attempt at making the Broken Sword 1 savegame list in the launcher match
the in-game one. Only show savegames which actually have a corresponding save
file. (That's a trick the in-game dialog doesn't know yet.) The match isn't
perfect, though: The launcher lists the first save slot as 0, while the in-game
dialog lists it as 1. But changing the launcher one will make it set the wrong
"save_slot" value.

svn-id: r34851
2008-10-26 11:19:10 +00:00
Torbjörn Andersson
e3312288d7 Removed obsolete FIXME.
svn-id: r34846
2008-10-23 16:58:01 +00:00
Kari Salminen
4d4042df36 Shut up MSVC and add FIXMEs to Sword's listSaves and ThemeEngine's loadThemeXML.
svn-id: r34839
2008-10-22 20:29:17 +00:00
Johannes Schickel
a5a73ff9d6 Formatting.
svn-id: r34830
2008-10-20 21:55:20 +00:00
Torbjörn Andersson
07220529dc Fix - at least partially - the list of savegames for the launcher's load dialog.
But I suspect there are still bugs lurking in that code. I really dislike how
Broken Sword 1 handles savegames...

svn-id: r34829
2008-10-20 21:47:46 +00:00
Torbjörn Andersson
871375d4b5 I believe this fixes bug #2162345 ("BS1: Can't overwrite savegame"), but I'd
really appreciate it if someone would test it further, in case I missed
something. (Broken Sword 1 stores the names of the savegames in a separate file,
and that has to be in sync with the individual savegame files. In my experience,
that sort of thing can really attract bugs...)

svn-id: r34828
2008-10-20 04:39:10 +00:00
Torbjörn Andersson
c2066b9c20 Fixed crash after using cutscene subtitles. (Now I *know* no one has used that
feature before. :-)

svn-id: r34796
2008-10-13 18:41:12 +00:00
Torbjörn Andersson
4cd3adb690 Increased maximum subtitle line length for SimSaw. That code really should be
made more robust some day, but until now I don't think anyone actually used it.

svn-id: r34787
2008-10-12 22:14:30 +00:00
Max Horn
c7fde102e3 Renamed FilesystemNode -> FSNode
svn-id: r34716
2008-10-02 16:58:59 +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
Torbjörn Andersson
3779fc2170 Slight simplification of last commit.
svn-id: r34658
2008-09-27 17:51:22 +00:00
Torbjörn Andersson
46a5320f0d Allow quitting or returning to the launcher while cutscenes are playing.
svn-id: r34657
2008-09-27 17:47:22 +00:00
Torbjörn Andersson
7644ff05f9 Fixed typos.
svn-id: r34656
2008-09-27 17:25:40 +00:00
Max Horn
655ce26b3f Big patch changing the signature of various Stream methods (some ports may need to be slightly tweaked to fix overloading errors/warnings)
svn-id: r34514
2008-09-13 16:51:46 +00:00
Max Horn
2bc093828f Replaced Engine::_gameDataPath (a String) by Engine::_gameDataDir (an FSNode); adapted code to that (by using getChild() to get subdirs, not string concatenation
svn-id: r34434
2008-09-07 22:10:58 +00:00
Max Horn
57e724bfc3 Renamed SeekableReadStream::readLine to SeekableReadStream::readLine_OLD; added a new alternate SeekableReadStream::readLine() instead
svn-id: r34315
2008-09-03 17:53:25 +00:00
Max Horn
d3642080de Moved check for shouldRTL() from engines to scummvm_main
svn-id: r34310
2008-09-03 16:56:40 +00:00
Max Horn
531bcf847c Moved FilesystemNode / FSList to namespace Common; also got rid of some 'typedef Common::String String;' name aliases
svn-id: r34302
2008-09-03 11:22:51 +00:00
Filippos Karapetis
3d8e7580a0 Silence MSVC warning about empty switch statement
svn-id: r34265
2008-09-01 23:36:59 +00:00
Christopher Page
ec8dac5540 Added a MetaEngineFeature for RTL support, the RTL button is disabled in the GMM if the engine doesn't support it
svn-id: r33921
2008-08-16 02:53:16 +00:00
Christopher Page
dca5f7dc20 If the last savegame is deleted, reset save_slot in config man to -1
svn-id: r33918
2008-08-15 21:25:24 +00:00
Christopher Page
603f0a2f8c Fixes for Sword1 engine loading from launcher
svn-id: r33915
2008-08-15 20:49:56 +00:00
Christopher Page
9d3cdcb2da Defined some MetaEngineFeatures for the engines, the launcher uses these features to allow/disallow loading and deleting saves
svn-id: r33909
2008-08-15 18:15:14 +00:00
Christopher Page
4198ee9623 Merged revisions 33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446,33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
 

svn-id: r33624
2008-08-04 22:34:07 +00:00
Max Horn
0be985ce83 Changed class File (and derived classes) to only support read-only access; added a new class DumpFile for writing
svn-id: r33412
2008-07-29 16:09:10 +00:00
Christopher Page
b0e0896579 Added --list-saves support for SWORD1
svn-id: r33395
2008-07-29 04:51:23 +00:00
Christopher Page
437b9ee281 More work with SWORD1 sound settings
svn-id: r33091
2008-07-17 20:08:59 +00:00
Christopher Page
41d896dc2f SWORD1 Sound settings work with the GMM
svn-id: r33090
2008-07-17 17:49:38 +00:00
Christopher Page
0175425109 Overlooked something in SWORD1, works now
svn-id: r33045
2008-07-13 22:08:58 +00:00
Christopher Page
e7d7f8df95 SWORD1 works with the new GMM implementation
svn-id: r33043
2008-07-13 21:54:23 +00:00
Eugene Sandulenko
37563ff3ae Fix bug #1981402: "BS1: grammatical error in the Italian menu"
svn-id: r32471
2008-06-01 18:37:35 +00:00
Jordi Vilalta Prat
38a8aa516e Allow static and dynamic plugins to be used at the same time
svn-id: r31888
2008-05-06 03:00:26 +00:00
Max Horn
88bb567e18 Merged lots of _mixer->isReady() warnings into a single one in Engine constructor
svn-id: r30871
2008-02-15 17:01:35 +00:00
Jordi Vilalta Prat
c103290e2b Initial support for plugin types
svn-id: r30825
2008-02-08 00:02:23 +00:00
Max Horn
8a73356a2d Revised Engine plugin API to only provide a single func which returns a MetaEngine instance. Used this to simplify the rest of the plugin system
svn-id: r30780
2008-02-03 18:56:47 +00:00
Torbjörn Andersson
e51bf80218 Changed "COMPATIBLITY" to "COMPATIBILITY".
svn-id: r30754
2008-02-03 10:15:36 +00:00
Max Horn
dc979b03cf New MetaEngine class (work in progress to replace the current Engine plugin API with a more object oriented approach)
svn-id: r30726
2008-02-02 00:54:52 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs.
svn-id: r30667
2008-01-28 00:14:17 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces.
svn-id: r30664
2008-01-27 19:47:41 +00:00
Torbjörn Andersson
7b15433572 Removed unnecessary semi-colons.
svn-id: r30476
2008-01-13 22:12:35 +00:00
Paul Gilbert
6eb64102a4 Fix to remove a tab character from the GPL header
svn-id: r30238
2008-01-05 12:45:14 +00:00
Torbjörn Andersson
3451d1c30f Applied my alternative patch for feature request #1266599 ("BS1: Invert stereo
channels for traffic sounds in Rue Jarry"). Now let's see if it breaks any
other scenes. :-)

svn-id: r30220
2008-01-04 18:46:08 +00:00
Eugene Sandulenko
23313cb82e Patch #1733017: "SWORD1: Possible patch for bug #1730183"
svn-id: r30124
2008-01-01 16:42:05 +00:00
Eugene Sandulenko
d4d072fe04 Patch #1857121: Refactoring of the getSavePath method
svn-id: r30032
2007-12-28 07:37:04 +00:00
Max Horn
a556368c99 Update mouse coordinates onn *all* mouse events, i.e. also after click events
svn-id: r29657
2007-11-28 15:00: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
Eugene Sandulenko
77eea722af Modified patch #1738058: "Action recorder".
svn-id: r28968
2007-09-19 13:55:05 +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
Max Horn
c3d3aebe87 Patch #1768757: Merge fsnode-gsoc into trunk (MAJOR change, will break compilation on some ports)
svn-id: r28944
2007-09-18 20:02:04 +00:00
Max Horn
4a302b25ad Lots of source code formatting corrections
svn-id: r28887
2007-09-10 13:17:20 +00:00
Chris Apers
500481c4ec Cleanup: remove obsolete code (PalmOS 68K version not supported anymore)
svn-id: r28803
2007-09-01 19:13:04 +00:00
David Corrales
6856535010 Merged fsnode with trunk: r27971:28460
svn-id: r28462
2007-08-05 19:34:20 +00:00
Max Horn
86d015c055 Added FIXME comments regarding use of AudioStream::openStreamFile
svn-id: r28112
2007-07-15 19:26:00 +00:00
Max Horn
f4c0b853cc Fixed sound factory messup caused by my previous commit
svn-id: r28111
2007-07-15 19:24:00 +00:00
David Corrales
9bfe5d5354 Merged the FSNode branch with trunk r27681:27969
svn-id: r27970
2007-07-08 16:58:54 +00:00
Max Horn
e1bcd70436 Re-added __attribute__(packed)
svn-id: r27830
2007-07-01 18:18:43 +00:00
Max Horn
e2ad271bd8 Removing non-ASCII chars from source code
svn-id: r27818
2007-07-01 12:47:07 +00:00
Travis Howell
2e3ce7dc8e Fix FLAC support for speech in Broken Sword 1.
svn-id: r27723
2007-06-26 05:51:47 +00:00