Commit Graph

1028 Commits

Author SHA1 Message Date
Torbjörn Andersson
a1a16d1579 Use consistent naming for the preprocessor constants used to guarantee that
header files are only included once. Many of them didn't have a SCUMM prefix
which could have lead to clashes with common header files.

svn-id: r25727
2007-02-19 17:48:19 +00:00
Travis Howell
abd20d59fa Move SCUMM version checks for settings up monst.er.sou file, to higher level.
svn-id: r25716
2007-02-19 09:46:45 +00:00
Max Horn
e9f9792f2d Fix for bug #1660560 (MANIAC: Meteor faces wrong way during intro)
svn-id: r25705
2007-02-18 21:07:00 +00:00
Max Horn
348b72e107 Improved (I hope) the 'Unknown MD5' messages in our detectors a little bit
svn-id: r25695
2007-02-18 18:07:32 +00:00
Chris Apers
619d8e87f1 French keyboard is 'azerty' not 'awert'
svn-id: r25693
2007-02-18 17:53:44 +00:00
Torbjörn Andersson
da442dd2fb Fixed bug #1662774 ("SCUMM: Textual verb glitch"). It was a regression caused
by an earlier cleanup.

svn-id: r25689
2007-02-18 16:01:55 +00:00
Torbjörn Andersson
1a6361038e Committed my fix for bug #1662549 ("SCUMM: MIDI music is broken"). Apparently,
'len' is now one less than it used to in sysexHandler_Scumm(). Let's hope I
changed all the cases that needed changing, and nothing else...

svn-id: r25671
2007-02-18 09:10:50 +00:00
Max Horn
5fc65f2230 cleanup
svn-id: r25668
2007-02-18 01:05:27 +00:00
Max Horn
b777c09ac0 Removed some dead code, updated a warning message
svn-id: r25662
2007-02-17 20:38:27 +00:00
Max Horn
b8aeefaffb Added finalize() method to Common::OutSaveFile (which by default just flushes the stream), changed engines to call that before deleting OutSaveFile instances (instead of just flushing)
svn-id: r25660
2007-02-17 18:55:51 +00:00
Max Horn
7d5d6c2f91 Speed up the Player_NES code quite a bit (still is rather slow without compiler optimizations on my 1.5Ghz PowerBook G4, but at least it's not unbearably slow anymore, and with -O2 it's running smoothly)
svn-id: r25659
2007-02-17 18:52:21 +00:00
Max Horn
f027e2f562 OOified Player_NES code; revamped the code in GetSample slightly (to avoid overflows, an expensive multiplication and an even more expensive division)
svn-id: r25658
2007-02-17 16:59:06 +00:00
Max Horn
3270885bc1 Fix for bug #1660550 (MANIACNES: Graphics glitch on intro screen)
svn-id: r25657
2007-02-17 16:56:54 +00:00
Gregory Montoir
f1f88c43c0 cleanup
svn-id: r25646
2007-02-17 01:33:47 +00:00
Gregory Montoir
441ea2bdb1 cleanup
svn-id: r25645
2007-02-17 01:24:50 +00:00
Travis Howell
dadaf08b29 Reduce amount of attempts to open various speech filenames.
svn-id: r25644
2007-02-17 01:23:52 +00:00
Max Horn
7b7c27bc0c SCUMM: Fix opening of *.tlk files
svn-id: r25643
2007-02-17 01:21:00 +00:00
Gregory Montoir
369474bec6 get rid of bitCount table (count occurences of bit 0 directly in the main loop)
svn-id: r25642
2007-02-17 01:20:41 +00:00
Torbjörn Andersson
16e7a12878 Some very obvious cleanups.
svn-id: r25635
2007-02-16 17:13:29 +00:00
Max Horn
4db72c8762 Unified how we deal with (and how we generate) MIDI sysex messages -- in particular, we now always do so w/o framing the message (documented this with a Doxygen comment in the MidiDriver class)
svn-id: r25630
2007-02-16 13:30:41 +00:00
Max Horn
96162c14ea Ugh -- these internal iMuse structs were supposed to be packed, but never were explicitly markes as such. Doing that now (might break old savegames on some ports :/)
svn-id: r25629
2007-02-16 12:34:30 +00:00
Max Horn
cce2617f24 Added details on brazilian comi/dig (once more from the forums)
svn-id: r25623
2007-02-16 09:28:22 +00:00
Travis Howell
8bef04f94a Add Quietust's patch, to fix graphical glitch in MM NES with scrolling and objects.
svn-id: r25619
2007-02-16 02:26:42 +00:00
Max Horn
26a3ad56e5 Added italian LANGUAGE.TAB/.BND details (thanks to Glorfindel in forum thread 3445)
svn-id: r25616
2007-02-15 23:12:33 +00:00
Willem Jan Palenstijn
5e93000a75 fix compile error
svn-id: r25612
2007-02-15 20:24:03 +00:00
Max Horn
dc5ef8425b Introduced V12_X_SHIFT / V12_Y_SHIFT
svn-id: r25611
2007-02-15 18:12:29 +00:00
Paweł Kołodziejski
310e275a79 not need this hack as smush player is no longer on another thread
svn-id: r25610
2007-02-15 17:53:59 +00:00
Torbjörn Andersson
9ad0fdda96 Clear _pauseTime in seekSan(). Hopefully, this will fix the problem with
pausing during the bike fight scenes in Full Throttle that was reported on the
forum earlier today.

svn-id: r25609
2007-02-15 17:26:08 +00:00
Max Horn
8afb83884a cleanup
svn-id: r25606
2007-02-15 13:27:36 +00:00
Max Horn
57f529e36e added some static keywords
svn-id: r25604
2007-02-15 12:00:13 +00:00
Max Horn
c584d2f332 Fix for bug #1328131 (MANIACNES: Inventory hotspots can be misaligned) and its dup #1537595 (MANIACNES: Heavy script bug)
svn-id: r25603
2007-02-15 11:56:17 +00:00
Max Horn
e616b4c4b6 Fix for bug #1328146: MANIACNES: Shortcut keys are incorrectly configured
svn-id: r25601
2007-02-15 10:40:20 +00:00
Max Horn
41898a3dd9 Fix for bug #1451720: MANIACNES: Actors don't appear if outside camera range
svn-id: r25600
2007-02-15 10:30:30 +00:00
Max Horn
247110b19b SCUMM: Many (most) game flags can computed based on the SCUMM version and other flags; we now do that were possible and only specify the absolute minimum in gameVariantsTable
svn-id: r25598
2007-02-14 23:29:13 +00:00
Gregory Montoir
97f84927e8 added language file details for french versions of TheDig and COMI
svn-id: r25597
2007-02-14 23:13:57 +00:00
Max Horn
05a2df034c SCUMM: Moved part of detectGames into a new function computeGameSettingsFromMD5 to make it slightly more readable
svn-id: r25596
2007-02-14 22:53:19 +00:00
Max Horn
1393f130c2 SCUMM: Enhanced detector so that it can discover the language of COMI/Dig based upon the LANGUAGE.TAB / LANGUAGE.BND file (currently only contains data for german comi&dig, and english comi)
svn-id: r25594
2007-02-14 22:37:07 +00:00
Max Horn
62bd2a1544 Make use of md5_file_string
svn-id: r25593
2007-02-14 21:59:57 +00:00
Max Horn
0e46eb8265 cleanup
svn-id: r25584
2007-02-14 09:52:21 +00:00
Gregory Montoir
7fa8e652a0 added missing MKID_BE macros
svn-id: r25560
2007-02-13 20:58:20 +00:00
Gregory Montoir
73ea646c04 update
svn-id: r25559
2007-02-13 20:56:48 +00:00
Eugene Sandulenko
8405eca0ea Fix warnings
svn-id: r25554
2007-02-13 19:51:27 +00:00
Torbjörn Andersson
3bc0661065 Merged the "palette manager" into the cursor manager. It was only used to
manage *cursor* palettes, so the name was misleading.

svn-id: r25500
2007-02-12 00:04:56 +00:00
Max Horn
856742075e Code cleanup: Removing unused code for handling OS/2 (NE header) binaries
svn-id: r25497
2007-02-11 22:37:47 +00:00
Max Horn
f3141ba2a0 Marked FM-TOWNS demos as such
svn-id: r25494
2007-02-11 20:16:25 +00:00
Max Horn
5298fa0e47 SCUMM: Enhanced preferredtarget support
svn-id: r25493
2007-02-11 19:59:07 +00:00
Max Horn
534bfddd06 Fix for bug #1506591: HE71-73: Fails to load mouse data (Endian issue?)
svn-id: r25492
2007-02-11 18:07:19 +00:00
Max Horn
a6bd7be988 Patch #1186858 (GM/GS/MT-32 Init Patch) -- slightly adapted to apply to current SVN
svn-id: r25483
2007-02-11 03:01:28 +00:00
Max Horn
6899e72be9 Got rid of GF_DIGI_IMUSE and GF_NEW_CAMERA
svn-id: r25454
2007-02-10 02:05:59 +00:00
Max Horn
7940720d71 SCUMM: Added preferredtarget support
svn-id: r25453
2007-02-09 18:23:59 +00:00
Travis Howell
56ff44633f Update HE version for French versions of a few HE games.
svn-id: r25399
2007-02-06 12:29:31 +00:00
Gregory Montoir
f477e964d2 typo
svn-id: r25397
2007-02-05 22:49:58 +00:00
Gregory Montoir
15e2af8e9d 'fixed' o_blastText and updated a comment
svn-id: r25396
2007-02-05 22:47:22 +00:00
Max Horn
5b65897cd3 Switch SCUMM engine to use the common special debug flags support (thus making it possible to use --debugflags with it)
svn-id: r25381
2007-02-04 12:41:49 +00:00
Max Horn
18a9cb46d6 Removed GF_NO_SCALING
svn-id: r25372
2007-02-04 02:11:29 +00:00
Max Horn
53432b2bbe Use Actor::getRealPos instead of Actor::getPos in the debugger
svn-id: r25371
2007-02-04 01:52:50 +00:00
Max Horn
be052be462 Rewrote the actor walk code for SCUMM V0-V2 games: Now it uses the C64 character coordinates internally, not pixel coordinates. This should fix some walk bugs, but also might cause some regressions. Watch out
svn-id: r25370
2007-02-04 01:24:43 +00:00
Travis Howell
9865bc8fa5 Fix compile of SCUMM engine.
svn-id: r25368
2007-02-04 00:17:35 +00:00
Max Horn
96fe9d111f Fixed the default coords in ScummEngine_c64::o_putActorAtObject, which still in char coords, not pixel coords (see also ScummEngine_v2::o2_putActorAtObject)
svn-id: r25367
2007-02-03 23:47:45 +00:00
Max Horn
69ba8e57c2 Changed old FIXME comment into a WORKAROUND comment (it worked fine all these years, after all :); also added some paranoia checks
svn-id: r25366
2007-02-03 23:10:17 +00:00
Max Horn
cb49cbdd45 * Reimplemented Mixer::pauseAll to simply invoke pause on all channels
(implying change of semantics)
* Reordered the params of Mixer::playRaw (the SoundType now comes first, not last)
* Removed Mixer::isPaused
* Removed Mixer::getSoundElapsedTimeOfSoundID
* Added some doxygen comments to the Mixer

svn-id: r25356
2007-02-03 19:05:53 +00:00
Max Horn
0fc672025c Removed obsolete call to Mixer::isPaused
svn-id: r25353
2007-02-03 18:08:10 +00:00
Gregory Montoir
9c7dd91626 removed unneeded/unnecessary variables and made SmushFont table private (to ensure getFont() get called to access them)
svn-id: r25352
2007-02-03 17:55:49 +00:00
Torbjörn Andersson
ea40535678 Applied the revised NUT font renderer patch #1635584, which combines cyx's
patch for correct (not to mention more efficient) rendering of CMI's shadowed
letters, while retaining most of the memory savings of my original patch. This
time, SMUSH and INSANE fonts also benefit from it.

svn-id: r25345
2007-02-03 05:50:35 +00:00
Max Horn
5395c4a2f4 Removed _actorPos locat vars, and instead use _pos directly
svn-id: r25344
2007-02-03 01:21:49 +00:00
Max Horn
e363d1ebb1 Broadened the fix for bug #795214 to make it work with resaves of old savegames, fixing bug #1648248
svn-id: r25340
2007-02-02 23:43:39 +00:00
Max Horn
468b1600c4 Removed bogus debug leftover :)
svn-id: r25338
2007-02-02 18:40:02 +00:00
Max Horn
013f1711c4 Workaround for bug #1621210 (FOA: Kerner counts incorrectly during end sequence)
svn-id: r25335
2007-02-02 13:53:59 +00:00
Max Horn
11a8d8f265 Some comment cleanup
svn-id: r25334
2007-02-02 12:51:44 +00:00
Gregory Montoir
bb3e575e21 don't test akosScaleYTable if actor has no vertical scale factor ; this is consistent with the code in costume.cpp and fixes bug #1329232.
svn-id: r25332
2007-02-01 23:27:16 +00:00
Travis Howell
836a4ea99e Add/Update details for French versions of Freddi Fish series.
svn-id: r25305
2007-01-31 10:41:35 +00:00
Travis Howell
f62728e0f8 Add/Update details for French versions of Spy Fox series.
svn-id: r25303
2007-01-31 07:43:02 +00:00
Gregory Montoir
6166c0ca19 reset _IACTpos when _IACTchannel is stopped (fixes memory overwrites in handleIACT during smush playback at the end of CMI demo)
svn-id: r25296
2007-01-31 00:16:21 +00:00
Gregory Montoir
9abaa064a0 got rid of codec37/codec47 init/deinit methods, cleanup
svn-id: r25295
2007-01-30 22:44:14 +00:00
Gregory Montoir
b4bebad6f0 minor simplification
svn-id: r25289
2007-01-30 20:43:39 +00:00
Gregory Montoir
cb258bee24 added deinitialisation of codecs at the end of smush playback. This allows to save a bit of memory (about 1Mb for CMI) during gameplay.
svn-id: r25287
2007-01-30 20:36:03 +00:00
Gregory Montoir
ccde018e85 unused buffer variable
svn-id: r25286
2007-01-30 20:31:48 +00:00
Gregory Montoir
c69ecb78e7 added calls to SmushPlayer::getFont() to prevent accessing non-initialised SmushFont objects
svn-id: r25285
2007-01-30 20:29:01 +00:00
Travis Howell
8c89b0f9d3 Update platforms for French versions of pajama and putttime.
svn-id: r25279
2007-01-30 12:14:36 +00:00
Travis Howell
cdf92208b6 Add French version of DOTT and Sam & Max. for Macintosh.
svn-id: r25277
2007-01-30 12:07:05 +00:00
Travis Howell
83c55bbd31 Add French version of Pajama Sam 1 for Macintosh.
svn-id: r25276
2007-01-30 12:05:35 +00:00
Travis Howell
162a887052 Add French version of Putt-Putt Travels Through Time for Macintosh.
svn-id: r25275
2007-01-30 11:59:39 +00:00
Max Horn
004b17446c cleanup
svn-id: r25266
2007-01-29 21:06:39 +00:00
Gregory Montoir
9b9117d0c6 Changed computation of _nextTop in v7/v8 games to represent an absolute y-coordinate (ie. not relative to _screenTop) in order to match the computation done for games <= v6. This should prevent any issues with vertical scrolling rooms.
svn-id: r25264
2007-01-29 20:39:18 +00:00
Max Horn
27432a4dc1 Moved some stuff from CharsetRenderer (back) to ScummEngine, added comments
svn-id: r25250
2007-01-28 20:11:31 +00:00
Max Horn
e287f181ed Partial fix for bug #1036707 (made by cyx): Get rid of _verbCharset, so that we use the correct font for verbs in COMI, with the correct spacing
svn-id: r25249
2007-01-28 18:47:10 +00:00
Gregory Montoir
3c8b67f3cf added missing MKID_BE macros
svn-id: r25224
2007-01-27 02:30:17 +00:00
Gregory Montoir
2b61c0d6c1 cleanup (made NutRenderer::loadFont protected, added call during initialisation of the renderer object)
svn-id: r25223
2007-01-27 02:26:37 +00:00
Torbjörn Andersson
aaa2973bac Applied my own patch #1640913 ("Loading NUT fonts on demand"), after discussing
it with Fingolfin.

svn-id: r25221
2007-01-27 01:50:41 +00:00
Gregory Montoir
10e45199c2 updated NutRenderer::drawShadowChar() comment
svn-id: r25210
2007-01-26 22:07:38 +00:00
Gregory Montoir
51fd5c8c4b templatified some Wiz decoding functions
svn-id: r25209
2007-01-26 22:03:41 +00:00
Max Horn
c32c50122a oops, no idea how that happened
svn-id: r25206
2007-01-26 20:42:35 +00:00
Max Horn
7165d42c70 Don't convert FSNode to a path when we don't have to
svn-id: r25203
2007-01-26 17:15:12 +00:00
Max Horn
78380da9e8 removed unused var, added comment to SO_CHARSET_COLOR case
svn-id: r25200
2007-01-26 13:08:22 +00:00
Travis Howell
cbd16b110f SO_CHARSET_COLOR is a no-op in the original COMI disasm.
svn-id: r25197
2007-01-26 09:26:20 +00:00
Gregory Montoir
35b6cfcd9c fixed kSfxFlagRestart
svn-id: r25196
2007-01-25 23:17:05 +00:00
Gregory Montoir
519af02245 modified CUP player code to read data directly from a file stream instead of a large memory buffer.
svn-id: r25195
2007-01-25 21:42:18 +00:00
Travis Howell
d8a33123a8 Add another Dutch version of SPY FOX 1 for Windows.
svn-id: r25182
2007-01-25 10:24:04 +00:00
Travis Howell
d3b4e89e80 Add Dutch version of Freddi Fish and Luther's Maze Madness for Mac.
svn-id: r25180
2007-01-25 09:54:47 +00:00
Max Horn
dc8dde1872 Patch from bug report #1615417: SCUMM (v6): Cursor isn't updated after hotspot changes
svn-id: r25162
2007-01-24 00:11:22 +00:00
Gregory Montoir
d2f15566d3 added handler for sfx sync (abc-slideshow.cup, bda-slideshow.cup) and sfx looping, cleanup
svn-id: r25158
2007-01-21 22:08:02 +00:00
Torbjörn Andersson
01a5faa6a0 Applied my own patch #1635584 (after discussing with Fingolfin) to reduce the
memory usage and number of allocations made by the NUT font renderer.

svn-id: r25155
2007-01-21 17:14:53 +00:00
Eugene Sandulenko
cd8a5f3a98 First phase of detection-related plugins interface improvements. Now plugins
return StringMap instead of fixed list of parameters. This adds great
flexibility.

Current patch should not alter any functionality, i.e. if there are regressions,
submit a report. Phase 2 will benefit from these changes and will come later.

svn-id: r25134
2007-01-20 21:27:57 +00:00
Torbjörn Andersson
37f94f7cba Hopefully fixed the SAN seeking (used by Full Throttle's bike fighting) that I
accidentally broke when removing the timer callback from the SMUSH player.

svn-id: r25120
2007-01-18 22:08:02 +00:00
Max Horn
2ac841f18b Make use of Surface::getBasePtr
svn-id: r25119
2007-01-18 21:48:23 +00:00
Travis Howell
f9d66e96d4 Update details of several French HE demos.
svn-id: r25108
2007-01-16 22:15:05 +00:00
Travis Howell
bc041f4b25 Add French versions of several HE game demos
svn-id: r25074
2007-01-13 23:23:45 +00:00
Travis Howell
4c964d58ba Add German version of SPY Fox 3.
svn-id: r25063
2007-01-10 22:20:53 +00:00
Travis Howell
5287a1c11d Add German version of Putt-Putt Joins the Circus.
svn-id: r25062
2007-01-10 22:14:13 +00:00
Gregory Montoir
8668200a64 added missing reference to tracker item, indentation
svn-id: r25054
2007-01-08 12:34:53 +00:00
Gregory Montoir
8863ad6279 added arrow keys mapping to match behavior of original interpreter (dialogue choices can still be selected using the mouse wheel)
svn-id: r25053
2007-01-08 12:32:26 +00:00
Gregory Montoir
216bcae211 possible fix for bug #1193185
svn-id: r25051
2007-01-07 23:18:18 +00:00
Max Horn
7f0156322f Updated POD explanation link
svn-id: r25040
2007-01-06 19:09:39 +00:00
Travis Howell
f6c87460de Remove excess space
svn-id: r25028
2007-01-06 12:16:08 +00:00
Travis Howell
4fa852b7ee Add another German version of Freddi Fish 3
svn-id: r25026
2007-01-06 12:10:20 +00:00
Gregory Montoir
cd79d127fa Since Actor::initActor is now virtual, it shouldn't be called directly from the base constructor (ActorC64::initActor won't get called as vtable hasn't yet been setup).
svn-id: r25015
2007-01-05 23:33:13 +00:00
Travis Howell
2cc2b09e82 Add filename prefix used by German version of Freddi Fish 3
svn-id: r25011
2007-01-05 22:48:06 +00:00
Gregory Montoir
2e5b25e15d added explicit call to parent method
svn-id: r24950
2006-12-29 23:50:54 +00:00
Eugene Sandulenko
4e52f4438f Fix bug #1595627: "SCUMM: F5 crashes game (640x480)". This partially
reverts commit r24656 for fixing bug #1590596 and effectively fixes both.

svn-id: r24933
2006-12-27 00:47:57 +00:00
Max Horn
ae4ea4d989 Introduced ActorOldWalk subclass of Actor (for V1-V3 walk code)
svn-id: r24924
2006-12-25 17:21:54 +00:00
Max Horn
ba991e3b3a SCUMM: Added ActorC64 subclass of Actor, and added a note stating that _miscflags isn't currently stored (possibly breaking C64 save states). Also reordered some HE specific code
svn-id: r24923
2006-12-25 15:37:20 +00:00
Max Horn
4ce7b74085 Changed ScummEngine::_actors from an Actor array to a an array of Actor points (i.e. indirection)
svn-id: r24922
2006-12-25 15:03:36 +00:00
Gregory Montoir
487391edef passing the room as an argument to putActor is optionnal here
svn-id: r24911
2006-12-21 15:18:26 +00:00
Gregory Montoir
cfd4ffb321 fixed bug #1620023 (script calls putActorAtXY with y == -1)
svn-id: r24910
2006-12-21 15:09:13 +00:00
Max Horn
cd46b0d57d Added a comment to ScummEngine_v5::saveVars (we need to implement it for IQ support in Indy3), and fixed a memory leak in o5_saveLoadGame
svn-id: r24892
2006-12-19 21:52:29 +00:00
Travis Howell
c680f79eef Add cyx's patch for horizontal and vertical flipping of wiz images type 1, in HE games.
svn-id: r24860
2006-12-17 10:17:13 +00:00
Travis Howell
eb86007b31 Add code for stopping video playback in HE100 games
svn-id: r24858
2006-12-15 23:54:42 +00:00
Gregory Montoir
10a9989a58 added basic handlers for SFXB and SNDE tags in .CUP player
svn-id: r24857
2006-12-15 23:48:38 +00:00
Travis Howell
d704d644e8 Disable saving game in original load/save screen of maniac/zak, since it doesn't function correctly
svn-id: r24836
2006-12-11 06:20:17 +00:00
Travis Howell
5424198c82 Allow load of saved game from original COMI load/save screens
svn-id: r24835
2006-12-11 06:12:12 +00:00
Travis Howell
d8cb3dc42d Use VAR_GAME_LOADED values from original COMI, when loading or saving temporary game
svn-id: r24834
2006-12-11 05:19:57 +00:00
Travis Howell
97e2c59dbb Fix error when exiting original options screen of COMI. BlastObjects are removed, right after checking for load/save game, in original COMI.
svn-id: r24833
2006-12-11 00:40:10 +00:00
Max Horn
8a32720213 Patch #1296058: Showing the original save/load dialog (see also RFE #832460)
svn-id: r24832
2006-12-10 14:28:37 +00:00
Gregory Montoir
08c261a5a6 made CUP_Player only update the modified screen areas.
svn-id: r24831
2006-12-10 00:44:40 +00:00
Travis Howell
d1eb83a470 Add findBox opcode for Hebrew version of Freddi Fish 1
svn-id: r24780
2006-11-24 09:27:50 +00:00
Travis Howell
7d3aa0b653 Add Hevrew version of Freddi Fish 1 for Windows
svn-id: r24763
2006-11-22 22:52:57 +00:00
Eugene Sandulenko
cfb29dcb51 Fix MSVC2005 warnings. Please, review the changes.
svn-id: r24760
2006-11-22 15:50:30 +00:00
Max Horn
e4c471b9d7 Fix for bug #1599113: SCUMM: Failed assertion in getBoxCoordinates()
svn-id: r24754
2006-11-20 20:40:27 +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
Max Horn
c210aff40c * Made Actor::_pos protected, added public Actor::getPos() method
* Added default params to Actor::putActor()
* Removed Actor::getActorXYPos

svn-id: r24742
2006-11-19 00:39:48 +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
Torbjörn Andersson
dfe8d777c1 Applied my own patch #1594924 to work around bug #1324106 ("MI2 VGA: Music as
Rapp is instantiating isn't synchronized"). I don't know if our timing is off,
or if it's just a case of overly optimistic scripting, but the pause / unpause
music instructions are issued in the wrong order.

svn-id: r24726
2006-11-16 17:08:31 +00:00
Max Horn
df2ccb78c2 cleanup
svn-id: r24711
2006-11-13 20:20:01 +00:00
Max Horn
12fb12caf5 Moved more SMUSH/Insane code from ScummEngine_v6 to ScummEngine_v7
svn-id: r24710
2006-11-13 20:12:52 +00:00
Max Horn
1a2853f7e0 Patch from bug #1584888 (SMUSH: Too dependent on accurate timers). Watch out for regressions in SMUSH movie playback / syncing
svn-id: r24709
2006-11-13 19:46:52 +00:00
Gregory Montoir
f89dad5daa byte -> bool
svn-id: r24695
2006-11-12 18:15:53 +00:00
Max Horn
8d37c135c0 Since we now generate warnings/messages for engine instantiation failures in a central place, get rid of such messages printed by engines
svn-id: r24686
2006-11-12 03:26:44 +00:00
Torbjörn Andersson
e61526555c More whitespace.
svn-id: r24682
2006-11-12 02:34:09 +00:00
Torbjörn Andersson
7e0d08f52a Replaced cryptic error() with an assertion.
svn-id: r24681
2006-11-12 02:27:20 +00:00
Torbjörn Andersson
c5fca7b9ce Whitespace
svn-id: r24680
2006-11-12 02:24:25 +00:00
Travis Howell
050c9e5bfb Fix valgrind warning on unitialized variable.
svn-id: r24676
2006-11-11 09:37:36 +00:00
Eugene Sandulenko
3be9c44dc4 Fix bug #1590596: "HE: When 3x graphics are choosen, F5 crashes game"
svn-id: r24656
2006-11-08 10:06:42 +00:00
Eugene Sandulenko
efd5e8bfb6 Fix bug #1592006: "IMUSE: Typo in sysex_scumm.cpp ?"
svn-id: r24655
2006-11-08 10:05:21 +00:00
Gregory Montoir
e1efdfc7f6 simplified SRLE decoding, cleanup
svn-id: r24653
2006-11-07 22:22:23 +00:00
Max Horn
c1e16d6168 Disabled an undocumented workaround for a supposed bug in FOA
svn-id: r24652
2006-11-07 21:14:15 +00:00
Max Horn
0cf2d2ffd9 cleanup
svn-id: r24650
2006-11-07 20:55:05 +00:00
Gregory Montoir
6c8af67b60 added SRLE handler, cleanup
svn-id: r24643
2006-11-06 23:28:40 +00:00
Johannes Schickel
68c603631b cleanup
svn-id: r24642
2006-11-06 22:06:32 +00:00
Eugene Sandulenko
90e20121b8 Portability fix for some platforms.
svn-id: r24641
2006-11-06 18:21:07 +00:00
Eugene Sandulenko
8ef5e88323 Add support for HE CUP demos based on cyx's standalone player.
svn-id: r24636
2006-11-06 13:40:24 +00:00
Travis Howell
bccec3c3e7 SO_ROOM_INTENSITY isn't used by SCUMM V1 - 4 games
svn-id: r24616
2006-11-05 00:22:46 +00:00
Max Horn
db1fc75012 SCUMM cleanup
svn-id: r24612
2006-11-04 22:59:56 +00:00
Torbjörn Andersson
e57316c796 Fixed bad namespace comments spotted by clone2727.
svn-id: r24588
2006-11-03 06:16:11 +00:00
Travis Howell
6b425f03f4 Add video code for HE100 games
svn-id: r24586
2006-11-02 10:01:32 +00:00
Travis Howell
a448ed320f Ooops, move code to correct function
svn-id: r24585
2006-11-01 23:42:21 +00:00
Travis Howell
c3f6c57680 Enable Bink video playback in HE100 games
svn-id: r24584
2006-11-01 23:39:55 +00:00
Max Horn
e7dc2c0d0c Workaround for bug #1586894
svn-id: r24582
2006-11-01 21:09:25 +00:00
Torbjörn Andersson
69fa6abb37 Removed unnecessary newline from warning message. (But why did I get this
message in the first place?)

svn-id: r24581
2006-11-01 17:46:00 +00:00
Travis Howell
79b9397f3e HACK no longer required for MM demo mode
svn-id: r24576
2006-10-30 02:50:09 +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
32f891f724 SCUMM: Avoid crash in debugger when omitting the state value in 'object state VALUE'
svn-id: r24572
2006-10-29 18:43:16 +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
Max Horn
46dc61163a Named / documented the V0-V2 object states (we should probably rename the corresponding opcodes here and in descumm to make reading script dumps easier)
svn-id: r24566
2006-10-29 14:45:31 +00:00
Max Horn
41b4a34b5b cleanup
svn-id: r24565
2006-10-29 13:30:20 +00:00
Max Horn
10478617c6 SCUMM: Take advantage of the fact that Chunk now is a ReadStream subclass
svn-id: r24546
2006-10-28 01:28:41 +00:00
Max Horn
a3bc66bcbd SCUMM: Fix what I believe is a long-standing bug in FileChunk::reseek()
svn-id: r24545
2006-10-28 01:21:13 +00:00
Max Horn
9698d133a6 SCUMM: Changed class Chunk (and subclasses) to inherit from Common::SeekableReadStream
svn-id: r24544
2006-10-28 01:20:19 +00:00
Max Horn
3652229147 SCUMM: Got rid of smush/chunk_type.h
svn-id: r24543
2006-10-28 00:45:58 +00:00
Max Horn
48e5ec67ff SCUMM: Further SMUSH audio channel cleanup; this time unified some code, and got rid of one set of memory buffers
svn-id: r24542
2006-10-28 00:18:13 +00:00
Max Horn
d90762c430 SCUMM: Changed SaudChannel to return 8bit mono data (the mixer will do any necessary conversions for us, no need to waste memory like this); fix SmushMixer to not allocate buffers twice as big as necessary
svn-id: r24541
2006-10-28 00:04:50 +00:00
Max Horn
a6fee09adf const and static, static and const, const and static, static and const... now everybody repeat it with me... 8-)
svn-id: r24540
2006-10-27 23:00:28 +00:00
Max Horn
2a314fa8a7 Oops, forgot to check in engines/scumm/module.mk
svn-id: r24539
2006-10-27 22:58:48 +00:00
Max Horn
2b2be1a18d SCUMM: Unified some more SMUSH audio channel code
svn-id: r24538
2006-10-27 22:49:31 +00:00
Max Horn
ec653efc8b SCUMM: Unified some SMUSH audio channel code
svn-id: r24536
2006-10-27 22:26:33 +00:00
Travis Howell
304c102613 Switch error to warning, since code is compatbile with football2002 too
svn-id: r24516
2006-10-25 23:48:47 +00:00
Max Horn
9760469373 cleanup
svn-id: r24514
2006-10-25 23:12:34 +00:00
Bertrand Augereau
018c2c6949 #ifndef DISABLE_SCUMM_7_8 missing
svn-id: r24509
2006-10-25 20:12:52 +00:00
Bertrand Augereau
4047798196 Missing include file (for ScummEngine_v6 symbol)
svn-id: r24508
2006-10-25 20:07:32 +00:00
Travis Howell
8b0f34e193 Add Macintosh version of Backyard Football 2002
svn-id: r24490
2006-10-25 01:53:07 +00:00
Max Horn
7889783cac const correctness
svn-id: r24488
2006-10-24 09:44:20 +00:00
Travis Howell
56d44a5be2 Add back football2002 target
svn-id: r24478
2006-10-24 00:09:15 +00:00
Max Horn
07f7761479 Backend modularization: Create timer manager, savefile manager and audio mixer in the backends for increased flexibility
svn-id: r24443
2006-10-22 15:42:29 +00:00
Max Horn
9edf1e6a1a cleanup
svn-id: r24407
2006-10-21 12:44:10 +00:00
Max Horn
5e9041b1b5 SCUMM: ArrayHeader related cleanup
svn-id: r24395
2006-10-20 19:44:27 +00:00
Max Horn
a0b9f78bd3 SCUMM: Introduced V12_X_MULTIPLIER and V12_Y_MULTIPLIER to make it a bit easier to find spots where we convert between C64-style coordinates and pixel coordinates (but beware, this probably doesnt't cover all relevant instances)
svn-id: r24384
2006-10-19 00:26:55 +00:00
Max Horn
5148dbb3fb cleanup
svn-id: r24383
2006-10-19 00:06:59 +00:00
Max Horn
169bc3880d cleanup
svn-id: r24373
2006-10-18 15:55:10 +00:00
Max Horn
865e7b7c02 cleanup
svn-id: r24372
2006-10-18 15:09:11 +00:00
Max Horn
3467a6f19b SCUMM: Got rid of BompHeader
svn-id: r24371
2006-10-18 15:08:43 +00:00
Max Horn
74c5d457e4 SCUMM: Be less generous to code invoking checkXYInBoxBounds with a bad box param: we now abort instead of ignoring it silently. May cause some trivial-to-fix regressions
svn-id: r24369
2006-10-18 14:30:29 +00:00
Max Horn
5e46a45aa5 SCUMM: Moved getDistanceBetween to clas ScummEngine_v6; grouped inventory related stuff in object.cpp
svn-id: r24368
2006-10-18 14:21:44 +00:00
Max Horn
92adf6a65c SCUMM: reordered contents of actor.cpp, grouping methods in a hopefully somewhat more logical fashion
svn-id: r24367
2006-10-18 14:01:28 +00:00
Max Horn
f51e01a0aa SCUMM: Yet another minox walkbox cleanup
svn-id: r24366
2006-10-18 14:01:06 +00:00
Max Horn
dd7e4ff3e7 SCUMM: walbox related cleanup
svn-id: r24365
2006-10-18 13:33:42 +00:00
Max Horn
b5cbbd705a Added some more const keywords
svn-id: r24330
2006-10-15 02:15:38 +00:00
Max Horn
27b73e4960 Turned some more static vars into static const
svn-id: r24329
2006-10-15 02:00:48 +00:00
Max Horn
a9b0a055c8 Moved get_resource_id_quoted around a bit and added another FIXME comment
svn-id: r24328
2006-10-15 02:00:37 +00:00
Max Horn
548cb2fbad Added FIXME comment about 'static' abuse in imuse_part.cpp
svn-id: r24327
2006-10-15 01:51:02 +00:00
Max Horn
65e923480e oops
svn-id: r24326
2006-10-15 01:44:58 +00:00
Max Horn
ad3723ac43 Replaced Chunk::ChunkString by tag2str
svn-id: r24325
2006-10-15 01:27:38 +00:00
Max Horn
1ee9304012 Replaced function level static variable (YUCK) called 'sentence' by ScummEngine_v2:_sentenceBuf
svn-id: r24324
2006-10-15 01:26:23 +00:00
Max Horn
2888110b3c Turning various static tables into static const
svn-id: r24323
2006-10-15 01:24:17 +00:00
Max Horn
84874caf06 Got rid of ScummEngine::_confirmExit, and some other minor cleanup
svn-id: r24319
2006-10-15 00:50:22 +00:00
Torbjörn Andersson
b4fcc3b17a Update the screen immediately after restoring the cursor on running a dialog.
This is a bit of a hack, but makes it less likely that the player will see a
brief cursor palette glitch when the GUI is disabled.

svn-id: r24314
2006-10-14 14:16:16 +00:00
Torbjörn Andersson
2c011da3c1 Fixed bug #1573366 ("SMUSH: unpausing the game causes cursor to show").
svn-id: r24310
2006-10-14 13:11:22 +00:00
Eugene Sandulenko
93600ae194 Reenable INSANE warning. No check is required.
svn-id: r24309
2006-10-14 12:31:08 +00:00
Eugene Sandulenko
0385a4d2bb Fix potentioal bug when all subsequent SMUSH scenes were considered INSANE
svn-id: r24292
2006-10-13 09:16:09 +00:00
Eugene Sandulenko
a77a955169 Oops. rv last commit.
svn-id: r24291
2006-10-13 09:14:43 +00:00
Eugene Sandulenko
053bbaf9bb Reenable incorrectly compressed files warning
svn-id: r24290
2006-10-13 08:51:26 +00:00
Paweł Kołodziejski
e85ab4b10f now SmushPlayer is class created once same as SmushMixer while scumm engine creation. this allow finish play smush audio track finished to the end instead immediately stopped as it was happen before
svn-id: r24263
2006-10-10 12:16:21 +00:00
Paweł Kołodziejski
430317dc92 removed not needed anymore time measures in smush code
svn-id: r24226
2006-10-08 19:39:46 +00:00
Paweł Kołodziejski
f73861c943 re-add missing break; removed by mistake
svn-id: r24225
2006-10-08 19:35:13 +00:00
Paweł Kołodziejski
4e22b8262a remove handleSkip code, SKIP chunk is only used by INSANE code and exist only in 4 SAN files: minedriv, toranch, tovista1, tovista2
svn-id: r24221
2006-10-08 19:23:08 +00:00
Paweł Kołodziejski
ce100c8e93 small unify handleIACT function
svn-id: r24214
2006-10-08 18:22:51 +00:00
Kostas Nakos
4524b49872 Initial commit of the wince-gcc re-port
svn-id: r24212
2006-10-08 18:15:18 +00:00
Torbjörn Andersson
f09123a1b4 Fixed compilation.
svn-id: r24177
2006-10-07 19:15:19 +00:00
Max Horn
9cba143699 Removed _lastKeyHit, instead pass the key code as a parameter to processKeyboard()
svn-id: r24176
2006-10-07 17:49:05 +00:00
Max Horn
ff6731e00a Removed 'smushMode' param from processInput and processKeyboard in favor of a new member _smushActive of ScummEngine_v7
svn-id: r24175
2006-10-07 17:42:32 +00:00
Max Horn
71bea97de7 Clarified comment
svn-id: r24174
2006-10-07 15:46:38 +00:00
Max Horn
e31ae8edc7 Moved calls to addDefaultDirectory, and creation of the master file handle, from the ScummEngine constructor to ScummEngine::init() (this makes it easier to implement more graceful error handling, for example)
svn-id: r24173
2006-10-07 15:37:03 +00:00
Max Horn
4973c657b8 Moved all INSANE and SMUSH related code into ScummEngine_v7 (resp. ScummEngine_v6 in a few cases)
svn-id: r24169
2006-10-07 13:57:06 +00:00
Max Horn
5f0874ef63 Some more processKeyboard splitting
svn-id: r24167
2006-10-07 13:31:27 +00:00
Max Horn
f3e410a2ac Further split processKeyboard code, moving stuff specific to some SCUMM version into the resp. subclass of ScummEngine
svn-id: r24166
2006-10-07 13:11:51 +00:00
Max Horn
c3fb1fbcd4 Moved SCUMM keyboard handling code from processInput() to the new (sub)method processKeyboard
svn-id: r24165
2006-10-07 12:33:22 +00:00
Max Horn
f13e4baaf9 Renemaed ScummEngine::processKbd to processInput (as it also deals with the mouse)
svn-id: r24164
2006-10-07 12:19:28 +00:00
Max Horn
ef30cdf78b some HE related cleanup
svn-id: r24163
2006-10-07 11:54:50 +00:00
Max Horn
98f62b9e65 WORKAROUND bug #859513 (ZAK: "Oxygene-bug" on Mars)
svn-id: r24116
2006-10-04 20:22:47 +00:00
Max Horn
f7eee205bb o2_animateActor is essentially identical to o5_animateActor -- removed in favor of the latter
svn-id: r24115
2006-10-04 20:22:14 +00:00
Max Horn
54790cc217 typo
svn-id: r24114
2006-10-04 20:20:50 +00:00
Torbjörn Andersson
863bed3fd0 Change masking condition for codec1_genericDecode(), proc3() and proc3_ami() so
that X coordinates outside the designated area are explicitly masked. While the
functions are written to terminate when X moves outside, bug #1508942 ("FOA:
Glitch dring balloon flight") demonstrates that X may *start* outside. That's
the case we want to mask.

Note that proc3_ami() already masked these pixels (in a different way), so
there the change is purely cosmetical.

svn-id: r24104
2006-10-04 05:11:58 +00:00
Travis Howell
09f9cf7b64 Add Dutch versions of freddi4 and freddicove for Macintosh
svn-id: r24095
2006-10-03 12:15:01 +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
Travis Howell
03b3d596b6 Add French versions of puttzoo, spyfox, spyfox2 and spyozon
svn-id: r23983
2006-09-23 23:46:06 +00:00
Max Horn
d02e4d7f7c Removed CHECK_HEAP
svn-id: r23979
2006-09-23 11:29:32 +00:00
Max Horn
4c14cf6d1a Moved base/engine.cpp and .h to engines/ (main motivation: helps untangle the linker dependency graph). Porters will have to update project files
svn-id: r23974
2006-09-23 00:42:35 +00:00
Eugene Sandulenko
0e244c9510 Fix bug #1550974: "SMUSH: changing subtitle settings during SMUSH doesn't work"
svn-id: r23965
2006-09-21 17:46:19 +00:00
Eugene Sandulenko
6fdc053a6b Fix comment
svn-id: r23964
2006-09-21 12:18:36 +00:00
Eugene Sandulenko
25a6af2c93 Fix bug #1536932: "MANIACNES: Crash on click in speechtext-area"
svn-id: r23962
2006-09-21 12:14:29 +00:00
Travis Howell
efc3fb4a3a Correct HE version for Dutch version of putttime
svn-id: r23956
2006-09-21 00:43:21 +00:00
Travis Howell
f3ad70c1d4 Add French version of Pajama Sam 1
svn-id: r23952
2006-09-20 23:34:10 +00:00