Commit Graph

2194 Commits

Author SHA1 Message Date
Florian Kagerer
0596971dec SCUMM/FM-TOWNS: cleanup
svn-id: r53000
2010-10-03 20:44:58 +00:00
Florian Kagerer
5d7ce32fbd SCUMM/FM-TOWNS: fix mouse cursor colors
svn-id: r52999
2010-10-03 20:29:22 +00:00
Florian Kagerer
c9713bef7c SCUMM/FM-TOWNS: improve merging of graphics layers
svn-id: r52995
2010-10-03 17:25:38 +00:00
Florian Kagerer
6ca15d0888 SCUMM/FM-TOWNS: fix drawBox()
svn-id: r52991
2010-10-03 14:32:09 +00:00
Florian Kagerer
77fe52bbd7 INDY3/FM-TOWNS: fix intro graphics bug
svn-id: r52987
2010-10-02 23:18:15 +00:00
Florian Kagerer
5d1ab85874 SCUMM: update scumm-md5.txt
svn-id: r52981
2010-10-02 15:01:51 +00:00
Florian Kagerer
74681b81b3 SCUMM/FM-Towns: limit SCUMM 5 games to 16 bit graphics mode
8 bit mode makes no sense for these games since colors will be too messed up.
SCUMM 3 games (Indy 3, Loom, Zak) are still supported in 8bit mode.

svn-id: r52977
2010-10-02 13:25:50 +00:00
Florian Kagerer
0d8f4a22ae SCUMM/FM-TOWNS: fix palette and other graphics issues
This commit should fix at least the following bugs/feature requests: #1032859, #1252088, #1055391, #1315968, #1315938, #1742106, #812891.
The FM-Towns version of Scumm games use a mixed graphics mode with 2 layers (one with 32767 colors and one with 16 colors). Among other things I have added a screen output class which emulates this  dual layer approach which allows specific hardware effects like enabling and disabling layers (e.g. in the voodoo priestess scene in MI1).

Old savegames (saved before this update) will load, but you’ll encounter palette glitches in the verb/inventory screen, since the 16 color palette for layer 2 is not contained in your savegame. This will be true at least for version 5 games. Certain scene change actions (which require the verb/inventory part to be redrawn) might correct this (e.g. try looking at the treasure map in MI1 and closing it). Version 3 games should be okay, since they use a static text palette which is never changed and which will be reset after loading a savegame.

This update requires a USE_RGB_COLORS setting for proper operation. 8 bit users will get a warning that they’ll have to expect palette glitches . Apart from that the engine in 8 bit mode should not only still work okay, but also benefit from some of the other (non palette related) improvements (e.g. bug #1032859 should be fixed even in 8 bit mode).

Japanese font drawing hasn’t been improved much yet. This will be a separate task.

svn-id: r52966
2010-10-01 19:24:52 +00:00
Eugene Sandulenko
f965616552 SCUMM: Fix bug #3052804 by reverting NES-specific screen width hack
svn-id: r52891
2010-09-25 20:50:13 +00:00
Travis Howell
6537cb6463 SCUMM: Remove unused code, which was replaced by ScummEngine_v0::runObject in revision 42737.
svn-id: r52798
2010-09-18 14:31:21 +00:00
Travis Howell
ae3b6f0aa3 SCUMM: Fix bug #3070077 - MMC64: No music when Syd plays the piano.
svn-id: r52796
2010-09-18 14:18:48 +00:00
Florian Kagerer
a48e19eaef SCUMM: minor cleanup
svn-id: r52792
2010-09-18 11:26:10 +00:00
Torbjörn Andersson
c91a07229a JANITORIAL: Removed most punctuation at end of warning() and error()
Our warning() and error() functions always add an exclamation mark
to the end of the message anyway.

svn-id: r52791
2010-09-18 10:55:16 +00:00
Johannes Schickel
cc764cb8ec SOUND: Move CMS emulator to sound/softsynth.
svn-id: r52778
2010-09-17 20:02:03 +00:00
Thierry Crozat
057056b8d3 I18N: Add translation for load/save success or failure messages
Also improve and update the french translation.

svn-id: r52740
2010-09-15 23:25:46 +00:00
Johannes Schickel
70245181f1 SCUMM: Fix for bug #3064655 "Restart with F8 key not working properly".
svn-id: r52715
2010-09-13 23:35:55 +00:00
Eugene Sandulenko
3972091734 SCUMM: Patch #3059327
Patch #3059327: "Remove untrue "not yet implemented" from inventory controls"

svn-id: r52530
2010-09-04 18:03:35 +00:00
Eugene Sandulenko
3e4f6b4a24 SCUMM: Fix bug #3039004
Bug #3039004: "MANIACNES: Ed does not appear at doorway."
Actually whole thing is a gross hack on top of SCUMM v1.5 hack
with extra wide screen. It all calls for review and writing
specified methods.

svn-id: r52375
2010-08-25 07:41:54 +00:00
Eugene Sandulenko
c4299cc0c7 SCUMM: Fix bug #3032758: "SCUMM: Mute setting does not work"
svn-id: r52372
2010-08-25 07:40:52 +00:00
Eugene Sandulenko
503cfd304b SCUMM: Fix bug #3049323
Bug #3049323: "SCUMM: Detects games in wrong places".
I must admit: A seriously stupid bug.

svn-id: r52370
2010-08-25 07:40:13 +00:00
Eugene Sandulenko
540cff87dc SCUMM: Implement keyboard-driven inventory scrolling in v2
Bug #2828383: "ZAK V2: no inventory keyboard shortcuts".

svn-id: r52366
2010-08-25 07:27:17 +00:00
Travis Howell
4c215fc9a0 SCUMM: Fix bug #2702847 - PUTTZOO: Graphic glitches on dancing penguin.
svn-id: r52363
2010-08-25 06:02:18 +00:00
Eugene Sandulenko
066174ad75 SCUMM: Change palette for C64 games.
Based on bugreport #2847001: "SCUMM v0: Wrong palette colors". Old
palette is #ifdef'ed for reference.

svn-id: r52330
2010-08-24 12:24:23 +00:00
Max Horn
7a125f85fe SCUMM: cleanup
svn-id: r52295
2010-08-23 10:00:19 +00:00
Florian Kagerer
0348ca3e65 SCUMM: fix CD audio regression in Monkey Island 1 DOS/CD
svn-id: r52287
2010-08-22 20:37:48 +00:00
Florian Kagerer
f7314a1e56 SCUMM/TOWNS: fix minor bugs
svn-id: r52234
2010-08-20 17:37:06 +00:00
Florian Kagerer
b55a70acb8 KYRA/TOWNS: fix memory leak and some cleanup
svn-id: r52232
2010-08-20 17:04:32 +00:00
Florian Kagerer
29a5c6a45b SCUMM/FM-TOWNS: start rewriting audio code
- Start rewriting audio code for FM-TOWNS versions of Loom, Indy3 and Monkey Island 1 using the recently added code in towns_audio.cpp (Zak should work the same way, but I can't test, since I don't own that one).
- All sound types (pcm, euphony and cd audio) now support volume and balance control (e.g. try walking into/out of the kitchen and opening/closing the door in the Scumm Bar in Monkey Island 1 or walking into/out of the circus tent).
- Pcm sounds now support proper loop start/end and note offsets (e.g. try out the hammer sound in the forge in LOOM for example).
- some other minor improvements
- The FM-Towns versions of Indy 4 and Monkey Island 2 are not affected. I don't have Monkey Island 2, but I presume that it will work like Indy 4. Adding support for these will be a separate task, since they work quite differently.

svn-id: r52198
2010-08-18 21:38:43 +00:00
Eugene Sandulenko
554add0886 SCUMM: Fix warning. On WinCE HIBYTE and LOBYTE are already defined.
svn-id: r52151
2010-08-17 11:02:27 +00:00
Max Horn
8a5705132d SCUMM: More finely differentiate opcode tables between v3, v4 and v5
This has been tested and verified as much as I can, but has a small
risk of leading to (easily fixable) regressions.

svn-id: r52130
2010-08-16 19:58:01 +00:00
Max Horn
5602b2cf81 SCUMM: Move setResult/getResultPos to script_v5.cpp
svn-id: r52129
2010-08-16 19:57:35 +00:00
Alejandro Marzini
b0409d6739 Merge trunk, from r51777 to r52105
svn-id: r52108
2010-08-16 00:21:07 +00:00
Torbjörn Andersson
6ff151b9ef SCUMM: Fix bug #3024173 - LOOM-PCE: Music stops prematurely
Apparently, the original interpreter hard-coded the lengths of the
audio tracks on the CD, and in this particular case it makes a
difference that one of the tracks is slightly longer on the disc
than the scripts assume it is. Thanks to hennymcc for doing all the
hard work in figuring this out.

svn-id: r52098
2010-08-15 11:37:57 +00:00
Florian Kagerer
4a159bcb1e GUI: add music devices for c64, amiga and apple II gs
These devices are not able to create appropriate drivers.
The only purpose for now is having proper gui options and flags and music types for the device detector.
The corresponding GUIO flags for the new devices have been added, too.

svn-id: r51995
2010-08-11 18:54:56 +00:00
Torbjörn Andersson
d781c4bbaa SCUMM: Re-enabled PCjr music for some more games
At this point, there's little point in doing them one game at a time.
Re-enable PCjr music for old Monkey Island, and for the Passport to
Adventure demo. Again, I don't have all the relevant versions to test
myself, so keep an eye out for regressions.

At this point, only the Apple II and C64 versions of Maniac Mansion
have the MDT_PCSPK flag, but not the MDT_PCJR flag. I don't know a
thing about these versions, so I'm leaving them well enough alone.

svn-id: r51990
2010-08-11 15:52:49 +00:00
Torbjörn Andersson
5c8e23f772 SCUMM: Re-enable PCjr music for EGA Loom.
svn-id: r51989
2010-08-11 15:41:32 +00:00
Torbjörn Andersson
416b568744 SCUMM: Re-enable PCjr music for Indy 3
Apart from adding the necessary detector flags, in cases where we used
to only check for PC Speaker we now also need to check for PCjr. Note
that I have only tested this with the VGA version. And even with that
one, I've only given it the briefest of tests.

svn-id: r51988
2010-08-11 15:36:29 +00:00
Torbjörn Andersson
10b6a395cf SCUMM: Add missing case in sound initialisation
If the mixer isn't ready, we probably have to check for PCjr as well,
so add that case.

svn-id: r51987
2010-08-11 15:16:55 +00:00
Torbjörn Andersson
1302ccb464 SCUMM: Add missing "break" in music setup
This once again makes it possible to select PC Speaker music in Indy 3.

svn-id: r51986
2010-08-11 15:09:07 +00:00
Florian Kagerer
2b77ffcc17 SCUMM: possible fix for bug # 3041539
enable PCJR sound for Maniac Mansion v1 and v1 and Zak McKracken v1 and v2.

svn-id: r51983
2010-08-11 14:32:33 +00:00
Max Horn
b8ee574e40 SCUMM: _resultVarNumber and related methods are specific to v0-v5
svn-id: r51974
2010-08-11 12:49:16 +00:00
Alejandro Marzini
33e40e1a20 Merged from trunk, from r51495 to r51775
svn-id: r51776
2010-08-06 03:21:21 +00:00
Eugene Sandulenko
02cca98ed6 SCUMM: Add posibility to disable NES APU which is CPU demanding
svn-id: r51679
2010-08-03 11:25:20 +00:00
Johannes Schickel
4e33b7a3be GRAPHICS: Renamed skipThumbnailHeader to skipThumbnail.
svn-id: r51668
2010-08-02 22:28:30 +00:00
Alejandro Marzini
fb4086cadb Merged from trunk, from Rev 50841 to HEAD
svn-id: r51495
2010-07-30 05:28:09 +00:00
Eugene Sandulenko
11a17b3908 SCUMM: Fix subtitles for Russian The Dig
It is a long standing bug which was revealed by r31784. With that commit
Kirben switched DIG code to newer one. Russian version used 0x03 as
placeholders for keeping string widths. Original did not copy those
characters but we did hence the bug. Based on study of original.

Restrict it to Dig-only in order to avoid regressions.

svn-id: r51211
2010-07-23 16:38:06 +00:00
Max Horn
1d4c82885d DEBUGGER: Simplify how our console debugger works / is used
* Remove _isAttached member var and isAttached method
* Engines now always call the onFrame method; whether it does
  something is decided by the debugger class resp. its subclasses
* Make detach() protected instead of private, so that subclasses
  can invoke it
* Remove _detach_now member var (call detach() instead).
* Rename _frame_countdown to _frameCountdown and properly
  document it.
* Add more doxygen comments
* Cleanup

svn-id: r50963
2010-07-17 18:38:42 +00:00
Torbjörn Andersson
b91ef12897 Fixed typo in comment.
svn-id: r50889
2010-07-14 16:57:16 +00:00
Torbjörn Andersson
25077baf6a Moved setTileData() into GdiPCEngine since that's the only class that uses it.
svn-id: r50888
2010-07-14 16:55:32 +00:00
Alejandro Marzini
609e08d5db Merged from trunk, from Rev 49499 to HEAD
svn-id: r50840
2010-07-13 04:31:15 +00:00
Johannes Schickel
0c3cbcbfc5 Prevent SCUMM from adding gui options based on user flags into the config file (regression from r50706).
svn-id: r50710
2010-07-05 21:18:25 +00:00
Johannes Schickel
1443a2721c Fix update of GUI options, which only differ in the language setting.
svn-id: r50706
2010-07-05 20:10:56 +00:00
Eugene Sandulenko
25ca058fa8 Add support for Chinese The DIG.
svn-id: r50375
2010-06-27 13:06:22 +00:00
Travis Howell
be399485cd Add Nintendo Wii (PAL) versions of Freddi Fish: Kelp Seed Mystery.
svn-id: r50367
2010-06-27 05:30:18 +00:00
Florian Kagerer
c35e350531 AUDIO: get rid of MDT_PREFER_MIDI since it should be sufficient to either select MDT_PREFER_MT32 or MDT_PREFER_GM
svn-id: r50288
2010-06-25 20:51:57 +00:00
Max Horn
7d4d58bab4 SCUMM: Set some more detection file sizes
svn-id: r50270
2010-06-25 16:08:34 +00:00
Max Horn
5b24d39cdd SCUMM: Specify various file sizes of detection files
svn-id: r50151
2010-06-22 16:10:16 +00:00
Max Horn
33347e12bd SCUMM: Add a debug message to detectGames() to help find filesizes of detection files
svn-id: r50150
2010-06-22 16:09:50 +00:00
Max Horn
90a1d7c609 SCUMM: Add Japanese FOA CD version from tracker #3017219
svn-id: r50149
2010-06-22 16:09:27 +00:00
Max Horn
bbad3f333a Patch #1956501: "GUI/LAUNCHER: Midi device selection"
svn-id: r50128
2010-06-21 21:36:36 +00:00
Max Horn
444a6b5976 Workaround bug #3003643 (MI1EGA German: Credit text incorrect)
svn-id: r49895
2010-06-15 23:12:34 +00:00
Max Horn
604f855889 SCUMM: Fix composeFileHashMap
svn-id: r49850
2010-06-15 12:36:04 +00:00
Max Horn
651e2760a3 Fix spelling, cleanup
svn-id: r49843
2010-06-15 12:33:20 +00:00
Eugene Sandulenko
b6940caaaa SCUMM: Added directory globs for in-depth search.
The code was compied from AdvancedDetector. Currently it is
set up to detect Mac indy3/loom which contains it data in
Rooms 1, Roooms 2 and Rooms 3 directories.

svn-id: r49798
2010-06-15 11:04:35 +00:00
Eugene Sandulenko
01bc5dda94 GUI: Implemented Languages as GUI options.
SCUMM and AdvancedDetector support this feature.

svn-id: r49786
2010-06-15 10:57:28 +00:00
Eugene Sandulenko
67bc711580 GUI: Implement MIDI drivers as GUI options.
Proper version of patch #2988641: "GSoC: Select drivers in GUI
based on output types". So far only SCUMM engine supports this
feature.

svn-id: r49783
2010-06-15 10:56:12 +00:00
Eugene Sandulenko
01f9006ee7 GUI: Implement tooltips. FR #2821513.
FR #2821513: "GUI: add tooltips".
Added tooltips for Add Game button, clear field buttons and couple
other.

Current problem: Only first call correctly restores text. I could
not find where restore information gets lost.

svn-id: r49774
2010-06-15 10:52:35 +00:00
Eugene Sandulenko
3fafa07ab0 GUI: Added in-place hotkeys for widgets.
Now it is possible to specify hotkeys in place for ButtonWidget
and CheckboxWidget (the only widgets with hotkeys now).

Use de-facto standard with putting hotkey between tildes (~).
Like '~O~pen'. The tildes gets stripped before after hotkey
is extracted.

This is done for giving translators possibility to specify
their own hotkeys.

Old hotkeys defined at widget instance creation are left for
leaving possibility to specify non-printable hotkeys such as
Common::ASCII_ESCAPE.

Translation files were updated respectively.

svn-id: r49766
2010-06-15 10:47:31 +00:00
Eugene Sandulenko
ba72975d3f SCUMM: Fix bug #1328120:
Bug #1328120: "MANIACNES: Screen width incorrect, camera halts sometimes".
Fixed by workaround and was tested with intro and on the kitchen,
where now it is possible to see Edna without her noticing you
first.

svn-id: r49764
2010-06-15 10:46:23 +00:00
Eugene Sandulenko
48d0d3008b SCUMM: Fix bug #1879604.
Bug 1879604: "MANIACNES: Music not played when loading game".
Actually previous attempt to fix this bug was not successful
since first entry of script 5 does not have needed functionality.
Now we resume music manually.

svn-id: r49763
2010-06-15 10:46:04 +00:00
Alejandro Marzini
e1ef3cd9fc Renamed getAudioCD to getAudioCDManager.
svn-id: r49678
2010-06-15 04:13:12 +00:00
Eugene Sandulenko
ca161920a4 SCUMM: Fix bug #1438631.
Bug #1438631: "SCUMM: Detecting mac version of indy3/loom broken"
fixed by implementing recursive directory lookup similar to what
was done for AdvancedDetector, since SCUMM engine does not use it.

svn-id: r49656
2010-06-14 14:51:46 +00:00
Alejandro Marzini
e991cd8c53 - Revised abstract AudioCDManager.
- Removed AudioCDManager Singleton, and changed code for using AudioCDManager in OSystem.
- Added initialization code for new AudioCDManager in BaseBackend and OSystem_SDL.

svn-id: r49548
2010-06-09 20:09:57 +00:00
David Turner
641ffa5ee3 Modification to remove false positive "Possible divide by zero" warnings given by cppcheck-1.43.
These are incorrect as '/' operator has precedence over >>, but this does improve readability anyway.

This bug in cppcheck has already been corrected: http://sourceforge.net/apps/trac/cppcheck/ticket/1714

svn-id: r49517
2010-06-08 20:29:33 +00:00
Jordi Vilalta Prat
9255d7c3cb Remove some extra spaces
svn-id: r49489
2010-06-07 17:18:25 +00:00
Torbjörn Andersson
928eafcccf Fixed potential memory leak found by cppcheck. Though I'm guessing that if this
case happens, we may have bigger problems...

svn-id: r49307
2010-05-29 08:14:50 +00:00
Max Horn
947edd08c3 Replace SCUMM F5 dialog by GMM & add help button to GMM
The new "Help" button in the GMM is currently only used by SCUMM.
To use it, an engine currently needs to subclass MainMenuDialog.

svn-id: r49249
2010-05-26 19:54:50 +00:00
Eugene Sandulenko
b8df22646b Patch #2959341: Minor update to SCUMM debugger command 'passcode'
svn-id: r49221
2010-05-25 20:47:48 +00:00
Eugene Sandulenko
07ccf29ecf Fix Russian versions of airport and farm as they use extended charset.
svn-id: r49191
2010-05-24 16:56:56 +00:00
Eugene Sandulenko
6e66fa3726 sync
svn-id: r49184
2010-05-24 13:26:16 +00:00
Eugene Sandulenko
f9217ec031 Added Russian airport and farm. Needs more work as crashes at attempt to opening some dictionary entries with Cyrillic characters
svn-id: r49176
2010-05-24 07:47:07 +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
Matthew Hoops
c7fa1074fb Change VideoDecoder::getCurFrame() to mean the last frame drawn instead of the next frame to draw. This is patch 1 from patch #2963496 (VideoDecoder Rewrite).
svn-id: r49063
2010-05-17 21:59:05 +00:00
Travis Howell
920e47cca0 Fix missing songs in the HE73 version of Putt-Putt Saves the Zoo.
svn-id: r49010
2010-05-12 05:01:58 +00:00
Eugene Sandulenko
4eba9581b7 Extended patch #2971742: SCUMM: autodetection for diskimage contents.
I added NES bundle handling to the patch.

svn-id: r48991
2010-05-09 20:58:41 +00:00
Eugene Sandulenko
e02168fb68 Fix bug in NES bundle reader which prevented reenterability
svn-id: r48990
2010-05-09 20:52:20 +00:00
Johannes Schickel
0ace80fed4 Fix for bug #2995282 "FT: Cavefish Hideout Chase (Failure Cutscene) Crash".
The bug itself is actually a regression from r43577, the merge
of the gsoc2009-16bit branch.

svn-id: r48987
2010-05-09 20:17:30 +00:00
Eugene Sandulenko
57f2425b28 Patch #2901515: HE: Resource Forks on Mac OS X
svn-id: r48984
2010-05-09 18:27:56 +00:00
Eugene Sandulenko
b0f17579c9 Patch #2968610: Zak C64 German: crash due to padding bytes
svn-id: r48981
2010-05-09 18:05:00 +00:00
Max Horn
93375526c0 SCUMM: Convert some code to use Common::String
svn-id: r48957
2010-05-05 20:43:22 +00:00
Max Horn
f7d2047d02 Fix non-Mac OS X builds
svn-id: r48938
2010-05-04 12:02:33 +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
1a1d99724a Fix for bug #2824840: ZAK: Crash when using the yellow crystal (Amiga version)
The problem was a double free that could occur in two places.
Also added some missing whitespaces.

svn-id: r48832
2010-04-28 20:18:56 +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
Willem Jan Palenstijn
40525d1bb2 Fix warning
svn-id: r48818
2010-04-27 20:18:10 +00:00
Max Horn
6d80424908 Fix warnings when FLAC&MP3&VORBIS is disabled; also fixes leak in Tinsel
svn-id: r48696
2010-04-17 23:57:50 +00:00
Ori Avtalion
2fc9d6845b Apply patch #2982163 - CONFIG: Use HE keyword instead of HB for the Hebrew language
svn-id: r48645
2010-04-12 21:21:06 +00:00
Max Horn
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream
svn-id: r48637
2010-04-12 09:14:17 +00:00
Ori Avtalion
fd3970aa52 Apply patch #2984508 - "GSoC: SCUMM stopped audio from playing while saving"
This is a fix for bug #2090846 - "SCUMM: saving a game will play music before
finishing"

svn-id: r48630
2010-04-11 21:30:57 +00:00
Johannes Schickel
b928da4418 Setup and destroy a dummy cursor and palette in the Engine class.
The idea behind this is exactly the same as behind r48620,
but it affects all engines, thus engine authors can now use
CursorMan.replaceCursor without having to worry about possible
memory leaks or the like.

svn-id: r48626
2010-04-11 18:30:42 +00:00
Johannes Schickel
19e620ba60 Enable the cursor palette in ScummEngine_v70he::setDefaultCursor just to avoid problems in case it was disabled earlier.
svn-id: r48622
2010-04-11 17:28:34 +00:00
Johannes Schickel
29172d4844 Fix a memory leak in SCUMM which was caused by the SCUMM engine never removing its cursor from CursorMan.
The problem here was that SCUMM only uses CursorMan.replaceCursor. When no
cursor had been setup before it would cause the SCUMM cursor to be never
removed from CursorMan, since in this case replaceCursor just uses pushCursor.
To avoid this problem I am just pushing a dummy cursor (and palette, since
that is used in SCUMM HE games too) on engine setup and removing it on engine
destruction.

Actually every engine should setup their first cursor via CursorMan.pushCursor
and then on quit remove it again via CursorMan.popCursor. Using
CursorMan.replaceCursor is *no* good idea for the first cursor to setup, since
that might either replace an existing cursor, thus destroying the caller's
cursor, or pushing a new cursor on the stack, which might result in a leak.
This would also result in making a call to CursorMan.popCursor unsafe, since
that might also impact the caller's cursor setup again.

svn-id: r48620
2010-04-11 17:26:32 +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
Max Horn
7dafef752f SCUMM: Make HelpDialog & ConfigDialog internal
svn-id: r48562
2010-04-06 09:26:04 +00:00
Max Horn
3a8366526b Remove old & undocumented MSVC 6 workaround
svn-id: r48561
2010-04-06 09:25:44 +00:00
Travis Howell
753a73be29 Fix bug #2960022 - PUTTPUTT 1: No Load/Save possible.
svn-id: r48499
2010-04-04 09:36:10 +00:00
Travis Howell
df984a011e Fix bug #2959947 - HE: Broken saves show in launcher.
svn-id: r48489
2010-04-03 14:26:20 +00:00
Max Horn
b104534d0d Patch #2973283: SCUMM: Unneeded pointer dereference
svn-id: r48360
2010-03-22 23:03:09 +00:00
Max Horn
92c896d883 Patch #2973290: Semicolon cleanup
svn-id: r48359
2010-03-22 20:28:08 +00:00
Max Horn
cac0ac66e2 COMMON: Get rid of Common::StringList
svn-id: r48287
2010-03-18 15:54:40 +00:00
Max Horn
4e7dddadbc SCUMM: Add WORKAROUND comment
svn-id: r48284
2010-03-18 15:10:07 +00:00
Max Horn
d78dba3bca COMMON: Move Common::RandomSource to common/random.*
svn-id: r48279
2010-03-18 15:07:11 +00:00
Max Horn
4e99cfc549 Switch from Common::tag2string(foo).c_str() to tag2str(foo)
svn-id: r48276
2010-03-18 15:04:38 +00:00
Johannes Schickel
1242a4eb8c Some style fixes.
svn-id: r48272
2010-03-16 14:34:25 +00:00
Travis Howell
b968a69468 Add patch #2970176 - V0: MM Verb + Anim Fix.
svn-id: r48269
2010-03-16 08:59:48 +00:00
Travis Howell
a7e6397fa4 Add patch #2971126 - MM V0: Ed(na) walk fix.
svn-id: r48268
2010-03-16 08:43:46 +00:00
Travis Howell
2035cdbba8 Add patch #2970899 - MM V0: flipped limbs drawing fix.
svn-id: r48267
2010-03-16 08:38:06 +00:00
Max Horn
4fc8ebab01 GUI: Remove GuiObject::getMillis()
svn-id: r48241
2010-03-11 23:41:28 +00:00
Max Horn
05b8c5b9c5 Replace mutex_up/mutex_down methods by Common::StackLock
svn-id: r48231
2010-03-10 21:05:48 +00:00
Max Horn
43abd0e019 cleanup
svn-id: r48230
2010-03-10 21:03:50 +00:00
Torbjörn Andersson
65585f6433 Silenced some harmless cppcheck warnings about unreachable code after a return.
In this case, it was always a break after a return in a switch case. There are
similar cases which cppcheck didn't detect, and a couple of cases where we have
a break after a continue in a switch case (where the continue refers to an
outer loop), but I didn't touch those. Not yet, at least.

svn-id: r48218
2010-03-10 06:39:23 +00:00
Max Horn
bc2b90f43b Workaround for bug #1878514: COMI: Glitch when turning pages in recipe book
svn-id: r48207
2010-03-08 23:36:59 +00:00
Max Horn
f24cc1c8be Tweak makeVOCDiskStream
* now takes a SeekableReadStream *pointer* like (almost) all other
  audiostream factories
* fix potential memory leak in it
* rename takeOwnershipOfStream to disposeAfterUse for consistency

svn-id: r48184
2010-03-08 10:27:42 +00:00
Max Horn
902dc6929a Patch #2963270: MM: V0 Verb Give Fix
svn-id: r48163
2010-03-05 00:58:29 +00:00
Johannes Schickel
ef70f6996b Fix another mismatching new[] call (note that this needs to be replaced by malloc, since else MemoryReadStream will try to use free on an new[] allocated block.)
svn-id: r48162
2010-03-04 17:46:18 +00:00
Johannes Schickel
ca6b617e63 Fix mismatching new[]/delete.
svn-id: r48161
2010-03-04 17:24:47 +00:00
Travis Howell
d204f97beb Fix bug #2961530 - Zak/FM-Towns: Game hangs when using monkey wrench.
svn-id: r48158
2010-03-02 00:18:00 +00:00
Travis Howell
f40c466d5e Fix bug #2959947 - SPYFOX1: Saves don't work from menu.
svn-id: r48142
2010-02-27 02:49:27 +00:00
Neil Millstone
277b3078bc SID: Adding DISABLE_SID option, as SID player embiggens binary by a large amount. This is a problem for the DS port.
svn-id: r48137
2010-02-26 17:42:40 +00:00
Neil Millstone
bcb721cccd SCUMM: Fix stride of palette data in ARM optimised costime renderer
svn-id: r48135
2010-02-26 16:17:12 +00:00
Travis Howell
151889a767 Add another German Windows version of Pajama Sam 2.
svn-id: r48123
2010-02-24 00:39:48 +00:00
Travis Howell
7f6c704c25 SPY Fox 3: Operation Ozone is supported too.
svn-id: r48112
2010-02-22 23:47:10 +00:00
Yotam Barnoy
ef330ed9b4 Patch for bug 2943361 by littleboy, adding full kb modifier support to all engines + GUI and proper keypad handling
svn-id: r48101
2010-02-21 04:04:13 +00:00
Johannes Schickel
8ae24a27b3 Yet more Flac -> FLAC changes for consistency.
svn-id: r47847
2010-02-03 09:42:40 +00:00
Johannes Schickel
fe35d372da - Rename FlacStream to FLACStream.
- Rename makeFlacStream to makeFLACStream.

svn-id: r47846
2010-02-03 09:42:11 +00:00
Torbjörn Andersson
c5be030077 Silenced some more cppcheck warnings.
svn-id: r47785
2010-01-31 23:28:12 +00:00
Chris Apers
8f8c85e757 Removed obsolete code
svn-id: r47767
2010-01-31 18:11:48 +00:00
Max Horn
21e1cc4cf8 Switch makeADPCMStream to DisposeAfterUse::Flag
svn-id: r47736
2010-01-31 02:11:41 +00:00
Johannes Schickel
f79b474ea7 Use SubLoopingAudioStream instead of makeLoopingAudioStream in SCUMM. (Incorrect replacement introduced with r47715, thanks to Max for spotting this).
svn-id: r47722
2010-01-30 18:15:17 +00:00
Johannes Schickel
ef99a72436 Typo.
svn-id: r47719
2010-01-30 15:30:53 +00:00
Johannes Schickel
a505d32eff Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream.
svn-id: r47716
2010-01-30 15:26:54 +00:00
Johannes Schickel
8e3646e062 Get rid of Audio::makeRawMemoryStream_OLD.
svn-id: r47715
2010-01-30 15:19:15 +00:00
Travis Howell
0702bdab82 Fix regressions in Let's Explore the Jungle with Buzzy.
svn-id: r47622
2010-01-28 00:28:08 +00:00
Travis Howell
ca7d670b4b Fix regression in Let's Explore the Jungle with Buzzy.
svn-id: r47621
2010-01-28 00:24:02 +00:00
Travis Howell
f81735fffc Fix regression in Let's Explore the Jungle with Buzzy.
svn-id: r47619
2010-01-28 00:15:53 +00:00
Travis Howell
0b4b3da4e4 Fix sound regression in HE games.
svn-id: r47596
2010-01-27 12:20:01 +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
Travis Howell
326d64d07d Let's Explore the Jungle with Buzzy uses VAR_PLATFORM variabletoo, but with different values.
svn-id: r47562
2010-01-26 08:31:27 +00:00