Commit Graph

145 Commits

Author SHA1 Message Date
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
Robert Crossfield
cf292001d3 SCUMM: Animations fix again, no need for the hack now 2012-02-11 08:29:27 +01:00
Robert Crossfield
5b4b606a58 SCUMM: Remove the setCmdFromDirection function 2012-02-11 08:29:26 +01:00
Robert Crossfield
08e3866395 SCUMM: Animation Fixes 2012-02-11 08:29:24 +01:00
Robert Crossfield
65fb1f9a09 SCUMM: Fix the animation system, rename the Limb Frame Repeat variable 2012-02-11 08:29:22 +01:00
Tobias Gunkel
fd4a3501ed SCUMM: fix saving of array _byte_FCE2 2012-02-11 08:29:11 +01:00
Tobias Gunkel
f22bbc47b4 SCUMM: fix v0 mode handling and actor switching
- handle mode switching correctly
  - do not freeze scripts in cutscene mode (mode 0), as some scripts are freezed in mode 0 that should not be freezed
  - kModeNoNewKid (mode 2) needs the same userState as mode 3
- rename o_cursorCommand to o_setMode as it is not really cursor specific
- handle actorHiding correctly (do not set costume to 0 as the previous costume cannot be reverted after hiding)
- add drawSentence
- document meanings for actor misc flags
- fix actor names for "new kid" if the radiation suit is used (all kids are set to 0 then with actor 0 name " ")
- cleanup actor switching routine
- _userPut is not used anymore in v0
2012-02-11 08:29:05 +01:00
segrax
a999aa39ba SCUMM: Re-arrange some things to make it closer to the original 2012-02-11 08:29:02 +01:00
segrax
e331421eae SCUMM: Save the new variables, move the setting of the unknown variable to after the setDirection call 2012-02-11 08:29:00 +01:00
segrax
e2d45467bb SCUMM: improve unknown variable support, add case 0xff to the animateactor opcode 2012-02-11 08:28:59 +01:00
segrax
cbae5c79b7 SCUMM: Change vars to ints, remove unused variable for now 2012-02-11 08:28:51 +01:00
Tobias Gunkel
6ca91a2be5 SCUMM: Fix actor behind man-eating plant issue in v0.
Thanks segra for finding how it works in the original interpreter. The plant is handled specially and 0 is used instead of its y-position.
2012-02-11 08:28:43 +01:00
segrax
b999fe9e26 SCUMM: Add in support in v0 for the unknown variable to o_animateActor 2012-02-11 08:28:41 +01:00
Tobias Gunkel
05f853edd7 SCUMM: Fix meteor actor index
- Now the correct actor name is shown with "give ... to meteor". Formerly the name was "".
- Add actor names that do not have a string assigned
2012-02-11 08:02:25 +01:00
Tobias Gunkel
2acd5a8239 SCUMM: Fix sound playback if fast-mode is on
Sounds are played that fast in fast-mode that the queue gets stuck.
This is just a workaround and only fixes the symptoms. Check the queue handling for a correct fix.
2012-02-11 08:02:23 +01:00
Johannes Schickel
6fe7b020a8 SCUMM: Made some static data const. 2011-09-08 20:13:13 +02:00
Max Horn
88913c0139 ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-20 00:59:48 +02:00
Matthew Hoops
eea482fa43 ALL: behaviour -> behavior 2011-05-25 10:50:46 -04:00
Max Horn
47a7b65dc1 SCUMM: Workaround bug #1463598 (INDY3VGA: giant Henry Jones sr.) 2011-05-14 16:30:31 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Max Horn
0ce2ca4e00 COMMON: Replace MKID_BE by MKTAG
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
2011-04-12 16:53:15 +02:00
Max Horn
d7a6bf5846 SCUMM: Move ActorHE into its own header, move some HE specific stuff out of scumm.h 2011-04-05 15:18:08 +02:00
md5
d602a420b6 SCUMM: Changed usage of PI to M_PI (normally defined in math.h) 2011-03-19 02:33:09 +02:00
Travis Howell
ccb8a01b17 SCUMM: Correct fix for bug #3145951 - DIG: Subtitles won't turn off (regression).
svn-id: r55053
2010-12-28 06:05:57 +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
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
4f0cc6a435 SCUMM: Add patch #3093541 - MMC64: Actor Walk / Object Fix.
svn-id: r53806
2010-10-25 08:03:55 +00:00
Travis Howell
5942382ad4 SCUMM: Add patch #3093051 - MMC64: Ladder facing patch.
svn-id: r53799
2010-10-25 07:07:23 +00:00