Commit Graph
3264 Commits
Author SHA1 Message Date
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