Commit Graph

397 Commits

Author SHA1 Message Date
Max Horn
e9cd07e582 SWORD1 & SWORD2: Replaced ioFailed by err+eos
svn-id: r42912
2009-07-29 21:39:34 +00:00
Torbjörn Andersson
f853376379 Fixed drawing subtitles for cutscenes that are narrower than the screen, and
erase the subtitles manually if they are drawn outside the frame.

svn-id: r42859
2009-07-28 17:19:33 +00:00
Johannes Schickel
7e71865e91 Move the event recorder to its own class (EventRecoder inside common/EventRecorder.[h/cpp]).
svn-id: r42751
2009-07-25 12:59:46 +00:00
Kari Salminen
264e44d14a Fix some typos and grammar in sword1's Sound::checkSpeechFileEndianness-function's comments.
svn-id: r42477
2009-07-14 13:48:31 +00:00
Kari Salminen
242b7ef708 Fix compilation under Windows (The fabs-calls were causing error C2668 about 'ambiguous call to overloaded function').
svn-id: r42440
2009-07-13 17:09:40 +00:00
Eugene Sandulenko
bd91c1129d Patch #1936137: "Speech for Mac BS1 english"
svn-id: r42423
2009-07-12 18:52:38 +00:00
Max Horn
cbea1a1193 Added more GCC_PRINTF attributes, and fixed resulting warnings in format strings
svn-id: r42054
2009-07-03 10:40:49 +00:00
Fabio Battaglia
51d0005af3 sword1: slight cleanup of psx related sound code and comments
svn-id: r41380
2009-06-08 17:54:44 +00:00
Fabio Battaglia
14c85028b1 sword1: add Broken Sword PSX demo support
svn-id: r41369
2009-06-08 12:37:24 +00:00
Eugene Sandulenko
eb909702af Add GUI options support to Sky, Queen and Sword1&2 engines (which do not use AD)
svn-id: r41274
2009-06-06 17:57:39 +00:00
Torbjörn Andersson
0999534749 The error() and warning() functions add ! and newline automatically. (I didn't
look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061
2009-05-31 10:02:16 +00:00
Max Horn
fb79b18571 Changed SaveFileManager methods to take Common::String params (instead of char pointers)
svn-id: r41000
2009-05-29 14:38:22 +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
b7f8990ba8 Renamed the DXA, SMK and FLIC video decoders to reflect the fact that they're decoders, not players
svn-id: r40759
2009-05-21 13:02:56 +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
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
Max Horn
65b5d31814 COMMON: Removed Stream::ioFailed() and clearIOFailed(), as they are deprecated; however, retained ioFailed in SeekableReadStream and File for now (so for now this mainly affects WriteStream subclasses)
svn-id: r40725
2009-05-19 11:42:14 +00:00
Travis Howell
789cb98492 Correct translation error.
svn-id: r40718
2009-05-19 01:58:51 +00:00
Johannes Schickel
c8aec4c696 SWORD1: Commit of parentheses patch from salty-horse. (from -devel "Enabling -Wparentheses in the Makefile").
svn-id: r39762
2009-03-30 12:11:22 +00:00
Filippos Karapetis
3b507db4f0 Silenced some warnings about potentially uninitialized variables
svn-id: r39535
2009-03-19 20:38:29 +00:00
Fabio Battaglia
81cfb9ffd5 sword1: clean background buffers before writing on them in psx decoding functions
svn-id: r39480
2009-03-17 09:21:14 +00:00
Fabio Battaglia
f7e4f15218 sword1: cleanup
svn-id: r39479
2009-03-17 08:22:51 +00:00
Fabio Battaglia
a9da116ceb sword1: optimize drawing routine for screen 54
svn-id: r39477
2009-03-17 08:03:29 +00:00
Fabio Battaglia
3c9b4e0f07 sword1: enable psx background caching for screen 54 (bull's head) too
svn-id: r39475
2009-03-17 07:46:04 +00:00
Fabio Battaglia
88ff058bd7 sword1: cache decompressed psx version backgrounds, to avoid uncompressing them at every screen update.
svn-id: r39462
2009-03-16 23:10:50 +00:00
Fabio Battaglia
c40d2d2f50 sword1: added caching for train.plx when playing psx version
svn-id: r39461
2009-03-16 22:25:37 +00:00
Fabio Battaglia
647276b885 Moving sword1/vag.* into sound/, to be used by Broken Sword 2 PSX
svn-id: r39416
2009-03-15 10:25:22 +00:00
Fabio Battaglia
cbfd80a5d1 Fix GMM loading disabled after loading savegame from ScummVM menu
svn-id: r39296
2009-03-10 13:48:42 +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
Jordi Vilalta Prat
047f116515 Renamed MetaEngine::getCopyright() to getOriginalCopyright() to better match the meaning of the returned string, as discussed some time ago in scummvm-devel
svn-id: r39132
2009-03-05 12:04:58 +00:00
Fabio Battaglia
cdc9f46bd9 sword1: removed custom checks for thumbnails, using graphics/thumbnail.h functions instead
svn-id: r39130
2009-03-04 12:44:55 +00:00
Fabio Battaglia
f6028bc822 sword1: disable saving/loading through GMM when in game menu
svn-id: r39122
2009-03-04 10:39:12 +00:00
Fabio Battaglia
928a276c04 sword1: enable thumbnails when saving through GMM
svn-id: r39121
2009-03-04 10:33:29 +00:00
Fabio Battaglia
1956c1c68f Added missing checkCd() execution when loading through GMM
svn-id: r39096
2009-03-03 21:33:45 +00:00
Fabio Battaglia
7fc8bb81a7 Enabled and hopefully fixed GMM saving/loading for sword1
svn-id: r39095
2009-03-03 20:05:00 +00:00
Fabio Battaglia
5f13e5ebcd Cleaned up some comments
svn-id: r39090
2009-03-03 16:27:56 +00:00
Fabio Battaglia
0077889eeb Add playtime feature support to sword1
svn-id: r39083
2009-03-02 22:37:09 +00:00
Fabio Battaglia
2913a561cc Avoid using unnecessary buffers in psxShrinkedBackgroundToIndexed
svn-id: r39074
2009-03-02 13:46:50 +00:00
Fabio Battaglia
ed65593bb3 Avoid using unnecessary buffers in psxBackgroundToIndexed
svn-id: r39072
2009-03-02 11:30:23 +00:00
Fabio Battaglia
0233202150 Formatting changes in older PSX related functions
svn-id: r39071
2009-03-02 11:12:41 +00:00
Fabio Battaglia
08a2de9447 Changed the way Broken Sword PSX parallax are handled to improve speed
svn-id: r39070
2009-03-02 10:59:14 +00:00
Torbjörn Andersson
3429c17ac4 Removed some (the last?) remains of the BS1 MPEG cutscene player.
svn-id: r39032
2009-03-01 12:00:44 +00:00
Max Horn
3fcbda829a Merged Engine::go() and ::init() into a new run() method (currently implemented by calling the existing init&go methods; to be cleaned up by engine authors
svn-id: r39002
2009-03-01 04:30:55 +00:00
Paul Gilbert
d3b2a4ede9 Fixed MSVC compiler warning
svn-id: r38960
2009-02-28 11:09:38 +00:00
Sven Hesse
78f28d3f30 Shutting up a compiler warning
svn-id: r38958
2009-02-28 10:58:46 +00:00
Eugene Sandulenko
440fcb1d5a Patch #2638336: Broken Sword PSX Support Part 2 of 2
svn-id: r38957
2009-02-28 10:53:45 +00:00
Eugene Sandulenko
5aa50ec889 Patch #2638336: Broken Sword PSX Support
svn-id: r38956
2009-02-28 10:46:33 +00:00
Torbjörn Andersson
53572f6c07 Committed patch #2606844 ("Fix crash when using BS1 without portuguese data").
Admittedly, I'm not really that familiar with BS1 resource management, but as
far as I can tell the patch just adds sanity checking, so it shouldn't hurt.

svn-id: r38925
2009-02-27 05:52:22 +00:00
Torbjörn Andersson
349fce7454 Committed a slightly updated patch #2602772 ("Patches for BS1 bug ID #1977094")
to replace some missing subtitles with hard-coded ones.

svn-id: r38923
2009-02-27 05:20:37 +00:00
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
Travis Howell
9cee28492d Add FLAC support for speech in Broken Sword 1.
svn-id: r27721
2007-06-26 03:08:03 +00:00
David Corrales
cacd7a28fd Merged the FSNode branch with trunk r27031:27680
svn-id: r27681
2007-06-23 18:51:33 +00:00
Max Horn
d0ee1b3c8f BS1: Make use of Common::KeySate::reset()
svn-id: r27636
2007-06-22 22:19:17 +00:00
Max Horn
1441f0d044 Converted rest of BS1 to use Common::KeyState (removing two more hacks)
svn-id: r27631
2007-06-22 22:00:46 +00:00
Max Horn
c9030e4653 Made BS1 track the full KeyState upon KEYDOWN events (this makes it possible to remove to workaround for Mac keyboards)
svn-id: r27627
2007-06-22 21:34:03 +00:00
Max Horn
2fa0a5c457 Cleaning up after myself (I blame it on, err, uhh... the Vogons?)
svn-id: r27625
2007-06-22 21:16:07 +00:00
Torbjörn Andersson
e42da8f24c Use KEYCODE constants.
svn-id: r27600
2007-06-22 09:27:13 +00:00
Torbjörn Andersson
2a7c76d4e4 Added support for FLAC encoded music in Broken Sword 1. (The compression tool
knows nothing about this, and since they're being rewritten as part of the SoC,
I'm not going to do anything about that.)

svn-id: r27511
2007-06-17 14:50:49 +00:00
Torbjörn Andersson
fe8a7163cd Try to be more robust/paranoid when reading the SAVEGAME.INF file. Apart from
being a sensible precaution, it should work around some bugs like #1737801,
where the file is obviously corrupted. (Possibly mutilated by some file
transfer program.)

svn-id: r27484
2007-06-16 19:27: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
David Corrales
3b96c7fad5 Renamed methods in the FilesystemNode class to match the AbstractFSNode implementations.
Also exposed the new methods (exists, isReadable and isWritable) in FilesystemNode.

svn-id: r27113
2007-06-05 21:02:35 +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
Eugene Sandulenko
cc24af3671 Fix Enter key behavior under MacOS as mentioned in FR #1273746: "BS1: Some
smaller refinements to the GUI"

svn-id: r26946
2007-05-26 17:08:33 +00:00
Eugene Sandulenko
cdc949439b oops
svn-id: r26944
2007-05-26 16:59:13 +00:00
Eugene Sandulenko
83c713d9b4 Slighty modified patch #1701058: "Correct some graphical glitches for
Brocken Sword 1 Mac"

svn-id: r26942
2007-05-26 16:17:31 +00:00
Torbjörn Andersson
c750bea0dd Fixed error in subtitle drawing. (This part of the code should still be cleaned
up, as it's badly written. I should know, I wrote it.)

svn-id: r26877
2007-05-19 20:44:18 +00:00
Torbjörn Andersson
e005b0f42e This is an updated and slightly cleaned up version of patch #1657061 ("SWORD1:
Cutscene subtitles"). It still has the deficiencies listen in the patch tracker
and should therefore be considered work-in-progress, but sev said I should go
ahead and commit it anyway. I have no further plans for it right now, so feel
free to improve on it.

svn-id: r26644
2007-04-28 07:27:53 +00:00
Max Horn
00b9bc7b36 Removing lots of superfluous semicola (see mail by David Weinehall on scummvm-devel)
svn-id: r26594
2007-04-25 19:31:23 +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
Torbjörn Andersson
333bac56c3 Added base class for the WAV and AIFF audio streams. It's the *Macintosh* demo
(and presumably the full game, as well) that uses AIFF music. My earlier commit
was a bit unclear about that.

svn-id: r26437
2007-04-09 15:50:20 +00:00
Torbjörn Andersson
a4fb87b987 Fixed crash when playing looping WAV music.
svn-id: r26425
2007-04-09 10:07:36 +00:00
Torbjörn Andersson
2d209264c9 Implemented enough of AIFF to play the music from the Broken Sword 1 demo. At
least as far as I tried it which, admittedly, wasn't very far.

svn-id: r26423
2007-04-09 09:58:41 +00:00
Max Horn
1cf48cf17d Changed _sys -> _system, matching (almost?) all other cases where we have an OSystem* member var
svn-id: r26359
2007-04-01 18:05:11 +00:00
Gregory Montoir
5aca9dce8c added the instance of EventManager returned by OSystem::getEventManager as a member of the Engine base class. This allows to simply the code a bit and should more efficient too (ie. less virtual function chain calls, obj->getA()->getB()). Also updated several engines to make use of it.
svn-id: r26357
2007-04-01 17:36:13 +00:00
Robert Göffringmann
edd4e73787 minor cleanup
svn-id: r26212
2007-03-18 16:50:39 +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
Torbjörn Andersson
53624376b4 Applied my re-revised patch #1487149 ("Simplified keyboard repeat"), with
Fingolfin's blessings. Keyboard repeat is now handled by the event manager,
rather than by individual engines.

Since this can cause problems with some engines (see the AGI engine), the extra
"key down" events are marked as "synthetic", so that they can be ignored if
necessary.

svn-id: r26170
2007-03-17 15:44:26 +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
d6211151a9 Removed obsolete code
svn-id: r25946
2007-03-03 00:17:26 +00:00
Max Horn
4a1039fbc6 Updated the BS1 music code to use the new looping feature in our MP3/Ogg decoders
svn-id: r25943
2007-03-02 23:53:20 +00:00
Max Horn
45bf574928 Get rid of the last two usages of File::incRef/decRef
svn-id: r25919
2007-03-01 17:22:30 +00:00
Max Horn
8c8abca6f8 Changed the AppendableAudioStream code to use a queue of buffers, instead of a fixed size wrap-around memory buffer (this reduces memory usage in some cases by 500-700k, while actually being more flexible)
svn-id: r25909
2007-02-28 14:48:26 +00:00
Max Horn
551b2b6b3d Fix for bug #1670081 -- SWORD1: game won't load (ogg compression) (regression)
svn-id: r25905
2007-02-28 10:44:52 +00:00
Max Horn
dd26444b72 oops
svn-id: r25842
2007-02-25 00:09:22 +00:00
Max Horn
9823cbe1ea Added TODO: Sword1's MusicHandle::play etc. should be rewritten to take advantage of the enhanced compressed audio stream code
svn-id: r25841
2007-02-25 00:04:35 +00:00
Max Horn
21b095ce20 Switch to the new makeVorbisStream variant (and get rid of a File::decRef call)
svn-id: r25840
2007-02-25 00:03:47 +00:00
Max Horn
b3931a847d Trying to unify the order in which we try the various audio formats: Prefer FLAC (lossless) over Ogg Vorbis ('free') over MP3 -- the order is admittedly somewhat arbitrary, but at least now it's consistent across all parts of ScummVM
svn-id: r25837
2007-02-24 23:40:28 +00:00
Max Horn
cafe61fec2 cleanup
svn-id: r25834
2007-02-24 23:15:39 +00:00
Max Horn
227a080e5b Patch #1663933 (Kill premix channel) with a few tiny additional tweaks by me
svn-id: r25752
2007-02-20 18:50:17 +00:00
Torbjörn Andersson
5478589937 Last batch of header consistency fixes. At least for the game engines.
svn-id: r25751
2007-02-20 18:04:13 +00:00
Max Horn
b8aeefaffb Added finalize() method to Common::OutSaveFile (which by default just flushes the stream), changed engines to call that before deleting OutSaveFile instances (instead of just flushing)
svn-id: r25660
2007-02-17 18:55:51 +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
Eugene Sandulenko
cd8a5f3a98 First phase of detection-related plugins interface improvements. Now plugins
return StringMap instead of fixed list of parameters. This adds great
flexibility.

Current patch should not alter any functionality, i.e. if there are regressions,
submit a report. Phase 2 will benefit from these changes and will come later.

svn-id: r25134
2007-01-20 21:27:57 +00:00
Travis Howell
0141cbd1df GF_DEMO is only required by the PC version of Broken Sword 1 demo
svn-id: r24853
2006-12-15 00:59:11 +00:00
Eugene Sandulenko
3244d20ee2 Add proper detection of BS1 Mac demo. Game crashes at attempt to play speech.
svn-id: r24851
2006-12-14 21:23:24 +00:00
Torbjörn Andersson
45886ec8ed When drawing an interlaced frame, only clear every other line instead of the
entire buffer.

Introduced a _drawBuffer pointer which points either to _scaledBuffer or
_frameBuffer1. That way, we don't need to copy _frameBuffer1 every time we
draw an unscaled frame. (Probably the most common case by far.)

Adjusted the Broken Sword 1 DXA player for the second change. (It sneakily
avoids copying each frame by using _drawBuffer directly.)

svn-id: r24846
2006-12-14 05:21:19 +00:00
Travis Howell
1ba6947440 Adjust DXA scaling code for Broken Sword 1
svn-id: r24841
2006-12-11 09:26:54 +00:00
Eugene Sandulenko
3e6414a55f Slighty modified Patch #1571787: "Support for Mac Broken Sword 1". sword1macdemo
target was commented out until existence of the demo is confirmed.

svn-id: r24697
2006-11-12 19:05:51 +00:00
Max Horn
4c14cf6d1a Moved base/engine.cpp and .h to engines/ (main motivation: helps untangle the linker dependency graph). Porters will have to update project files
svn-id: r23974
2006-09-23 00:42:35 +00:00