Commit Graph

54870 Commits

Author SHA1 Message Date
Torbjörn Andersson
220fb66364 TINSEL: Add scrollwheel support to save/load and inventory 2012-11-24 11:06:42 +01:00
Matthew Hoops
5cf0bfaab9 PEGASUS: Use the new VideoDecoder::setRate code
The filling station now plays at the proper speed
2012-11-24 01:04:13 -05:00
Matthew Hoops
db908fcdc4 VIDEO: Add support for playing videos at a modified speed
Currently this only works for positive (forward) playback, but will eventually work for negative (backward).
2012-11-24 01:03:36 -05:00
Torbjörn Andersson
d3cf4d10f2 SCUMM: Handle note value 1 as "hold current note" in MI1 Mac
After listening to the original music in a Mac emulator (which
unfortunately doesn't handle the music very well), I can only
conclude that note value 1 means the note should continue playing.
At first I thought maybe it was supposed to fade the current note,
or perhaps change its volume, but I can't hear any traces of
either. So I'm going to assume it just means "hold the current
note", though for the life of me I cannot think of any valid
reason for such a command. So it may be wrong, but it sounds
closer to the emulator than it did before.
2012-11-24 01:39:16 +01:00
D G Turner
4d75aa5319 COMPOSER: Fix order of directoryGlobs qualifiers.
Some compilers throw a warning on the "const static" ordering, so
the more standard "static const" should be used instead.
2012-11-23 20:44:17 +00:00
D G Turner
d654057a98 AUDIO: Fix spurious compiler warnings about use-before-set variable. 2012-11-23 19:01:38 +00:00
D G Turner
8a8ab23c03 WII: Remove remaining signed-unsigned compiler warning. 2012-11-23 18:46:47 +00:00
D G Turner
21a8166922 N64: Remove remaining signed-unsigned compiler warning. 2012-11-23 18:37:07 +00:00
Johannes Schickel
ae1403713c KYRA: Some slight cleanup. 2012-11-23 17:56:28 +01:00
Johannes Schickel
415334fbe5 KYRA: Fix bug #3589441 "KYRA: LOL DOS is broken".
In fact it affected all DOS versions of the game.
This is a regression from 93e69aa4da.
2012-11-23 17:56:22 +01:00
Torbjörn Andersson
076bcbc5c6 SCUMM: Added TODO comment about Mac MI1 music
Some notes in the main theme are very staccato, and this could
possibly explain why.
2012-11-23 06:54:25 +01:00
Torbjörn Andersson
d06f69f94b SCUMM: Fix memory leak when loading old MI1 Mac savegames
I completely forgot to delete the dummy iMUSE object after using it
to skip over the old music save information. Thanks to Lordhoto for
pointing this out.
2012-11-23 06:01:30 +01:00
Johannes Schickel
c11ab39e78 KYRA: Remove unnecessary forward declaration. 2012-11-23 03:03:19 +01:00
Johannes Schickel
10c4baad5f KYRA: Move SoundDigital declaration to its own header. 2012-11-23 03:01:48 +01:00
Johannes Schickel
5a352da437 KYRA: Rename kReadSaveHeaderError to ReadSaveHeaderError. 2012-11-23 02:56:26 +01:00
Johannes Schickel
138db7f39d KYRA: Get rid of pointless SoundDigital::init method. 2012-11-23 02:54:28 +01:00
Johannes Schickel
f361a7d624 KYRA: Make Sound::hasSoundFile const again. 2012-11-23 02:50:20 +01:00
Johannes Schickel
f5a3260ee8 KYRA: Properly mark digital sfx as sfx in HoF and LoL again.
This is a regression from e016e7dfc2.
2012-11-23 02:43:38 +01:00
Johannes Schickel
7c2f5e2d0e Merge pull request #283 from lordhoto/scumm-opl3
SCUMM: Support OPL3 in Sam&Max
2012-11-22 17:28:31 -08:00
Torbjörn Andersson
0da424efb6 TINSEL: Fix typo in comment 2012-11-22 23:11:27 +01:00
Torbjörn Andersson
29afdabb6b TINSEL: Fix inventory scrollbar handle position
The scrollbar handle was one pixel too far to the left, and the
topmost position was off by one as well. I've verified this to the
best of my ability. I've compared it visually in DOSBox (which is
a bit tricky for Discworld 2, but I think it's right now), and
against the initial Tinsel v1 source code that was added to
ScummVM. I don't know what the initial Tinsel v2 source code
looked like, though.
2012-11-22 23:04:12 +01:00
Torbjörn Andersson
c16de405d7 TINSEL: Fix inventory scrolling
Adjusted NM_SLIDE_INSET and NM_SLIDE_THICKNESS to make the inventory
scrollbar work as it did before Tinsel v1 and v2 were combined. The
scrollbar worked before, but you had to click a bit to the left of
it to operate it. It's the only place in the code where these
constants are used, so it should not break anything else.
2012-11-22 22:12:51 +01:00
Matthew Hoops
7f8b7e0916 PEGASUS: Add a keymap 2012-11-21 23:18:08 -05:00
Johannes Schickel
1f69192f7d AUDIO: Remove two extra commas. 2012-11-22 02:29:57 +01:00
Johannes Schickel
761a98997c AUDIO: Disallow custom percussion instruments in MIDI->AdLib code. 2012-11-22 02:22:25 +01:00
Johannes Schickel
689497f06e AUDIO: Only enable OPL3 code in MIDI->AdLib, when we have the DOSBox emulator builtin. 2012-11-22 02:18:51 +01:00
D G Turner
e9b04d018f TONY: Fix compiler warnings about possible "used before set" variables.
Looking at this code and the code in clip2D, this shouldn't happen,
but this will prevent any future issues.
2012-11-20 19:05:45 +00:00
Johannes Schickel
be60a641bf AUDIO: Slight cleanup and typo fix in S&M OPL3 code. 2012-11-20 03:27:12 +01:00
D G Turner
8bf5a61278 PARALLACTION: Mask unused, but set variable warning, by debug().
This variable is likely to be used in the future if the associated
TODO is implemented, so this warning is inhibited by adding a debug()
output statement.
2012-11-19 23:33:02 +00:00
D G Turner
b35bda1715 TOLTECS: Remove unused, but set, variable, start. 2012-11-19 23:27:07 +00:00
D G Turner
e9c3d14307 QUEEN: Fix compilation. 2012-11-19 23:14:30 +00:00
D G Turner
362e195a5f QUEEN: Remove unused, but set variable, personWalking from Talk::talk(). 2012-11-19 23:00:40 +00:00
D G Turner
61cb8648a9 N64: Fix remaining warnings associated with mouse cursor drawing. 2012-11-19 17:26:28 +00:00
Johannes Schickel
bbb83f132b KYRA: Make "const type *const" use consistent.
I used this command for changing "const type * const" to "const type *const":
git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/const \([a-zA-Z0-9_]*\) \* const/const \1 \*const/g'
2012-11-19 13:06:09 +01:00
Johannes Schickel
dd551c4775 KYRA: Make more static data tables const. 2012-11-19 13:00:33 +01:00
Johannes Schickel
6437aa2c92 KYRA: Strip trailing whitespaces. 2012-11-19 12:54:42 +01:00
Johannes Schickel
b7e04fa518 KYRA: Some formatting fixes.
Powered by astyle.
2012-11-19 12:54:42 +01:00
Torbjörn Andersson
2aa8d0d65d SCUMM: Try harder to find Mac Monkey Island instruments
At least for me, hfsutils turns spaces into underscores so try both
"Monkey Island" and "Monkey_Island".
2012-11-19 08:40:51 +01:00
Torbjörn Andersson
fc0288e9d5 SCUMM: Simplify checkMusicAvailable() a bit 2012-11-19 07:25:42 +01:00
Torbjörn Andersson
9e995991e7 SCUMM: Fix crash when Macintosh instruments aren't available
Initialise _channel[] even when the instruments aren't available.
Otherwise, ScummVM will crash in a number of places including,
but not limited to, when loading savegames.
2012-11-19 07:18:05 +01:00
Torbjörn Andersson
cb21d7309e SCUMM: Add Windows encoding of the Mac Loom filename 2012-11-19 07:16:42 +01:00
D G Turner
d8a17a9d91 N64: Fix compiler warnings associated with cursor size variables. 2012-11-18 22:34:15 +00:00
D G Turner
46027e5303 VIDEO: Fix SVQ1 videos to error out on B Frames. 2012-11-18 21:00:07 +00:00
D G Turner
d2c2c5ec01 VIDEO: Fix compiler warning in SVQ1 codec. 2012-11-18 20:52:47 +00:00
Matthew Hoops
b285db4db3 AUDIO: Cleanup MidiParser_QT a bit 2012-11-18 14:43:35 -05:00
Matthew Hoops
ca6fdb0807 AUDIO: Ignore QT MIDI control change 0
QuickTime docs don't list it, and we shouldn't treat it as a bank select
2012-11-18 14:20:24 -05:00
Torbjörn Andersson
94b0881427 SCUMM: Lock the sound resource while the music is playing
After some discussion on #scummvm, the player now locks the sound
resource while the music is playing. This prevents the resource
manager from expiring the resource, which at best could cause
music to restart where it shouldn't.. At worst, I guess it could
have crashed, but I never saw that happen.
2012-11-18 19:18:21 +01:00
Matthew Hoops
31451edb7a PEGASUS: Fix timer not resuming on the WSC catwalk when using the AI
An original game bug
2012-11-18 12:33:56 -05:00
Torbjörn Andersson
ae823b5c6a SCUMM: Fix regression that caused "pops" in MI1 jungle music
Properly treat rests as rests, not notes. Otherwise, it would try
to play a really low note which just came out as a "pop".
2012-11-18 17:57:01 +01:00
Torbjörn Andersson
34a8b5049e SCUMM: Use more correct (I think) way of converting samples
It shouldn't make any real difference, but it's probably more
formally correct.
2012-11-18 17:56:13 +01:00