ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
172 Commits
Author SHA1 Message Date
Robert Crossfield b1bce3ec37 SCUMM: MM V0: Fix regression from 038b3b1789 and comment/cleanup 2018-03-12 11:36:04 +01:00
Colin Snover 2e061d95c5 COMMON: Move VER macro for serializer into common code 2018-01-31 17:58:01 +01:00
Colin Snover 9916b26383 SCUMM: Replace UB-triggering serialization code with Common::Serializer 
Fixes Trac#10342.
 2018-01-31 17:58:01 +01:00
Colin Snover 9d10a998ae SCUMM: Fix stack overflow initializing locals 
This happens when clicking on the triangular button in room 27 in
The Dig.

There are probably several other places where this overflow
happens, since there are several different `int args[16]` in
the code (and many more `int args[` of various sizes, not all of
which are at least NUM_SCRIPT_LOCAL).
 2018-01-31 17:56:33 +01:00
Colin Snover b166746b9c SCUMM: Fix stack overflow initializing locals 
This happens at least when trying to right click on the motorcycle
at the start of Full Throttle.
 2018-01-31 17:56:33 +01:00
Colin Snover 57084b4a1b SCUMM: Fix UB shifting negative integers in Actor 2017-12-01 19:22:35 -06:00
Torbjörn Andersson b4c1e86d9f JANITORIAL: Silence GCC warning 
Since case 64 was added for "MM C64 Costume Animation", and
considering the way it's written to only affect game version 0,
it is clearly an intentional fall through.
 2017-08-06 11:51:57 +02:00
Robert Crossfield 038b3b1789 SCUMM: MM V0: Fix actors skipping between certain walk-boxes 2017-02-21 06:17:32 +11:00
Robert Crossfield 02ac724c66 SCUMM: MM V0: Fix an issue with Sandy appearing to slide across a walkbox 2017-02-15 17:05:28 +11:00
Robert Crossfield 485f26e4d6 SCUMM: Fix bug #4515 (Dr. Fred facing wrong way in lab cutscene) 2016-12-27 10:21:09 +11:00
Eugene Sandulenko dead4aa014 JANITORIAL: Remove trailing spaces 2016-10-09 14:59:58 +02:00
Robert Crossfield 67071b42bc SCUMM: Maniac V0: Implement 'simulator' for CPU lag (as the original engine occasionally ran at less than 60Hz). Fix call to 'getClosestPtOnBox', whcih was being passed X * V12_X_MULTIPLIER and Y * V12_Y_MULTIPLIER, but the box coordinates, where not 2016-07-19 20:39:58 +10:00
Robert Crossfield 44000ba826 SCUMM: Maniac V0: Implement original walkbox queue, Cleanup actor walk code 2016-07-19 18:54:14 +10:00
Kirben bba1af422f SCUMM: Fix bug #3230 PAJAMA SAM 2: Background gfx glitch in intro. 2016-05-24 20:19:18 +10:00
Alexandre Detiste 6c298e964f JANITORIAL: Typos detected with lintian & grep 2016-02-15 18:27:02 +01:00
Kirben 0a6904c4ab SCUMM: Correct variable type in Actor_v0::adjustPosInBorderWalkbox, since variable can have negative value. 2014-12-08 23:31:59 +11:00
Kirben 801bfedfc0 Merge pull request #542 from segrax/V1-V2_WalkAnimFix 
SCUMM V1-V2: Fix actor walk behavior (transitions between walk boxes, and changing destination issue)
 2014-12-08 19:29:29 +11:00
Robert Crossfield d92e47f4e6 SCUMM V1-V2: Fix actor walk behavior (transitions between walk boxes, and changing destination issue) 2014-12-08 13:14:12 +11:00
Robert Crossfield d83438225e SCUMM: Maniac V0: Add support for D64 Demo Disk, Cleanup duplicate 'Talk' array 2014-12-08 10:14:37 +11:00
Kirben c9e6db6571 SCUMM: Correct spacing and warning in last Maniac V0 merge. 2014-12-07 15:24:21 +11:00
Robert Crossfield 814d9b1153 SCUMM: Maniac V0: Correctly handle 'slanted' walk-boxes, Add new variables to save-games, Bump the SaveGame Version number, remove obsolete V0 code in V2 functions 2014-12-02 16:25:03 +11:00
Robert Crossfield 29d46e8a10 SCUMM: Maniac V0: If boxes are neighbors, walk directly to the new box. Remove extra call to 'animateCostume'. Remove now unnecessary V0 walk calc functions 2014-11-29 09:07:10 +11:00
Robert Crossfield 2dbd99d572 SCUMM: Maniac V0: Implement the original Walk Code (to fix some anim glitches), fix opcode to use _moving correctly (as V0 is different) 2014-11-28 22:24:45 +11:00
Johannes Schickel 3847465163 SCUMM: Make GPL headers consistent in themselves. 2014-02-18 02:39:38 +01:00
Torbjörn Andersson e81d8d8112 SCUMM: Remove unnecessary NULL check, CID 1003629 
Since _actors[i]->_sound is an array, it can't ever be NULL.
 2013-08-18 09:07:49 +02:00
Matthew Hoops 0031c41db8 COMMON: Change kPlatformPC to kPlatformDOS 
"PC" was very ambiguous and now it matches what we show in the GUI.

This also corrects sword2's platform to Windows.
 2013-05-02 18:43:10 -04:00
Johannes Schickel 89abab97e3 JANITORIAL: Remove trailing whitespaces. 
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
 2012-09-26 04:17:55 +02:00
Tarek Soliman a4798602d7 JANITORIAL: Fix missing whitespace in pointer cast 
find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g'

This seems to have caught some params as well which is not undesirable IMO.
It also caught some strings containing this which is undesirable so I
excluded them manually. (engines/sci/engine/kernel_tables.h)
 2012-02-15 10:07:10 -06:00
Willem Jan Palenstijn 784472a669 Revert "SCUMM: revert savegame version to 89" 
This reverts commit 65fc7225bb.

Increasing the savegame version on a branch and then decreasing it again
leads to problems with loading current savegames in old commits during
a bisect.
 2012-02-11 10:55:55 +01:00
Tobias Gunkel 65fc7225bb SCUMM: revert savegame version to 89 
Previous versions 89-92 are merged into version 89.
 2012-02-11 08:36:38 +01:00
Tobias Gunkel 0d5b03d8da SCUMM: remove unnecessary cast to Actor_v0 2012-02-11 08:36:37 +01:00
Tobias Gunkel 67d67ec4f6 SCUMM: replaced A with a0 to avoid upper-case local vars 2012-02-11 08:36:35 +01:00
Tobias Gunkel 4922055063 SCUMM: cleanup and separation of objIsActor()/objToActor()/actorToObj() for v0 and other engines 2012-02-11 08:36:27 +01:00
Tobias Gunkel 0aabf95cb8 SCUMM: match style-guide, add missing spaces between some "if ()", "for ()" 2012-02-11 08:30:15 +01:00
Tobias Gunkel ef56bd6de2 SCUMM: add support for diagonal walking between boxes (e.g. used for meteor opening scene) 2012-02-11 08:30:14 +01:00
Robert Crossfield 6c40b3f36f SCUMM: Remove old code 2012-02-11 08:30:12 +01:00
Robert Crossfield 163f698cf0 SCUMM: Few changes for animations, dont move while turning & not necessary to call animateactor during startanimactor 2012-02-11 08:30:10 +01:00
Tobias Gunkel 9dd6105ce6 SCUMM: replace "c64" with "v0" when it applies to both C64 and AppleII v0 versions 
In addition some routines (e.g. the gfx ones) that are even used in v1.
 2012-02-11 08:30:08 +01:00
Tobias Gunkel 8d3b272939 SCUMM: save complete v0 state and initialize actors correctly 2012-02-11 08:30:07 +01:00
Tobias Gunkel 5d3e1dd0dc SCUMM: remove the temporary variable _limb_current 2012-02-11 08:30:05 +01:00
Tobias Gunkel e14e4ab3b0 SCUMM: adjust to coding style-guide 2012-02-11 08:30:02 +01:00
Robert Crossfield 92908bfc4b SCUMM: Fix ActorStop, V0 needs to set the stop direction 2012-02-11 08:29:57 +01:00
Tobias Gunkel f5faa4554d SCUMM: isPlayer() is not supported by engine v0 2012-02-11 08:29:49 +01:00
Tobias Gunkel cc68a59856 SCUMM: fix diagonal walking in at least MM v0 
The comparison "ABS((int)(deltaXFactor >> 16)) > _speedx)" does not work as "deltaXFactor >> 16" will clear the fractional part of deltaXFactor. As a result the deltaXFactor might be bigger than (_speedx<<16) and the actor moves faster than he should.
 2012-02-11 08:29:46 +01:00
Robert Crossfield 9ba01d020b SCUMM: Fix V0 Sound, and a direction issue (affected walking down the ladder) 2012-02-11 08:29:40 +01:00
Robert Crossfield fb3e431ec6 SCUMM: V0 always turns actor towards camera when entering room, remove unnecessary loadcostume 2012-02-11 08:29:37 +01:00
Robert Crossfield 5accf01881 SCUMM: Remove unnecessary calls to animateActor 2012-02-11 08:29:35 +01:00
Robert Crossfield 1e8d0664ac SCUMM: Fix Tentacle issue, and possibly some other animation issues 2012-02-11 08:29:32 +01:00
Tobias Gunkel ddd65dfc22 SCUMM: fix actor climbing on plant or swimming pool ladder 
Before, the actor will descend the ladder of the pool and maybe even into the the pool. Another issue fixed by this is the actor climbing onto the plant pot if you give something to it.
 2012-02-11 08:29:30 +01:00
Tobias Gunkel f99dab78e4 SCUMM: fix for old savegames 2012-02-11 08:29:29 +01:00