Commit Graph

143 Commits

Author SHA1 Message Date
Matthew Hoops
e13abd77e9 Add md5's for Myst ME and Riven DVD French.
svn-id: r49335
2010-05-30 21:44:26 +00:00
Matthew Hoops
7f678907d7 Add some null checking when pausing/resuming videos.
svn-id: r49254
2010-05-27 02:15:11 +00:00
Matthew Hoops
163847b245 Fix the 'boiling water' videos in the boiler puzzle.
svn-id: r49237
2010-05-26 13:11:04 +00:00
Matthew Hoops
5f3952e578 Fix a Myst regression: not a good idea to use memset on a Common::String :)
svn-id: r49215
2010-05-25 18:11:14 +00:00
Matthew Hoops
4a8841202a Implement *scpbtn and *_domecheck. The domes can now be opened/closed (not using the sliders).
svn-id: r49208
2010-05-25 03:46:28 +00:00
Matthew Hoops
ad0eb0b06e Move the PICT code to graphics/ with some updates; needed for SCI1.1 Mac.
svn-id: r49195
2010-05-24 17:18:09 +00:00
Matthew Hoops
2f31b05651 Move Mohawk's QuickTime code to graphics/ (and QDM2 to sound, disabled when Mohawk is not enabled) so SCI can use the code.
svn-id: r49165
2010-05-23 18:33:55 +00:00
Matthew Hoops
ad42fa0b2d The QuickTime getPalette() function should output in RGB format, not RGBA.
svn-id: r49121
2010-05-20 18:45:12 +00:00
Matthew Hoops
2e0fdda51f Add a pause level system to VideoDecoder (blatantly ripped off from Engine) and adapt Mohawk to it.
svn-id: r49120
2010-05-20 18:38:06 +00:00
Filippos Karapetis
9675bf2e7a Reverted commit #49088, seems like to be a false positive from MSVC on the QTPlayer::*func pointer of the ParseTable struct (warning 4121, alignment of a member was sensitive to packing)
svn-id: r49106
2010-05-19 17:18:20 +00:00
Filippos Karapetis
9af44c9332 Added packing to the QT structures
svn-id: r49088
2010-05-19 00:25:12 +00:00
Matthew Hoops
759e4923d0 Add a new class 'RewindableVideoDecoder' that allows a video to be rewound and have QTPlayer inherit from that.
svn-id: r49084
2010-05-18 17:36:34 +00:00
Matthew Hoops
bddceced34 Have QTPlayer inherit from VideoDecoder. The video downscaling (QuickTime is insane) has also been moved to the QTPlayer class.
svn-id: r49081
2010-05-18 14:59:20 +00:00
Matthew Hoops
11cbdd0318 Committing the rest of the VideoDecoder Rewrite from patch #2963496.
svn-id: r49079
2010-05-18 14:17:24 +00:00
Max Horn
970745e60c Move DebugChannel related code to new header
svn-id: r48935
2010-05-04 11:59:22 +00:00
Max Horn
b3e404109c Move initGraphics and initCommonGFX from to new header.
These functions are only used internally be Engine subclasses, and
by moving them to a separate header we can reduce indirect header
dependencies.

svn-id: r48934
2010-05-04 11:58:12 +00:00
Max Horn
5568a8473b Get rid of Engine::_gameDataDir.
This greatly reduces indirect dependencies on several header files
from common.

svn-id: r48933
2010-05-04 11:56:52 +00:00
Max Horn
460d69e885 COMMON: Move DebugChannel stuff into a new DebugMan singleton
svn-id: r48821
2010-04-27 21:40:52 +00:00
Matthew Hoops
001bca2d6c Remove use of global constructors in Mohawk.
svn-id: r48731
2010-04-19 20:28:36 +00:00
Max Horn
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream
svn-id: r48637
2010-04-12 09:14:17 +00:00
Matthew Hoops
3fe570cd70 Cleanup the Myst resource caching code a bit and add support for caching Myst ME MJMP sound 'jumps'
svn-id: r48579
2010-04-06 23:38:43 +00:00
Matthew Hoops
8e8b6cfa78 More transistions->transitions fixes
svn-id: r48571
2010-04-06 16:33:15 +00:00
Ori Avtalion
48a9e64338 Fix "Transitions" typo
svn-id: r48570
2010-04-06 15:40:13 +00:00
Max Horn
894e2aefe6 GUI: Unify various definitions of kOKCmd and move it to namespace GUI
svn-id: r48564
2010-04-06 09:26:43 +00:00
Matthew Hoops
96ccd4abcc Add support for 32bpp DirectBitsRect in Myst ME PICT's. Fixes various cards, especially in the Myst observatory.
svn-id: r48558
2010-04-05 19:41:30 +00:00
Max Horn
cac0ac66e2 COMMON: Get rid of Common::StringList
svn-id: r48287
2010-03-18 15:54:40 +00:00
Max Horn
c934642bdb COMMON: Move typedef StringList from str.h to new header str-array.h
This removes the dependency on array.h from str.h.
Also, begun migration from the confusing type name "StringList" to
the more appropriate StringArray.

svn-id: r48282
2010-03-18 15:09:24 +00:00
Max Horn
d78dba3bca COMMON: Move Common::RandomSource to common/random.*
svn-id: r48279
2010-03-18 15:07:11 +00:00
Matthew Hoops
e8c2c2b25c Slightly rework refreshing cards in Riven (and remove the hackish changeToCard(0)).
svn-id: r48134
2010-02-26 08:14:33 +00:00
Matthew Hoops
08d3c24c12 Cleanup the sound code a bit.
svn-id: r48133
2010-02-26 08:11:45 +00:00
David Turner
fd9b52509f Mohawk : Update with work on Myst EXIT opcodes to work out purpose.
svn-id: r48087
2010-02-18 23:31:51 +00:00
Matthew Hoops
3452f5ea2d Implement stopMovie() for Riven. Fixes some dome related videos.
svn-id: r48082
2010-02-17 23:05:51 +00:00
David Turner
2ab3e0fb3c Mohawk : Adding resource cache class and integrating into Myst engine.
The resource caching trades increased memory usage against disk access.

This functionality can be disabled and enabled by the console "cache" command.

svn-id: r48080
2010-02-17 19:59:08 +00:00
Matthew Hoops
2d03db8a20 Cleanup handling of the telescope cover combination; matches the original algorithm much better.
svn-id: r48075
2010-02-17 04:20:19 +00:00
Matthew Hoops
be9a0946b4 Implement xgwatch so you can now find out the combination to free Catherine.
svn-id: r48073
2010-02-16 23:15:57 +00:00
Matthew Hoops
5e24974ad5 Implement xpisland990_elevcombo which allows you to free Catherine.
svn-id: r48072
2010-02-16 17:32:17 +00:00
Matthew Hoops
b54724a778 Fix typo in the ospit->tspit linking book RMAP code.
svn-id: r48071
2010-02-16 06:08:25 +00:00
Matthew Hoops
5fd7dbb406 Move Riven variable randomization to initVars() and implement randomization for the dome and prison combinations.
svn-id: r48070
2010-02-16 03:01:46 +00:00
Matthew Hoops
b3ab83d8c1 Add a workaround for two 'spare' variables that can exist in some save files.
svn-id: r48069
2010-02-16 01:48:19 +00:00
Matthew Hoops
55a9787234 Correct a rogue typo.
svn-id: r48068
2010-02-16 00:12:00 +00:00
David Turner
384acffeb1 Mohawk : Corrected Myst Opcode 200/300 in Intro/Demo stack to correctly call Intro movies.
svn-id: r48062
2010-02-14 19:01:02 +00:00
Matthew Hoops
b7ae950130 Remove an obsolete TODO.
svn-id: r48057
2010-02-14 00:02:59 +00:00
Matthew Hoops
1cd9498dbc Implement background video support for Riven; some VideoManager/QTPlayer cleanup.
svn-id: r48056
2010-02-13 23:34:18 +00:00
Matthew Hoops
e32497c54c Fix trap book external commands.
svn-id: r48037
2010-02-12 21:15:30 +00:00
Matthew Hoops
7eb92eb1cd Fix a potential problem for some compilers with having multiple stream reads.
svn-id: r48035
2010-02-10 17:46:22 +00:00
Matthew Hoops
9fb9c0955d Add support for the Motion JPEG codec (used in some Myst ME 10th Anniversary videos); minor cleanup.
svn-id: r48028
2010-02-10 00:20:33 +00:00
Max Horn
21e1cc4cf8 Switch makeADPCMStream to DisposeAfterUse::Flag
svn-id: r47736
2010-01-31 02:11:41 +00:00
Max Horn
a652b603c9 MOHAWK: Don't remove save_slot config entries the user may have added on purpose
svn-id: r47723
2010-01-30 19:03:11 +00:00
Johannes Schickel
a505d32eff Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream.
svn-id: r47716
2010-01-30 15:26:54 +00:00
Max Horn
f85c77d63e Fix warning when using -Wuninitialized
svn-id: r47633
2010-01-28 09:37:50 +00:00
Matthew Hoops
d4f08cbe81 Correct our interpretation of the first four bytes of the RSRC section in Mohawk archives.
svn-id: r47583
2010-01-26 23:05:52 +00:00
Max Horn
1565f14bc1 Moved audio stream implementations (for MP3, FLAC, etc.) to new dir sound/decoders/
svn-id: r47579
2010-01-26 22:48:45 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Matthew Hoops
5903acf66c Fill in the unknown values of the ADPC chunk in Mohawk sounds and update comments.
svn-id: r47528
2010-01-24 23:39:27 +00:00
Max Horn
4b996e7de7 Reorder params to Audio::makeRawMemoryStream
svn-id: r47492
2010-01-23 23:55:35 +00:00
Max Horn
b036392a7b Get rid of deprecated makeRawDiskStream variants; rename deprecated makeRawMemoryStream variant to makeRawMemoryStream_OLD; adapt some code to this change
svn-id: r47472
2010-01-23 13:34:29 +00:00
Matthew Hoops
0388e359e0 Always loop sounds declared in the VIEW resources of Myst. While Myst specifies in the metadata of its sound resources, Myst ME does not have that feature so we have to specify the looping. Looping now works in Myst ME.
svn-id: r47431
2010-01-22 04:24:04 +00:00
Matthew Hoops
c04f8d00b1 Rename MohawkFile to MohawkArchive and OldMohawkFile to LivingBooksArchive_v1 (the latter originally having an ambiguous meaning) and move them to resource.* Also, renaming the Living Books game types to remove the ambiguous old/new.
svn-id: r47429
2010-01-22 03:43:57 +00:00
Max Horn
cebaa0b0d3 Started to get rid of Audio::FLAG_LOOP
svn-id: r47397
2010-01-19 23:50:33 +00:00
Max Horn
dc5e08e623 Move raw audio flags from sound/mixer.h to sound/raw.h
svn-id: r47395
2010-01-19 22:30:33 +00:00
Matthew Hoops
3738507d7f Add support for the flyby videos in Myst ME Macintosh.
svn-id: r47388
2010-01-19 19:21:31 +00:00
Matthew Hoops
2d776186f6 Missed copying a line from console.cpp; fixes a memory leak.
svn-id: r47372
2010-01-19 05:08:53 +00:00
Matthew Hoops
c20df070f3 Make the workaround for the Riven intro background music work in the DVD version too.
svn-id: r47371
2010-01-19 05:01:45 +00:00
Max Horn
557bb394de Get rid of Mixer::FLAG_AUTOFREE.
Also fix several recently introduced new/delete vs. malloc/free mismatches.

svn-id: r47369
2010-01-19 00:56:29 +00:00
Max Horn
69be747621 Move raw audio streams to new header sound/raw.h
svn-id: r47368
2010-01-19 00:54:06 +00:00
Max Horn
349fcd1d71 Rename 'Linear' audio streams to 'raw'
svn-id: r47367
2010-01-19 00:52:41 +00:00
Torbjörn Andersson
ec34e88f75 Fixed assertion when setting non 8-bit cursors in Myst, Masterpiece Edition.
svn-id: r47358
2010-01-18 18:45:30 +00:00
Max Horn
7ec2da968c Switch most AudioStream factories to use DisposeAfterUse::Flag
svn-id: r47334
2010-01-16 21:36:08 +00:00
Max Horn
0cf53b025d Move DisposeAfterUse::Flag from Common to global namespace, and into a new header common/types.h
svn-id: r47180
2010-01-08 22:07:35 +00:00
Max Horn
474d49946f Rename QueuedAudioStream to QueuingAudioStream
svn-id: r47179
2010-01-08 22:06:04 +00:00
Max Horn
95726dfe50 Move Mohawk's QueuedAudioStream to sound/ (with some tweaks)
svn-id: r47177
2010-01-08 22:04:30 +00:00
Johannes Schickel
aa2f55ddc6 Remove the deprecated FLAC, Vorbis and MP3 factories.
svn-id: r47134
2010-01-07 17:14:44 +00:00
Johannes Schickel
ca5e137945 Create a wrapper makeLoopingAudioStream to reduce code duplcation.
svn-id: r47128
2010-01-07 16:18:03 +00:00
Johannes Schickel
2e9bae44c5 Let ADPCM streams subclass RewindableAudioStreams and thus allow them to be looped with the new looping code.
svn-id: r47127
2010-01-07 16:08:41 +00:00
Matthew Hoops
8cc208ba2e Minor cleanup; remove GF_10TH, it's not used or needed anywhere.
svn-id: r46978
2010-01-04 17:37:25 +00:00
Matthew Hoops
380190ee12 Fix a memory leak spotted by cppcheck. Thanks salty-horse\!
svn-id: r46977
2010-01-04 17:30:47 +00:00
Matthew Hoops
bf3973051b Merge the Mohawk Video class into QTPlayer and general cleanup.
svn-id: r46976
2010-01-04 17:27:36 +00:00
David Turner
ae9cf4d51e Mohawk : Improved code formatting conventions compliance.
svn-id: r46965
2010-01-04 08:10:29 +00:00
Arnaud Boutonné
5433ba01fa Mohawk : For what it's worth, Add detection for a french "in the 1rst degree"
svn-id: r46957
2010-01-03 22:11:08 +00:00
Arnaud Boutonné
e71754b64d Add detection for a french Myst
svn-id: r46954
2010-01-03 21:50:13 +00:00
David Turner
715b48b987 Mohawk : Stop Myst Script Opcode 200 continuously reloading the same image...
svn-id: r46919
2010-01-03 08:27:33 +00:00
Torbjörn Andersson
2165dc1a25 Indentation fix. (Which still leaves a lot that probably ought to be fixed in
this directory...)

svn-id: r46877
2010-01-02 08:53:06 +00:00
Torbjörn Andersson
6d879f15b7 Reading the whole buffer at once should be more efficient than reading it one
byte at a time.

svn-id: r46804
2009-12-31 18:25:35 +00:00
Matthew Hoops
e53d82b287 Remove obsolete comment about Myst ME not working.
svn-id: r46802
2009-12-31 17:43:17 +00:00
Matthew Hoops
85787988a0 Remove the getBeginOffset() hack from Common::SeekableReadStream and introduce QTPlayer::setChunkBeginOffset() to allow specifying what offset to use.
svn-id: r46786
2009-12-31 00:37:40 +00:00
Max Horn
f31c452a5f MOHAWK: Reduce header interdependencies
svn-id: r46782
2009-12-30 23:02:14 +00:00
Max Horn
a753f606ec MOHAWK: Stop using String::emptyString
svn-id: r46780
2009-12-30 23:01:16 +00:00
Matthew Hoops
b775c03c29 Use the special Cinepak YUV2RGB function in the Cinepak decoder. This makes the Riven videos match up with the backgrounds better. Thanks, Torbjorn\!
svn-id: r46750
2009-12-30 15:29:52 +00:00
Matthew Hoops
3e96fd7dc7 Whitespace fixes
svn-id: r46745
2009-12-30 14:46:06 +00:00
Torbjörn Andersson
69c71c7628 Removed some unnecessary whitespace. Changed some spaces to tabs.
svn-id: r46735
2009-12-30 07:30:04 +00:00
Torbjörn Andersson
1a66ad80a4 Re-indentet switch() blocks to follow ScummVM indentation style. (I've always
found this style a bit unusual, but I value consistency.)

svn-id: r46734
2009-12-30 07:14:09 +00:00
Matthew Hoops
516495a4a1 Silence some warnings seen in the buildbot.
svn-id: r46733
2009-12-30 07:00:16 +00:00
Eugene Sandulenko
0ea022d076 Add Mohawk engine code. Part 1/3: main code.
svn-id: r46727
2009-12-29 23:18:24 +00:00