Commit Graph
3264 Commits
Author SHA1 Message Date
Max Horn a1dd7a07a1 ENGINES: Remove some 'using' statements
svn-id: r54001
2010-11-01 16:00:17 +00:00
Johannes Schickel 447ca7ea69 SCUMM: Switch to the new SaveStateDescriptor::setPlayTime.
svn-id: r53923
2010-10-29 16:41:49 +00:00
Johannes Schickel dac9493069 ENGINE: Rename resetTotalPlayTime to setTotalPlayTime.
I also extended the comment for it to show two possible use cases.

svn-id: r53895
2010-10-27 22:52:02 +00:00
Johannes Schickel 2ad28b8cd5 ENGINE: Generalize SCUMM play time counting and move it into Engine.
This implements Max's idea on -devel
("Re: [Scummvm-devel] ATTN Engine authors: Advanced engine features") from
27.10.2010 on 11:12PM CEST.

Unlike the SCUMM implementation it stores the play time as ms instead of s.

The SCUMM engine was adapted to use this instead to reduce code duplication.

svn-id: r53892
2010-10-27 22:37:51 +00:00
Travis Howell 2f254a3531 SCUMM: Add alternative version of patch #3094717 - MMC64: save actor state.
svn-id: r53842
2010-10-26 04:20:20 +00:00
Max Horn 075919756f SCUMM: Move shared code of Player_V2 & Player_V2CMS to new common base class
svn-id: r53830
2010-10-25 16:42:24 +00:00
Max Horn d2a7a840c7 SCUMM: Move class Player_V2CMS to its own header file
svn-id: r53829
2010-10-25 16:41:39 +00:00
Travis Howell 57b571ecd0 SCUMM: Add patch #3094711 - MMC64: Correct position of plant actor.
svn-id: r53814
2010-10-25 10:35:52 +00:00
Travis Howell f158688c33 SCUMM: Add patch #3089936 - MMC64: Parcel/Tombstone/Verb Fix.
svn-id: r53807
2010-10-25 08:26:21 +00:00
Travis Howell 4f0cc6a435 SCUMM: Add patch #3093541 - MMC64: Actor Walk / Object Fix.
svn-id: r53806
2010-10-25 08:03:55 +00:00
Travis Howell f228c76b35 SCUMM: Add patch #3093061 - MMC64: sentence highlighting.
svn-id: r53805
2010-10-25 07:53:02 +00:00
Travis Howell 5942382ad4 SCUMM: Add patch #3093051 - MMC64: Ladder facing patch.
svn-id: r53799
2010-10-25 07:07:23 +00:00
Travis Howell 8e10c5bc3b SCUMM: Add patch #3093048 - MMC64: German actor names.
svn-id: r53796
2010-10-25 05:26:16 +00:00
Travis Howell b2e8daa2d7 SCUMM: Add patch #3093057 - MMC64: sentence/inventory color.
svn-id: r53785
2010-10-25 03:21:49 +00:00
Max Horn b446a7dcc2 ALL: code formatting fixes
svn-id: r53764
2010-10-24 13:09:56 +00:00
Max Horn 5fbca853aa SCUMM: Turn global g_cmsEmu into a member var of Player_V2CMS
svn-id: r53763
2010-10-24 13:05:03 +00:00
Max Horn c975ed11a1 ALL: Fix various typos (patch #3093266)
svn-id: r53762
2010-10-24 13:04:33 +00:00
Max Horn 0d54400806 SCUMM: Skip endian conversion on little endian systems (instead of assigning values back to themselves)
svn-id: r53739
2010-10-23 15:47:23 +00:00
Max Horn 3534cff8ef ALL: Fix indention (whitespaces -> tabs)
svn-id: r53738
2010-10-23 15:46:50 +00:00
Travis Howell 3f4655c03f SCUMM: Disable multiplayer option in Backyard Baseball 2001.
svn-id: r53731
2010-10-23 13:39:04 +00:00
Travis Howell 402fac9ed4 SCUMM: Add workaround to allow saved games to be shared between Macintosh and Windows versions of Backyard Baseball 2001.
svn-id: r53729
2010-10-23 06:27:16 +00:00
Travis Howell afd677c2c7 SCUMM: Fix buffer overflow, that was causing crashes when saving in Backyard Baseball 2001/2003.
svn-id: r53726
2010-10-23 02:18:08 +00:00
Florian Kagerer a82b0435a2 SCUMM/FM-TOWNS JAPANESE: fix font drawing in MI1 intro
svn-id: r53725
2010-10-23 00:30:21 +00:00
Florian Kagerer 031e0167e4 SCUMM/FM-TOWNS JAPANESE: fix another font spacing issue
(fixes MI1 character talk text)

svn-id: r53704
2010-10-22 19:28:12 +00:00
Max Horn 89fc06d878 SCUMM: Remove redundant call to checkArrayLimits
svn-id: r53672
2010-10-21 09:32:00 +00:00
Max Horn 66fabfa049 SCUMM: Document ScummEngine_v90he::sortArray
svn-id: r53671
2010-10-21 09:31:42 +00:00
Travis Howell cca5504b6c SCUMM: Fix bug #2984000 - SPYFOX3 (French): Crash when using fingernail machine.
svn-id: r53669
2010-10-21 08:51:10 +00:00
Travis Howell e5c3b67ddb SCUMM: Correct a copy and paste error in compareByteArray/compareByteArrayReverse code.
Thanks to clone2727 for noticng this error.

svn-id: r53663
2010-10-21 05:17:16 +00:00
Travis Howell 01ea6f86bd SCUMM: Revert revision 45302, which caused regressions when random team is selected in Backyard Football.
svn-id: r53662
2010-10-21 05:13:32 +00:00
Florian Kagerer 64c0d2a1d1 SCUMM/FM-TOWNS: minor graphics fix
This fixes a graphics glitch that occured when leaving the Scumm Bar in MI1 for the first time (before the cut scene with LeChuck).

svn-id: r53645
2010-10-20 15:39:08 +00:00
Matthew Hoops 21a29d3b45 SCUMM: Have o6_getRandomNumber() use the absolute value of the argument
The Backyard Baseball series calls the function with negative numbers, but expects a positive result. The games are now actually playable.

Thanks to Kirben for assistance in tracking this bug down.

svn-id: r53630
2010-10-20 03:01:03 +00:00
Florian Kagerer f6a43d980a SCUMM/FM-TOWNS JAPANESE: minor fix in last commit
svn-id: r53617
2010-10-19 17:03:36 +00:00
Florian Kagerer 1d87f434a2 SCUMM/FM-TOWNS JAPANESE: implement flipped text
(used in the MI1 circus scene after Guybrush gets shot out of the cannon)

svn-id: r53616
2010-10-19 16:58:27 +00:00
Florian Kagerer f05110f3f6 SCUMM/FM-TOWNS JAPANESE: fix font spacing issues
(improves MI1 intro)

svn-id: r53597
2010-10-18 23:54:35 +00:00
Max Horn ceae152531 SCUMM: Silence MSVC 2010 code analysis warning
svn-id: r53582
2010-10-18 19:29:56 +00:00
Eugene Sandulenko dd7a2f75c0 SCUMM: INSANE: fix a long standing bug discovered by static code analysis
svn-id: r53581
2010-10-18 19:19:28 +00:00
Max Horn 277113f600 SCUMM: Fix out of bound access (discovered by Code Analysis in MS VS2010; thanks to aquadran for helping verify the fix)
svn-id: r53575
2010-10-18 19:03:24 +00:00
Max Horn cda2c950d6 SCUMM: Simplify SO_LOAD_STRING code
svn-id: r53574
2010-10-18 18:56:40 +00:00
Max Horn 32f1a9ad8b SCUMM: Add paranoia check
svn-id: r53573
2010-10-18 18:56:20 +00:00
Max Horn 6175c2bb19 SCUMM: Fix potential bug in ScummEngine::resStrLen.
In particular, it might happen that ScummEngine::resStrLen is called
while the _scriptPointer is stale. In that case, it would be working
with the stale pointer. If the code calling it then uses fetchScript*()
methods to read the string whose length was just computed, then it would
read potentially *different* data (e.g. copyScriptString or
loadPtrToResource could have been affected).

I am not sure if this actually could have caused bugs somewhere; it might
even be provable that a script relocation cannot happen in all places
that invoke resStrLen. But for now it's much easier to make the code
safe than to verify that theory ;).

Also simplified some related code.

svn-id: r53572
2010-10-18 18:55:24 +00:00
Max Horn d69a63c145 SCUMM: Move common code from ScummEngine::fetchScript* to new method.
The new method is called refreshScriptPointer(). Also renamed
getScriptEntryPoint() to resetScriptPointer() in an attempt to highlight
both the similarity and difference between the two.

svn-id: r53571
2010-10-18 18:43:13 +00:00
Max Horn 3b21db1618 SCUMM: Fix parts of bug #3087898 (SCUMM: Code analysis warnings)
svn-id: r53567
2010-10-18 16:00:07 +00:00
Travis Howell ada933c2ad SCUMM: Check the sound channel is valid, before checking the sound channel.
svn-id: r53562
2010-10-18 04:25:53 +00:00
Travis Howell 34ff826918 SCUMM: Check the sound channel is valid, before checking the sound channel.
svn-id: r53561
2010-10-18 04:23:30 +00:00
Travis Howell f40e427ab0 SCUMM: Correct incorrect demo entry for Backyard Football 2002.
svn-id: r53560
2010-10-18 00:43:49 +00:00
Florian Kagerer 1d60fc45f2 SCUMM/FM-TOWNS: more improvements to japanese font drawing
(MI1 intro is still not right)

svn-id: r53558
2010-10-17 23:52:33 +00:00
Travis Howell 3dc498c5ec SCUMM: Fix Macintosh demo of Putt-Putt Joins the Parade.
svn-id: r53557
2010-10-17 23:45:57 +00:00
Florian Kagerer c841c3fb7c SCUMM/FM-TOWNS: more improvements to japanese font drawing
- made use of LordHotos graphics/sjis code to reduce code duplication
- japanese mode for version 3 and 5 works fine now with few exceptions (some line spacing glitches in MI1 intro etc.)

svn-id: r53554
2010-10-17 13:08:00 +00:00
Travis Howell 728a231d7b SCUMM: Fix bug #2952298 - HE (16Bit): Inventory items (Cursors) have wrong color.
svn-id: r53552
2010-10-17 12:44:56 +00:00
Florian Kagerer 63c30e959f SCUMM/FM-TOWNS: fix regression in non Japanese SCUMM 3 games
svn-id: r53523
2010-10-15 23:28:09 +00:00