Commit Graph

1700 Commits

Author SHA1 Message Date
Norbert Lange
b4c689a3c1 fixed up some missing newlines
removed MSVC6 disable pragmas, the warnings are already disabled in the project files

svn-id: r43182
2009-08-09 18:59:22 +00:00
Norbert Lange
0350a1598d merge with trunk
svn-id: r43134
2009-08-08 19:09:30 +00:00
Norbert Lange
4e7b156e10 fix a bug that prevented gcc from compiling
correctly added my palette patch (it showed up in the rev-changes but dint got applied fully to the svn tree?)

svn-id: r43116
2009-08-08 09:49:28 +00:00
Norbert Lange
4890ada18f replace workaround in case musicfiles are missing with a simpler one
svn-id: r43071
2009-08-05 17:29:02 +00:00
Norbert Lange
139fa6ff13 remove a former workaround for Amiga MI
svn-id: r43055
2009-08-04 20:27:25 +00:00
Norbert Lange
28210abe77 fixed hanging intro (and possible other scenes) when music cant be loaded
svn-id: r43054
2009-08-04 19:53:13 +00:00
Norbert Lange
4c4eb1394c added warning should the sound files not be available (intro will hang if there is no musictimer)
svn-id: r43049
2009-08-04 17:43:56 +00:00
Norbert Lange
ed8f02af96 synced the branch with the palette patch (#2819787)
svn-id: r42987
2009-08-02 01:00:56 +00:00
Norbert Lange
92d292a3f6 made MdatResource struct private and changed the signatures of functions which load the resources.
svn-id: r42982
2009-08-02 00:03:42 +00:00
Norbert Lange
59395eb6b6 stole formatting for constructors from existing code
svn-id: r42981
2009-08-01 23:14:28 +00:00
Norbert Lange
a28281072d engines/scumm/scumm.cpp: terminate method is pretty redundant - removed
tfmx, player_v4a: refactored Tfmx to allow sharing of resources between 2 instances. Needed changes in player_v4a aswell

svn-id: r42980
2009-08-01 23:02:45 +00:00
Norbert Lange
27ee1eb331 refactored and commented player_va4 a bit
fix waitcommand in Tfmx
try making tfmxplayer compile again

svn-id: r42976
2009-08-01 16:10:00 +00:00
Torbjörn Andersson
01886d3e52 Added some more information to the "Compressed sound ... invalid" error. Maybe
this will help in determining what's causing bug #2830364. (It sounds like a
bad data file, but who knows...)

svn-id: r42974
2009-08-01 15:42:42 +00:00
Norbert Lange
a4ebf2cfa6 using accessmodifiers in Tfmx now and removed/disabled functions that now dont work anymore (the commandline utility cant be compiled anymore as result of this)
added arraysize of external signals and check it before accesses
moved 2 debug-functions into Tfmx.cpp, removed depencies to files in the tfmx folder
moved common code for fade-effects in a seperate method

svn-id: r42961
2009-07-31 14:29:04 +00:00
Max Horn
91434bd9c5 SCUMM: Properly detect & distinguish the three FM-TOWNS double-demos
svn-id: r42951
2009-07-30 21:56:04 +00:00
Max Horn
25d83581dc minor cleanup to scale2x, to avoid confusing the compiler about potential pointer aliasing (only the tip of the iceberg, of course... ;)
svn-id: r42938
2009-07-30 17:52:44 +00:00
Max Horn
6df25f47c3 Removed last traces of clearIOFailed. Yay :)
svn-id: r42910
2009-07-29 21:39:00 +00:00
Max Horn
d91d68a9ca SCUMM: Fix verb/sentence handling in Indy3 mac (there, a double click must be used to trigger a verb/sentence)
svn-id: r42907
2009-07-29 20:35:50 +00:00
Johannes Schickel
d1cce09149 Fix regression, which prevented saving in COMI.
svn-id: r42900
2009-07-29 19:39:03 +00:00
Max Horn
2205541e86 SCUMM: Enable looping in Indy3Mac sound effects
svn-id: r42898
2009-07-29 18:35:34 +00:00
Max Horn
fcdd3b0310 SCUMM: Rewrote ScummEngine::inventoryScriptIndy3Mac for clarity
svn-id: r42889
2009-07-29 11:48:20 +00:00
Max Horn
f6e16537b3 SCUMM: cleanup
svn-id: r42880
2009-07-29 08:55:04 +00:00
Max Horn
eb9600b5e9 SCUMM: Moved _inventoryOffset to ScummEngine_v2 and save it.
Fixes bug #2828417: Zak V2: inventory position isn't reset when loading.

svn-id: r42870
2009-07-28 23:19:33 +00:00
Willem Jan Palenstijn
ed763cccfe Fix format string issues (and compiler warnings).
Patch by salty-horse.

svn-id: r42842
2009-07-27 16:04:35 +00:00
Johannes Schickel
7e71865e91 Move the event recorder to its own class (EventRecoder inside common/EventRecorder.[h/cpp]).
svn-id: r42751
2009-07-25 12:59:46 +00:00
Max Horn
4463e1c084 Whitespace fixes
svn-id: r42742
2009-07-25 09:36:16 +00:00
Travis Howell
27efb99ae8 Whitespace changes.
svn-id: r42740
2009-07-25 07:17:37 +00:00
Torbjörn Andersson
b92477f6ab Fixed GCC warnings.
svn-id: r42739
2009-07-25 06:55:28 +00:00
Travis Howell
c02ad3b7bf Add patch #2821100 - MM C64 Objects / Verb fixes, with minor clean up applied.
svn-id: r42737
2009-07-25 06:27:41 +00:00
Travis Howell
41ef4938ac Add patch #2816140 - MM C64 Costume Animation.
svn-id: r42736
2009-07-25 05:39:57 +00:00
Travis Howell
035dad7b3c Adjust workaround for bug #2826144, to use hard coded offset, that should be safe in all language versions.
svn-id: r42695
2009-07-24 13:30:26 +00:00
Travis Howell
171061894b Add workaround for bug #2826144 - SAM: Game hangs when talking to bigfoot guard.
svn-id: r42693
2009-07-24 12:28:53 +00:00
Travis Howell
3efecb3afc Fix cursor position, when entering a save game name in HE games.
svn-id: r42685
2009-07-24 05:20:44 +00:00
Travis Howell
211869d02e Bear Stormin' is the full mini game, and not a demo.
svn-id: r42681
2009-07-24 04:59:21 +00:00
Travis Howell
33929b5248 Only autosave in supported scenes.
svn-id: r42677
2009-07-23 10:54:12 +00:00
Travis Howell
c8d7b677f8 Fix bug #1726909 - HE Games: Glitches after loading saved games, by restircting HE games to their original load/save interface.
svn-id: r42675
2009-07-23 10:33:13 +00:00
Travis Howell
68a75c2170 Remove keyboard support for mouse buttons, since it interferes with load/save scripts in HE games and input scripts in others games (COMI, FT). It isn't much use anyway, since we dropped support for cursor movement via keyboard long ago.
svn-id: r42674
2009-07-23 10:31:06 +00:00
Travis Howell
870e0341bb Correct error in revision 26678.
svn-id: r42673
2009-07-23 07:49:28 +00:00
Travis Howell
46be9c3a1c Simplify the code to check whether loading or saving a game is possible.
svn-id: r42672
2009-07-23 05:57:00 +00:00
Travis Howell
fad11ade6e Simplify the code to check whether loading or saving a game is possible.
svn-id: r42671
2009-07-23 05:48:20 +00:00
Eugene Sandulenko
9b031982cf Fix bug #1745396: "MI: Saved game from the credits sequence fails to load".
Now we specifically disallow saves in room 0 for all v4+ games. Original
has exactly this check in all versions, and such games are impossible to load.

Still the problem is not resolved for v0-v3 and HE games.

svn-id: r42664
2009-07-22 19:25:53 +00:00
Travis Howell
f4916b9830 Change the default target to CD version, for games which offer floppy and CD versions. So all GUI options are still available in fan translations.
svn-id: r42655
2009-07-22 10:23:58 +00:00
Willem Jan Palenstijn
f9208f1bb0 Make ScummFile::eos() consistent with Stream::eos().
Remove usage of ioFailed from SCUMM engine.
Fix reading up to the end of a SCUMM SubFile.
This hopefully fixes #2820957.

svn-id: r42632
2009-07-20 20:55:28 +00:00
Gregory Montoir
d362ca86f6 add "-IQ" suffix test to SO_LOAD_STRING (same as SO_SAVE_STRING) ; fixes french version of atlantis
svn-id: r42596
2009-07-18 21:26:44 +00:00
Travis Howell
1d40f78499 Add workaround for bug #1668393 - ZAK FM-TOWNS: Crash when entering Hostel from outside.
svn-id: r42590
2009-07-18 13:39:21 +00:00
Norbert Lange
bb64bf008d merge with trunk
svn-id: r42574
2009-07-17 21:23:54 +00:00
Travis Howell
cff307e55d Fix bug #2821986 - COMI: setting to 'subtitles only' does not disable speech.
svn-id: r42548
2009-07-17 00:25:27 +00:00
Travis Howell
c0965b2a2a Fix using subtitles only setting in The Dig.
svn-id: r42545
2009-07-17 00:10:10 +00:00
Johannes Schickel
1e3beb40c0 This commit is just for DrMcCoy. (forgot to fix two usages of whitespaces instead of tabs for indentation -.-)
svn-id: r42539
2009-07-16 17:44:05 +00:00
Johannes Schickel
2422ee06a2 Formatting fixes.
svn-id: r42538
2009-07-16 17:39:16 +00:00