Commit Graph

52 Commits

Author SHA1 Message Date
Travis Howell
4350f7b8c0 Fix objects structure and object scripts in PCE version of Loom.
svn-id: r45335
2009-10-22 11:33:05 +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
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
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
9c06549d31 Hack is no longer required, due to revision 42498.
svn-id: r42499
2009-07-15 05:00:59 +00:00
Johannes Schickel
59aa80b2d2 Fix mismatching format arguments.
svn-id: r42105
2009-07-04 18:54:27 +00:00
Max Horn
99df028d35 SCUMM: Got rid of o6_invalid
svn-id: r39957
2009-04-16 09:27:02 +00:00
Max Horn
432e7917a5 SCUMM: Switched opcode tables to use Common::Functor0 (a bit like Kyra does it)
svn-id: r39956
2009-04-16 09:26:37 +00:00
Max Horn
6f4b567124 SCUMM: Split intern.h into multiple headers
svn-id: r39567
2009-03-20 16:33:58 +00:00
Travis Howell
241d995586 Clear cutsceneOverride for all scripts (except current), when restarting any game, fixes bugs:
#1923193 - MONKEY: cannot restart during the intro
#2518226 - FT demo: debugger at end of demo

svn-id: r38398
2009-02-17 09:41:21 +00:00
Travis Howell
501b321532 Revert talkspeed changes, while still only using the game specific talkspeed setting (if it exists). And clarify the talkspeed differences between games in the README.
svn-id: r36299
2009-02-13 10:04:17 +00:00
Max Horn
32f735a228 cleanup
svn-id: r35131
2008-11-20 13:50:53 +00:00
Max Horn
3a3698f960 Fix for bug #2251765: FT: Talk speed inconsistency
svn-id: r35082
2008-11-15 13:54:16 +00:00
Max Horn
d4853dd9e8 Patch #2060517: SCUMM: engine sets incorrect talkspeed value
svn-id: r34596
2008-09-17 18:56:13 +00:00
Max Horn
eb649983fc SCUMM: Renamed inventoryScript -> inventoryScriptIndy3Mac
svn-id: r33654
2008-08-06 09:13:57 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Max Horn
0723e3e24a Introduced ClickArea enum, some related cleanup in runInputScript and checkExecVerbs
svn-id: r27778
2007-06-29 23:08:15 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Max Horn
2447752a51 Reverted my roomoffs changes (broke the Loom intro), and instead added the constant RES_INVALID_OFFSET to indicate an invalid room offset
svn-id: r26353
2007-04-01 15:58:34 +00:00
Travis Howell
d1d5579549 Fix script error in PC Engine version of Loom.
svn-id: r25958
2007-03-04 00:44:04 +00:00
Travis Howell
8e70329ce3 Fix level selection in PC Engine version of Loom.
svn-id: r25954
2007-03-03 23:02:54 +00:00
Travis Howell
d64d6bcb7e Add stopObjectCode() differences in SCUMM 1 - 5 games. The nested script stack wasn't been checked.
svn-id: r24751
2006-11-20 03:21:09 +00:00
Travis Howell
3789828993 The script freezeCount isn't used by SCUMM 1/2 games at all
svn-id: r24741
2006-11-19 00:38:37 +00:00
Travis Howell
5d4543a59c Fix bug #771499 - ZAK: Lotto numbers never picked. The freezeCount isn't checked in runScriptNested(), when restarting script in SCUMM 1/2.
svn-id: r24575
2006-10-30 01:53:19 +00:00
Max Horn
083a7c2549 SCUMM: The didexec flag did not exist in V0-V2; minor cleanup
svn-id: r24571
2006-10-29 18:42:28 +00:00
Torbjörn Andersson
bcd4591da4 Workaround for bug #1555938 ("MI2: Inventory object cloning"), as suggested by
Fingolfin.

svn-id: r24080
2006-10-02 21:38:39 +00:00
Max Horn
d02e4d7f7c Removed CHECK_HEAP
svn-id: r23979
2006-09-23 11:29:32 +00:00
Max Horn
51017cf1b2 Renamed ScummEngine::res to _res and allocate the ResourceManager on the heap (i.e. _res is a pointer now)
svn-id: r23922
2006-09-17 20:36:48 +00:00
Max Horn
b860f002b2 Replaced checkRange by assertRange, which has (a) an (IMO) more logical order of parameters, and (b) removes lots of useless duplicate information in error messages
svn-id: r23885
2006-09-16 13:38:43 +00:00
Travis Howell
e1ea1b90a2 Fix string formating in Russian versions of HE72+ games
svn-id: r23820
2006-09-02 12:47:29 +00:00
Max Horn
2c0967e7bb cleanup & check for sentence overflows
svn-id: r23736
2006-08-21 10:04:04 +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
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
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
Travis Howell
a0d14a0832 Fix Commodore 64 versions
svn-id: r22732
2006-05-29 12:45:11 +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
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
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
Travis Howell
34b89a3258 Correct VAR_OVERRIDE settings in override opcodes
svn-id: r21307
2006-03-15 06:29:28 +00:00
Travis Howell
cc8796248d Minor cleanup
svn-id: r21306
2006-03-15 05:59:30 +00:00
Travis Howell
3e72b26adc Revert mistaken commit of local debug code
svn-id: r21220
2006-03-12 01:06:23 +00:00
Travis Howell
f9797f3ac3 Correct mistake in md5 tables for Simon the Sorcerer 2 (DOS Floppy)
svn-id: r21219
2006-03-12 00:53:30 +00:00
Max Horn
f4f8a9263a Yet another patch for bug #1407789 (FT: Invalid Actor when "Combining" Two Items)
svn-id: r21006
2006-03-02 09:34:48 +00:00
Travis Howell
fd8f11f7a4 Improve input in C64 maniac
svn-id: r21000
2006-03-02 01:17:41 +00:00
Gregory Montoir
9a9475169d added 2 SCUMM vars for v1/v2.
svn-id: r20994
2006-03-01 20:07:33 +00:00
Max Horn
779028dcd2 Modified the workaround for bug #1407789 to not depend on MD5 detection
svn-id: r20880
2006-02-25 18:16:24 +00:00
Max Horn
6914121f61 Replaced MKID by MID_BE in most places in the SCUMM engine
svn-id: r20862
2006-02-25 02:12:58 +00:00