Commit Graph

617 Commits

Author SHA1 Message Date
Travis Howell
286de879fd Add cyx's patch for bug #1035739 - SCUMM/SMUSH: Ugly palette change when video finishes
svn-id: r23216
2006-06-21 10:28:09 +00:00
Travis Howell
4b2aa54304 Revert back to original method used for scrollEffect(), fixes regressions.
svn-id: r23214
2006-06-21 06:50:50 +00:00
Torbjörn Andersson
49a2f44944 Applied my own patch #1508018. I don't know for sure that it's exactly right,
but it improves the Adlib sound effects in early games, e.g. the door opening
and closing sounds in Indy 3 and MI1 floppy. There still appears to be some
kind of looping/repeating mechanism that we don't implement, though.

svn-id: r23204
2006-06-20 21:36:09 +00:00
Torbjörn Andersson
ecfedb1e81 Cleanup. It seems unnecessary to have a "break" right after an unconditional
return in a switch case.

svn-id: r23198
2006-06-20 18:55:25 +00:00
Travis Howell
632caa1a1e Fix inventory colors regression in C64 maniac
svn-id: r23180
2006-06-19 10:29:36 +00:00
Travis Howell
032de3589b Fix sentence line regression in C64 maniac
svn-id: r23179
2006-06-19 10:12:37 +00:00
Travis Howell
f4ff7fabad Add patch for bug #1507856 - INDY3 VGA: Crashes in Sewer
svn-id: r23177
2006-06-19 07:45:40 +00:00
Travis Howell
bc6306192d Fix screen scrolling glitch when looking at the top of closet in parents room of DOS version of fbear
svn-id: r23174
2006-06-19 04:09:39 +00:00
Travis Howell
15c26ed5eb Add 16bit color feature flag to Backyard Basketball too
svn-id: r23173
2006-06-18 13:44:01 +00:00
Travis Howell
31e7efc167 Remove debug left over
svn-id: r23172
2006-06-18 10:54:54 +00:00
Travis Howell
49b3f8f539 Add alternative method to prevent debug code of scripts been triggered in lost. Fixes regressions when convertFilePath() is used by some HE games
svn-id: r23171
2006-06-18 10:46:22 +00:00
Torbjörn Andersson
2462289c50 Updated comments to correspond with recent Adlib renamings.
svn-id: r23166
2006-06-18 10:06:45 +00:00
Torbjörn Andersson
02f1555dbe Added missing (but unimportant) breaks to switch default cases.
svn-id: r23161
2006-06-18 06:23:22 +00:00
Lars Persson
ce1edcfd7d Fixed Smushplayer for Symbian OS.__SYMBIAN32__ was defined as __SYMBIA32__.
svn-id: r23157
2006-06-17 07:53:55 +00:00
Travis Howell
bc3e089842 Fix the buttons of paintings and safe in Nogroom of spyfox
svn-id: r23156
2006-06-17 06:27:44 +00:00
Travis Howell
b81b9ac124 Limit vm.numNestedScripts to positive value, when subtracting slot in runScriptNested(). Fixes restart, after ending sequence in freddi4
svn-id: r23153
2006-06-17 05:48:43 +00:00
Travis Howell
40bfc71de8 Fix rects in HE games, when positions are set by scripts
svn-id: r23146
2006-06-16 13:14:55 +00:00
Travis Howell
f4d7226334 Adjust akos code to only draw within bounds in HE games. Fixes many graphical glitches in HE games.
svn-id: r23143
2006-06-16 11:30:23 +00:00
Travis Howell
e5b5361e75 Remove error for default case of active case 6/8 in akos_increaseAnim(), a default case is normal in original games. Fixes bug #1506017 - HE Pajama Sam 1: ERROR while tralking to snotty trees.
svn-id: r23125
2006-06-15 10:18:23 +00:00
Travis Howell
6fe3d3214d Fix the shadow glitches in HE98 version of puttrace, the shadow mode isn't reset in HE90-98 games.
svn-id: r23104
2006-06-14 12:22:24 +00:00
Torbjörn Andersson
94de874087 Since setCursorHotspot() does not update the cursor (should it?), we have to
call it before setCursorFromBuffer(), not afterwards. This fixes the cursor
hotspot being temporarily wrong in HE games that use loadWizCursor().

svn-id: r23094
2006-06-13 18:37:40 +00:00
Torbjörn Andersson
df4f95f805 Let the [cursor] palette manager handle disableCursorPalette() too, to avoid
cursor glitch in at least some HE games which first set a cursor palette, and
then disable it. (The disabled palette would be re-enabled after dismissing the
GUI.)

svn-id: r23081
2006-06-13 09:48:46 +00:00
Travis Howell
486f181314 Add another version of SoccerMLS
svn-id: r23077
2006-06-13 04:05:16 +00:00
Eugene Sandulenko
fd7e9847fc Removed commented-out subtitles-related code. Requested by salty-horse.
svn-id: r23030
2006-06-11 20:29:07 +00:00
Travis Howell
db3a66569d Update prefix filters for subtitles in HE80+ games
svn-id: r23010
2006-06-10 12:05:27 +00:00
Travis Howell
afe07d82c0 Use convertFilePath for HE6x games too, for safety
svn-id: r22994
2006-06-09 09:01:06 +00:00
Travis Howell
763d7ef3ff Ooops, correct order
svn-id: r22993
2006-06-09 08:10:00 +00:00
Travis Howell
f571c471cc Add DOS and Macintosh versions of Putt-Putt & Fatty Bear's Activity Pack
svn-id: r22991
2006-06-09 08:06:38 +00:00
Eugene Sandulenko
9a46b6047d Add Russian pajama1 and lost.
svn-id: r22953
2006-06-06 15:39:58 +00:00
Travis Howell
04d8cef848 Minor cleanup
svn-id: r22950
2006-06-06 04:33:09 +00:00
Travis Howell
ca79b6c285 Add target for full versions of Blue's Birthday Adventure
svn-id: r22948
2006-06-06 04:09:32 +00:00
Travis Howell
fd4feeada3 Fix detection of updated Spy Fox 1 demo
svn-id: r22934
2006-06-05 14:52:57 +00:00
Travis Howell
ddb9863c39 Fix detection of some HE games and demos
svn-id: r22933
2006-06-05 14:46:34 +00:00
Travis Howell
50cbb8ca80 The F1-F8 keyboard shortcuts aren't available in FM-TOWNS version of Zak
svn-id: r22872
2006-06-03 13:33:05 +00:00
Travis Howell
fc26d9b413 Update talkspeed config setting, when set by game scripts
svn-id: r22854
2006-06-03 04:10:14 +00:00
Travis Howell
93a91f9c6d Update talkspeed config setting, when set by game scripts
svn-id: r22853
2006-06-03 03:51:17 +00:00
Travis Howell
61e9bc72e4 Correct setting of VAR_CHARINC in several functions, the value should only be reversed when using keyboard shortcuts (Due to the scrollbar)
svn-id: r22850
2006-06-03 03:04:19 +00:00
Lars Persson
4bc3f94589 Small correction, added space between filename and new line.
svn-id: r22805
2006-05-31 19:28:54 +00:00
Travis Howell
3b1062d2d4 Add patch for bug #1452272 - COMI: Verb strings aren't wrapped
svn-id: r22793
2006-05-31 10:48:40 +00:00
Gregory Montoir
7ff20a70a5 The ScummDebugger object needs to be created after _numVariables has been set. This is apparently only done in in readMAXS() which is called by readIndexFile(). Moved the call to the object constructor in the init() method. This fixes the 'scumm_vars' debugger command.
svn-id: r22755
2006-05-29 18:30:27 +00:00
Torbjörn Andersson
fa77904074 If we're going to intercept attempts to set VAR(VAR_CHARINC) in writeVar(), we
should probably set it the same way as updateSoundSettings() does it, i.e. to
9 - getTalkspeed(), not getTalkspeed().

I was testing the scene in Sam & Max where you give candy to Doug. I had set
the talk speed to max. The script tried to set CHARINC to 3, but instead it was
changed from 0 to 9...

svn-id: r22748
2006-05-29 17:27:22 +00:00
Johannes Schickel
cba9ef32c2 adds support for filling the thumbnail display in a given color if no thumbnail is present
svn-id: r22745
2006-05-29 14:40:18 +00:00
James Brown
38537899b3 Remove printf() debug message that appears annoyingly in Zak256. Anyone know what this was added to figure out?
svn-id: r22739
2006-05-29 14:15:19 +00:00
Travis Howell
a0d14a0832 Fix Commodore 64 versions
svn-id: r22732
2006-05-29 12:45:11 +00:00
Max Horn
dc2da7a804 Moved the hack that distinguishes MM V1 demo from the full version to a more appropriate location (so that the game gets correctly detected)
svn-id: r22718
2006-05-28 12:28:28 +00:00
Max Horn
d5c74ee633 No need to compute the SCUMM version here; rather, verify that the SCUMM version is already set correctly
svn-id: r22715
2006-05-28 12:12:30 +00:00
Paweł Kołodziejski
ea05e31330 increase buffer for comi smush audio track, that fixes bug #1479721
svn-id: r22702
2006-05-28 06:04:46 +00:00
Travis Howell
21f50b3267 Use different method to detect V1 demo of Maniac Mansion, since md5 matches the full version
svn-id: r22695
2006-05-28 03:47:20 +00:00
Eugene Sandulenko
b5355a9142 Backed up my own commit :/ The user did a mistake when supplied the data.
svn-id: r22691
2006-05-27 23:31:08 +00:00
Eugene Sandulenko
de1d77670f Added new samnmax demo file name pattern. See bug #1496105: "Sam & Max Hit
the Road (ENGLISH/PC-DEMO V2) - Path Error"

svn-id: r22686
2006-05-27 20:08:42 +00:00
Eugene Sandulenko
b56c7b88d7 Major GUI update:
- Implemented padding in console
- Update only current line in console instead of whole screen
- Fixed caret positioning in edit text widget
- Improved buttons drawing, now they look more realistic
- Added label spacing in popup widget
- Correct shadow in popup widget
- Fixed up with selected popup widget being drawn on wrong tab
- Added shading to list dialog
- Adjusted shading of inactive widgets
- Proper coloring of browset (add game) dialog
- Introduced Container widget
- Used Container widget in scumm save/load dialog. Now it looks properly
- Adjusted button colors even more. Now they match almost perfectly albeit with banding
- Made scrollbar appear only when it is really needed

svn-id: r22670
2006-05-27 05:46:04 +00:00
Travis Howell
3d0aa0a4d9 snmdemo uses *.sm0/1 data files
svn-id: r22669
2006-05-27 00:12:30 +00:00
Travis Howell
b858a6de65 Fix V1 demo of maniac
svn-id: r22667
2006-05-27 00:01:25 +00:00
Max Horn
0035042725 Fix for bug #1495361 (MONKEY1 AMIGA: Error at gamedetection)
svn-id: r22648
2006-05-26 08:20:15 +00:00
Eugene Sandulenko
5fee4afc32 - Put scrollbar inside of list widget
- Use resize() instead of setPos() and setSize() where applicable

svn-id: r22646
2006-05-26 01:49:56 +00:00
Torbjörn Andersson
8062eb6ec3 Set and show/hide mouse cursors through a "cursor manager" (analogous to the
recently added (cursor) palette manager) so that the cursor can be properly
restored after returning from the GUI.

If there's any C++ magic that can keep the backend functions from being called
by anything else than these managing classes, that would probably be a good
idea. Also, since the cursor manager keeps a copy of the cursor image, perhaps
there are at least some backends that will no longer need to?

svn-id: r22639
2006-05-25 22:51:42 +00:00
Torbjörn Andersson
2f51f40c11 Downgraded startHETalkSound() error (when the speech file isn't open) to a
warning, since it happens on the Pajama Sam's Lost & Found demo's main menu
screen.

svn-id: r22593
2006-05-24 03:56:48 +00:00
Max Horn
e4ab8000f0 Pass values by-reference, using C++ references, and not by using pointers
svn-id: r22548
2006-05-20 15:09:15 +00:00
Torbjörn Andersson
05814a1458 Apparently, passing a file handle directly to a function causes that file
handle (a copy of the original?) to be destroyed at the end of the function,
and that closes the internal file handle, even though we want it to stay open.

Who am I to argue with how C++ handles its parameters? I've simply changed the
functions to take pointers to file handles instead. Seems to fix crashes in the
Macintosh resource extractor for me.

svn-id: r22546
2006-05-20 13:59:31 +00:00
Torbjörn Andersson
6cdd98b617 After the GUI has finished, restore the old cursor palette (if any). For this
to work, cursor palette now has to be set using the new "palette manager". See
graphics/paletteman.cpp

svn-id: r22543
2006-05-20 10:59:25 +00:00
Travis Howell
9bc90636f2 Update HE version for another English version of socks
svn-id: r22529
2006-05-19 00:35:13 +00:00
Torbjörn Andersson
2531fd5873 Added player for the Kyra 3 VQA cutscenes, based on my earlier prototype. It
could use some cleanup, and there are a couple of TODOs sprinkled throughout
the code, but it seems to work reasonably well. Until the Kyra 3 main menu is
implemented, it won't actually be used though.

It uses the appendable audio stream class, which I have moved out of the SCUMM
engine.

svn-id: r22526
2006-05-18 21:46:07 +00:00
Eugene Sandulenko
8e9db03379 Plug memory leak
svn-id: r22523
2006-05-18 19:37:38 +00:00
Eugene Sandulenko
e982782281 Fix bug #1483272: "GUI: SCUMM pause dialog breaks upon scaler switch". Also
fix same problem in scumm help dialog.

svn-id: r22522
2006-05-18 16:44:44 +00:00
Eugene Sandulenko
9e3b78e1e9 --force-1x-overlay is no more. Remove leftovers.
svn-id: r22519
2006-05-18 13:59:20 +00:00
Travis Howell
4d69cfeaa4 Update HE version for another English version of socks
svn-id: r22510
2006-05-18 02:34:55 +00:00
Eugene Sandulenko
9103ddda4e Give more feedback to users who misused our SAN compression tool and ignored
FLU index for cideos which are used by INSANE.

svn-id: r22506
2006-05-18 00:20:53 +00:00
Eugene Sandulenko
14ec3f45fa - Heavily modified patch #1214784: "Disable overlay scaling"
- Eriktorbjorn's patch from same tracker item for scaling sword1/2 cutscenes
  is applied as is. It lacks resolution switch on-the-fly.
- GUI widgets are repositioned on the fly and use most space, even aspect
  ratio corrected screen is used without scaling
- Heavy tesing is required, but works for me in all cases except for bug
  #1483272: "GUI: SCUMM pause dialog breaks upon scaler switch" which needs more
  work.
- I probavly broke some backend or two

svn-id: r22505
2006-05-17 23:52:45 +00:00
Max Horn
b6b53afe26 Tell people to only report the MD5 if it's a regular version of the game (and not e.g. a fan translation)
svn-id: r22495
2006-05-16 20:00:48 +00:00
Torbjörn Andersson
076f489107 If the options dialog calls it "Subtitle speed", then so should the indicator
displayed when pressing the + or - keys.

svn-id: r22485
2006-05-16 07:41:48 +00:00
Torbjörn Andersson
e723f7d1eb Ignore unknown SysEx manufacturer IDs, rather than erroring on them. This does
NOT fix bug #1481383, even if that's where I heard about this problem.

svn-id: r22479
2006-05-15 13:19:30 +00:00
Torbjörn Andersson
536beaf286 Fixed regression in Maniac/Zak inventory drawing.
svn-id: r22469
2006-05-14 10:48:03 +00:00
Torbjörn Andersson
16b7c74cc4 Cleanup.
svn-id: r22468
2006-05-14 10:40:06 +00:00
Torbjörn Andersson
bb9de08c73 Specify the right edge of the sentence line in Maniac/Zak. This fixes bug
#1488189, where the sentence line would only display the first character.

svn-id: r22467
2006-05-14 09:58:30 +00:00
Torbjörn Andersson
44ac23a81d Setting VAR_CHARINC = _defaultTalkDelay cannot possibly be right. It's not the
same thing as setting VAR(VAR_CHARINC) = _defaultTalkDelay.

svn-id: r22466
2006-05-14 09:22:49 +00:00
Travis Howell
ada0160e88 Check if VAR_CHARINC exists, before setting value in updateSoundSettings()
svn-id: r22462
2006-05-14 06:00:40 +00:00
Max Horn
0d6362ea48 Patch #1091170: ALL, SCUMM: Subtitle speed control
svn-id: r22456
2006-05-13 17:30:04 +00:00
Eugene Sandulenko
61c3f9d4aa Add newly discovered HE demos.
svn-id: r22455
2006-05-13 17:28:33 +00:00
Max Horn
3623a94927 Added the new AbstractFilesystemNode::getCurrentDirectory() method. Also changed the semantics of the FilesystemNode constructors (see also the relevant doxygen comments for explanations). This also fixes bug #1485941.
svn-id: r22424
2006-05-12 21:41:54 +00:00
Max Horn
d00755de8e Removing some unused code from INSANE
svn-id: r22417
2006-05-12 18:00:41 +00:00
Eugene Sandulenko
d2546e3979 - Updated MSVC8 project files
- Renamed base/options.cpp to base/commandLine.cpp because of conflict
  with gui/options.cpp which sit in same directory in MSVC builds
- Moved AudioCDManager singleton declaration outside of Audio namespace
- Fixed numerous MSVC warning of potentially uninitialized variables and
  int <-> bool conversions.

svn-id: r22397
2006-05-09 14:16:43 +00:00
Travis Howell
4c67122463 Avoid closing a video file in HE games twice
svn-id: r22396
2006-05-08 22:53:09 +00:00
Travis Howell
3f9395831c Fix regression in lost, the middle directories were removed
svn-id: r22388
2006-05-08 13:10:49 +00:00
Travis Howell
ca513f7e66 Fix off by one in rect when capturing image
svn-id: r22387
2006-05-08 11:41:32 +00:00
Travis Howell
d6d3a621dc Init. videoParams vars for HE90+
svn-id: r22386
2006-05-08 11:04:51 +00:00
Travis Howell
3830ac06b3 Add initial DXA support for HE games
svn-id: r22384
2006-05-08 10:21:17 +00:00
Travis Howell
e2c058551b Add missing file details for HE games
svn-id: r22381
2006-05-08 04:11:21 +00:00
Max Horn
2e9bb56744 Turning this warning into an error, since I never got any feedback on it
svn-id: r22376
2006-05-07 11:58:01 +00:00
Max Horn
9a6c120b0d Handle line breaks/overflow for V1-V3 games *after* processing newline codes, to avoid double breaks (which result in spurious empty lines)
svn-id: r22375
2006-05-07 11:47:17 +00:00
Max Horn
c4f6cc5819 Perform (horizontal) charset text clipping for V1-V3, too
svn-id: r22374
2006-05-07 11:45:55 +00:00
Max Horn
3e0cb0dfd0 Fix for bug #1449597 (MANIAC: Incorrect word wrapping)
svn-id: r22371
2006-05-06 22:49:57 +00:00
Travis Howell
13871e4320 Add another English version of socks
svn-id: r22362
2006-05-05 11:21:22 +00:00
Max Horn
d016c353c5 Changed FilesystemNode::listDir to return a bool indicating its success (or failure)
svn-id: r22315
2006-05-03 20:43:26 +00:00
Max Horn
1902673ece Moved some code from SCUMM's detectGames function into a separate function (in an attempt to somewhat reduce the size of this huuuge function)
svn-id: r22314
2006-05-03 19:34:53 +00:00
Max Horn
3f4427b04a Removed CharsetRendererV3::getFontHeight (it was identical to CharsetRendererCommon::getFontHeight)
svn-id: r22311
2006-05-03 16:23:32 +00:00
Max Horn
111ab60a87 Fix insult fight (MI1) mouse wheel scrolling, hopefully also for the SEGA version (see also bug #1193185)
svn-id: r22283
2006-05-02 23:10:25 +00:00
Travis Howell
4c8151f20a Update language details for filenames of a few games
svn-id: r22277
2006-05-02 14:12:39 +00:00
Travis Howell
191a639b11 Update language details for filenames of several HE games
svn-id: r22276
2006-05-02 14:00:29 +00:00
Travis Howell
f3f5664b7d Add gameFilenamesTable[] entries for activity, fbpack and funpack
svn-id: r22275
2006-05-02 13:13:59 +00:00
Travis Howell
e3cb34e5b7 Fix detection of Windows version of puttmoon
svn-id: r22274
2006-05-02 13:06:11 +00:00
Travis Howell
01c92cf6f5 Add support for reading/writing config files through saveGameManager and use for config files in HE games
svn-id: r22273
2006-05-02 03:23:03 +00:00
Max Horn
77c29d0ab2 Some cleanup, and added a FIXME comment concerning the wrong usage of getSavePath()
svn-id: r22266
2006-05-01 21:31:06 +00:00
Max Horn
8542e92ed3 Do not set VAR_VOICE_MODE in ScummEngine_v7::resetScummVars() (since it is already being set by updateSoundSettings())
svn-id: r22248
2006-04-30 20:36:14 +00:00
Max Horn
39e887d6aa Invoke updateSoundSettings a bit later, since it can only correctly set VAR_VOICE_MODE *after* setupScummVars() has been called
svn-id: r22247
2006-04-30 20:35:43 +00:00
Max Horn
f8b0649d18 Honor the 'platform' override when choosing between game variants (this should help fan translations of certain FM-TOWNS games)
svn-id: r22246
2006-04-30 15:06:17 +00:00
Max Horn
b59a791c5e Moved queryResString from class ScummDialog to class InfoDialog; some cleanup
svn-id: r22234
2006-04-29 23:23:32 +00:00
Max Horn
eaca27a33b Renamed updateVolumes to updateSoundSettings -- now it also handles subtitles/speech_mute settings. Also changed the ConfigDialog accordingly
svn-id: r22233
2006-04-29 23:09:40 +00:00
Max Horn
27307acd7c Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio
svn-id: r22231
2006-04-29 22:33:31 +00:00
Max Horn
aeef84c961 Moved AKOS stuff to class ScummEngine_v6
svn-id: r22229
2006-04-29 16:51:29 +00:00
Max Horn
fcd178fca4 Added comment about a major leak in ScummEngine::restart
svn-id: r22228
2006-04-29 16:30:46 +00:00
Max Horn
c4df5037dc * Renamed several methods in favor of a somewhat more uniform naming scheme: setupFOO for stuff that inits static data (i.e. will be called only once, or after loading savegames), vs. resetFOO / updateFOO methods which are called frequently and (re)set dynamic data.
* Doing this, split scummInit into setupScumm and resetScumm methods
* Moved some init code to new methods (huuuuge init methods are hard to read, and hard to customize using subclassing)
* Renmaed various setup???Palette methods to set???Palette
* Some minor cleanup / tweaks

svn-id: r22227
2006-04-29 16:24:39 +00:00
Max Horn
39e9853d91 * Added ScummEngine_v8::initScummVars()
* Moved VAR_LANGUAGE to class ScummEngine_v8
* Minor cleanup

svn-id: r22223
2006-04-29 13:56:36 +00:00
Max Horn
1735b0421b Make use of the new scummLoop_* functions to move some SCUMM version specific stuff around
svn-id: r22219
2006-04-29 13:01:35 +00:00
Max Horn
cc3fac2ead Split scummLoop into multiple functions, for easier maintanance & customizability
svn-id: r22218
2006-04-29 12:44:06 +00:00
Max Horn
bf73598811 * Changed the createEngine() factory function of our plugins to return an error code (the engine is now passed indirectly via a double pointer)
* Removed Engine_Empty (obsolete now that engines can return actual error codes)

svn-id: r22199
2006-04-29 00:27:20 +00:00
Max Horn
b00262a2fe Report unknown MD5s again
svn-id: r22198
2006-04-28 23:43:56 +00:00
Travis Howell
5c2dd8da24 Fix compile of SCUMM engine
svn-id: r22191
2006-04-27 04:59:13 +00:00
Max Horn
9d5098e0f8 Insane is part of SCUMM V7, not V6
svn-id: r22188
2006-04-27 00:02:06 +00:00
Max Horn
bdf790e294 cleanup
svn-id: r22185
2006-04-26 17:15:29 +00:00
Max Horn
092fd96145 Replaced _hFileTable by _hInFileTable/_hOutFileTable
svn-id: r22182
2006-04-26 14:05:09 +00:00
Travis Howell
5ceb4b19b0 isSoundRunning always returns sound id in HE games
svn-id: r22176
2006-04-26 10:34:34 +00:00
Max Horn
a28250d660 Print a slightly more verbose error message when Roland patch isn't found
svn-id: r22175
2006-04-26 09:04:51 +00:00
Max Horn
c940380314 Replace unneeded File::exists calls
svn-id: r22173
2006-04-26 08:35:54 +00:00
Eugene Sandulenko
35098dbd9f Introduce and use Engine_Empty() and Engine::GUIErrorMessage()
svn-id: r22165
2006-04-26 00:59:13 +00:00
Eugene Sandulenko
bf53520130 - Check if path specified for a game in scummvm.ini really exists and complain
if it does not
- Give more understandable feedback to user when SCUMM module can't find
  a game
- Put TODO to kyra engine as their current detection scheme does not let
  easily tell if game data really present in specified directory

svn-id: r22163
2006-04-25 23:07:59 +00:00
Max Horn
b36a5afbd8 Files that are *not* 00.LFL or 000.LFL indicate V5+ games -> teach the detector about that
svn-id: r22159
2006-04-25 21:37:53 +00:00
Max Horn
66783576d4 Somewhat improved detection when MD5 is not available/known
svn-id: r22157
2006-04-25 21:26:49 +00:00
Travis Howell
b1bc5f059e Fix loading music/speech files in HE98+ games
svn-id: r22126
2006-04-23 23:27:51 +00:00
Max Horn
e80d24aa22 Some more cleanup in class Scumm::Sound
svn-id: r22125
2006-04-23 23:00:32 +00:00
Max Horn
99ab7d6fac Fix for HE games which use the generic HE variants (d'oh)
svn-id: r22122
2006-04-23 22:44:50 +00:00
Max Horn
3f41e2dc21 Detect (and error out) if readMAXS fails
svn-id: r22120
2006-04-23 22:39:55 +00:00
Max Horn
f776b903d1 Fix access to .he2 in Sound::openSfxFile, too
svn-id: r22119
2006-04-23 21:58:01 +00:00
Max Horn
e0a5a2b89e Fix access to .he3/.he4 files
svn-id: r22118
2006-04-23 21:56:09 +00:00
Max Horn
1a7b4a7d7c Added a comment regarding COMI disc changing
svn-id: r22117
2006-04-23 20:02:33 +00:00
Max Horn
b2befd7951 Moved _heTimers to ScummEngine_v60he
svn-id: r22116
2006-04-23 19:41:54 +00:00
Max Horn
d68f95b3be Move HE specific stuff from class Sound to its new subclass SoundHE
svn-id: r22115
2006-04-23 18:52:39 +00:00
Max Horn
78dfa1f280 Moved ScummEngine_v5 from cursor.cpp to scumm.cpp (seems to be more natural, even though it inits some cursor related stuff)
svn-id: r22114
2006-04-23 17:58:52 +00:00
Max Horn
0891a91acc Change some uses of ScummFile to the more generic BaseScummFile
svn-id: r22113
2006-04-23 17:47:40 +00:00
Max Horn
4b6f90945b Modified openFile and openResourceFile to take a Common::String instead of a char pointer
svn-id: r22112
2006-04-23 17:39:31 +00:00
Max Horn
0d67640a58 Behold, the new SCUMM detector finally has arrived. Unified detection & engine instantiation, reduced code duplication, more powerful detection in case MD5 is not known / can't be computed, and many other nifty improvements.
svn-id: r22110
2006-04-23 17:33:16 +00:00
Max Horn
6533813576 Fixed MD5 entry for mac version of MI1
svn-id: r22102
2006-04-23 13:29:37 +00:00
Max Horn
660efce9b2 Replaced _demoMode by GF_DEMO
svn-id: r22087
2006-04-23 00:08:18 +00:00
Eugene Sandulenko
ff6028b00b - Implemented MS ADPCM WAV format decoder used in Feeble Files. Still it is
out of sync with video. See TODO there.
- Fixed bug with MS IMA ADPCM mono to make it possible to work in real streams.

svn-id: r22080
2006-04-22 03:00:21 +00:00
Max Horn
b4c330ce07 Some more tweaks to the (still disabled) new detection / filename generation code
svn-id: r22040
2006-04-19 20:26:27 +00:00
Max Horn
70d23ccf29 Added a small comment to ScummEngine::openRoom that explains why we check for room==0 instead of just using it as-is
svn-id: r22038
2006-04-19 18:14:28 +00:00
Max Horn
c5507879fc Removed wrong platform values from gameVariantsTable
svn-id: r22037
2006-04-19 16:16:57 +00:00
Johannes Schickel
3f76984a41 Let scumm engine handle EVENT_SCREEN_CHANGED and let the gui know. (Needed for disabling overlay scaling)
svn-id: r22026
2006-04-19 06:23:49 +00:00
Johannes Schickel
7f0c8883ad Merges SaveLoadChooser and SaveLoadChooserEx.
svn-id: r22021
2006-04-19 05:46:57 +00:00
Johannes Schickel
8828daba84 Updates scumm dialogs for runtime overlay resolution changes.
svn-id: r22018
2006-04-19 01:07:16 +00:00
Torbjörn Andersson
d137204772 Call updateScreen() from waitForTimer() (instead of usually right before it)
for smoother mouse cursor movement.

svn-id: r21993
2006-04-17 23:45:48 +00:00
Max Horn
ac24769196 Replaced o70_seekFilePos by o60_seekFilePos (both were identical)
svn-id: r21979
2006-04-17 14:32:46 +00:00
Johannes Schickel
e7716748ba Should fix wrong thumbnail colors after a screen change, which changed bpp.
svn-id: r21954
2006-04-16 20:41:40 +00:00
Max Horn
74edd90aba Fix for bug #1471383: Instead of overloading ConfigManager::set, we now have new setInt and setBool methods (matching getInt/getBool), which avoids strange quirks & bugs caused by (char *) being implicitly cast to int (ouch)
svn-id: r21951
2006-04-16 19:23:14 +00:00
Willem Jan Palenstijn
784467abfd changed comments into real comments
svn-id: r21945
2006-04-16 14:14:22 +00:00
Max Horn
fe01f3a03f Ignore the 'virtual' HE entries at the end of gameVariantsTable (this fixes an odd detector problem)
svn-id: r21944
2006-04-16 14:07:55 +00:00
Max Horn
206fdf0528 Fixed broken svn:keywords values
svn-id: r21939
2006-04-16 13:01:41 +00:00
Max Horn
ba1b25305e Removed the directory parameter from md5_file
svn-id: r21937
2006-04-16 12:50:39 +00:00
Max Horn
ec17b6505e Removed unused #include
svn-id: r21918
2006-04-15 21:20:32 +00:00
Max Horn
68cb7f52c8 - Renamed ConfigManager::getActiveDomain to getActiveDomainName, and added a new getActiveDomain method that returns a pointer to the actual active *domain*
- Added Engine::_targetName whose value is computed from the name of the active domain
- Removed GameDetector::_targetName, instead code now uses either Engine::_targetName or the name of the active domain
- This in turn allowed for removing usage of GameDetector in many places

svn-id: r21916
2006-04-15 20:36:41 +00:00
Max Horn
ad45318328 Removed GameDetector::_gameid in favor of using a config manager entry
svn-id: r21915
2006-04-15 17:39:14 +00:00
Max Horn
9c4577b639 - Get rid of GameDetector::_dumpScripts and GameDetector::_force1xOverlay in favor of settings in the transient config domain
- This also means you can now set those options in the config file
- Fixed a bug I recently introduced that made bool command line options (like -u, -f) always return 'false' when used in their single letter form

svn-id: r21909
2006-04-15 13:50:44 +00:00
Max Horn
aa2964ceff Some more detector stub code (unused)
svn-id: r21896
2006-04-15 00:24:20 +00:00
Max Horn
199e5cb4f7 Some cleanup of the SCUMM ConfigDialog; also added a big FIXME comment explaining what the dialog does badly, and how that could be fixed (anybody feeling bored, feel free to implement the solution I outline there)
svn-id: r21890
2006-04-14 18:51:42 +00:00
Max Horn
6df54763ef Yes, it is really necessry to compute a special 'disk number' here (in fbear at least)
svn-id: r21882
2006-04-14 10:32:06 +00:00
Travis Howell
77ad88a2f2 Add variant for updated Spy Fox 1
svn-id: r21881
2006-04-14 09:58:20 +00:00
Max Horn
de08164420 Possible fix for bug #1470197 (SCUMM: HE Game variants broken)
svn-id: r21879
2006-04-14 09:45:29 +00:00
Max Horn
1470dadb1d Changed File::open to take a Common::String as file name parameter
svn-id: r21867
2006-04-14 01:48:51 +00:00
Torbjörn Andersson
e21f99c7ba Slightly more verbose error message.
svn-id: r21846
2006-04-13 18:09:33 +00:00
Eugene Sandulenko
3fa9fa06c2 Clarified detection filenames for HE games (removed FIXME comments).
svn-id: r21835
2006-04-13 04:01:55 +00:00
Max Horn
cf202049ff Fixing mismatch between format strings and data on some systems
svn-id: r21827
2006-04-12 14:54:12 +00:00
Jonathan Gray
eb3ae7d726 sizeof(void *) != sizeof(int) for a large number of systems.
Fix a lot of debug/error statements that were using %d/%x
for the result of pointer arithmetic.

As C++ apparently has no format string for ptrdiff_t use
%lu/%lx as appropriate.

svn-id: r21824
2006-04-12 10:01:41 +00:00
Max Horn
24b2f65f91 Re-fix the CD version of Loom
svn-id: r21814
2006-04-11 22:47:53 +00:00
Max Horn
4ec79db410 Rearranged code in ScummEngine::openRoom a bit, to separate the filename generation from other things
svn-id: r21813
2006-04-11 22:41:44 +00:00
Torbjörn Andersson
10c62a2eed If generateDetectName() generates an empty string, that's a failure, not a
success. Otherwise ScummVM will crash once the game detector reaches the
"generic HE game variants", which makes it hard to add non-SCUMM games.

svn-id: r21808
2006-04-11 19:29:55 +00:00
Max Horn
a42dd86e85 Some more MD5 entries / confirmations by Peter Eckerlein
svn-id: r21788
2006-04-11 12:59:44 +00:00
Max Horn
935989d8cd More commented out stuff: added generateFilenameForDetection method, for use by the detector; and applied various fixes to generateFilename (which is still completely untested, so it certainly contains more 'bugs' :)
svn-id: r21771
2006-04-10 22:45:05 +00:00
Max Horn
0ed3018f2b Some more tweaks to the (still unused) gameFilenamesTable; also readded an enhanced version of the (also unused) generateFilename function
svn-id: r21770
2006-04-10 22:25:42 +00:00
Max Horn
64ae34400f Removing dummy code from resource.cpp
svn-id: r21769
2006-04-10 22:11:05 +00:00
Max Horn
8cbe1f3823 Merged scumm_settings into extra_versions, which in turn got renamed to gameVariantsTable
svn-id: r21768
2006-04-10 21:43:49 +00:00
Max Horn
7b7eb1f331 Changed the precedence of the MD5 overrides (highest priority: config file, then target_md5.txt override, finally the 'reaL md5); also did some cleanup and code unification
svn-id: r21736
2006-04-09 22:18:48 +00:00
Max Horn
cd5b1fee40 Removed some obsolete code
svn-id: r21735
2006-04-09 22:05:05 +00:00
Max Horn
39a2bc6812 Added gameFilenamesTable (currently unused, and hence disabled)
svn-id: r21734
2006-04-09 22:03:29 +00:00
Eugene Sandulenko
a74fcf7cee Fix regression introduced by removing of GF_HE_CURSORLESS feature flag.
There are 3 cases of HE cursors:
o Default one. We set up cursor palette for it.
o Loaded from .HE3 (windows resource file). We use default cursor palette.
o Loaded from WizImage. We disable default cursor palette.

svn-id: r21711
2006-04-09 03:16:05 +00:00
Eugene Sandulenko
9438f803a6 Clarify UK/US language for those HE demos which UK versions we have reported.
svn-id: r21709
2006-04-09 00:57:41 +00:00
Eugene Sandulenko
dcfad9426f Specify UK/US version for PuttTime since we have UK version reported for it.
svn-id: r21707
2006-04-09 00:37:20 +00:00
Eugene Sandulenko
d26b00330e Clarify language for several UK HE releases
svn-id: r21706
2006-04-09 00:25:29 +00:00
Max Horn
807edc83c7 Properly translate Common::Language values for V0-V2 games, too
svn-id: r21705
2006-04-08 23:56:09 +00:00
Max Horn
85c9dc7de8 Properly translate Common::Language values for COMI
svn-id: r21704
2006-04-08 23:43:18 +00:00
Eugene Sandulenko
5a2ad04a9e Introduced language EN_ANY used for general English game entries. EN_USA and
EN_GRB should be used for games which have both variants. Currently it is
MM NES and BASS. All other are switched to EN_ANY.

svn-id: r21702
2006-04-08 23:12:56 +00:00
Max Horn
3add3dae95 Removed dupliate entry from extra_versions table
svn-id: r21701
2006-04-08 22:48:03 +00:00
Max Horn
c8ea13139d Our extra_versions table is a bit too eager in some cases to assign platform values; fixing some of these cases and adding code that detects these and triggers an according warning
svn-id: r21700
2006-04-08 22:05:45 +00:00
Max Horn
e7a8bb6abf Modified the REGISTER_PLUGIN macro so that it allows (and requires) a trailing semicolon (this helps certain tools to parse our code better)
svn-id: r21689
2006-04-08 12:06:07 +00:00
Max Horn
dc77d02c7e Removed common/map.h with the Common::Map template class (it was a very bad implementation, and our HashMap is simply better).
svn-id: r21688
2006-04-08 11:38:41 +00:00
Max Horn
30c2e13456 Move some more bits into namespace Scumm
svn-id: r21685
2006-04-08 08:43:28 +00:00
Max Horn
9c77c2ecd1 Renamed various *GameSettings to GameSettings (our namespaces are enough to distinguish them)
svn-id: r21684
2006-04-08 08:23:33 +00:00
Max Horn
9e5950e704 New Loom version reported by Peter Eckerlein
svn-id: r21673
2006-04-07 22:46:59 +00:00
Max Horn
1cda8e10f0 Finally got rid of multiple_versions_md5_settings in favor of extra_versions
svn-id: r21672
2006-04-07 22:40:45 +00:00
Eugene Sandulenko
8b995a8c52 Fix freddicove detection.
svn-id: r21610
2006-04-04 23:05:06 +00:00
Eugene Sandulenko
8fa9bd6728 Removed extra exclamation marks in warning() calls as well.
svn-id: r21608
2006-04-04 22:21:10 +00:00
Eugene Sandulenko
d292c0ec55 Since our debug() adds an exclamation mark at the message end, remove
it in several calls to avoid duplication!!11!

svn-id: r21607
2006-04-04 22:04:51 +00:00