Commit Graph

144 Commits

Author SHA1 Message Date
Max Horn
becd70d243 cleanup: encapsulate some more members of class Actor, and rename newDirection -> targetFacing (since it corresponds to the future value of 'facing'; the distinction between 'facing' and 'direction' is extremly fuzzy)
svn-id: r9175
2003-07-24 17:44:00 +00:00
Torbjörn Andersson
3b033956aa Changed "SCALLING" to "SCALING".
svn-id: r9134
2003-07-22 20:53:01 +00:00
Max Horn
0a334bf269 Fix for bug #770690 and bug #774783
svn-id: r9110
2003-07-21 21:59:07 +00:00
Max Horn
2fbf782c05 moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical
svn-id: r9083
2003-07-19 18:18:01 +00:00
Max Horn
253e50b3e1 Workaround for bug #770724
svn-id: r9042
2003-07-15 19:09:11 +00:00
Max Horn
963ecad362 debug/warning/error all automatically output a newline
svn-id: r8991
2003-07-13 16:22:17 +00:00
Max Horn
66000eccbf fix for bug #770308
svn-id: r8958
2003-07-12 22:41:58 +00:00
Max Horn
fd82895ff5 adjusted V2 actor position to match original (MM) interpreter; tweaked adjustXYToBeInBox mod for V2 (so it's clear why it is needed)
svn-id: r8952
2003-07-12 17:53:22 +00:00
Max Horn
74554d6e91 fix for bug #766532: MI2: look at coffin to Mojo
svn-id: r8846
2003-07-07 22:11:03 +00:00
Max Horn
f27b711e79 fix for bug #753840 (actor placement in V2 games)
svn-id: r8714
2003-07-02 14:23:45 +00:00
Max Horn
92fd56f9f0 removed #include "boxes.h" from scumm.h; cleaned up AdjustBoxResult definition & usage; properly deal with larger box distances, thus partially fixing Zak on the airport (but original seems to have used a very different algorithm, so this really is only a partial fix)
svn-id: r8710
2003-07-02 13:47:03 +00:00
Max Horn
4a3da1a2b7 cleaned up the actor ordering code a bit - it should be now somewhat clearer what it does exactly
svn-id: r8709
2003-07-02 11:32:32 +00:00
Max Horn
e1483a6eac Fix for bug #763709: DIG: Recent walk regression
svn-id: r8685
2003-07-01 12:08:22 +00:00
Max Horn
c7fb2c9bbf fix for bug #743049; might cause regressions, but might also fix e.g. walk script issues
svn-id: r8673
2003-06-30 10:22:04 +00:00
Max Horn
870ce2879e added some const qualifiers; moved _bundle & _current_cd_sound from class Scumm to class Sound; some other tweaks
svn-id: r8648
2003-06-25 23:25:52 +00:00
Torbjörn Andersson
445a805238 Fixed bug #758167. Cleanup.
svn-id: r8577
2003-06-21 15:10:30 +00:00
Max Horn
4e57157cda renamed _bcr -> _costumeRenderer
svn-id: r8473
2003-06-14 13:38:22 +00:00
Max Horn
49b9a8fc9d follow our coding conventions
svn-id: r8377
2003-06-07 00:49:36 +00:00
Max Horn
86df3537b9 replaced GF_AFTER with _version
svn-id: r8372
2003-06-07 00:13:26 +00:00
Torbjörn Andersson
560c03f6ab Hack to fix the placement of the green transparency on the tank in the Hall
of Oddities in Sam & Max. As far as I can tell, this was a bug in the
original game as well, so this is one of the rare cases where I think a
hack is ok even as a long-term solution.

svn-id: r8347
2003-06-06 10:01:26 +00:00
Max Horn
41c03fa082 clarified comment
svn-id: r8328
2003-06-05 15:31:34 +00:00
Max Horn
6c35550334 proper const cast
svn-id: r8319
2003-06-05 09:54:57 +00:00
Bertrand Augereau
0aff2d3461 did a bit of cleaning and added TODOs ;)
svn-id: r8310
2003-06-05 03:19:07 +00:00
Bertrand Augereau
cf8d8617c9 use the global BaseCostumeRenderer instead of reinstancing it every time
svn-id: r8309
2003-06-05 02:47:12 +00:00
Max Horn
3d77f7230e Enabled walk sounds in Indy3EGA/ZakEGA; cleanup (bug #747068)
svn-id: r8249
2003-06-01 18:20:38 +00:00
Max Horn
2fd98601f7 ah well. just get rid of this again. this fixes some actor freezes in The Dig statue room, and shouldn't be necessary anymore anyway
svn-id: r8181
2003-05-31 16:09:09 +00:00
Max Horn
f8e64d7134 renamed walk_script/talk_script -> walkScript/talkScript
svn-id: r8178
2003-05-31 14:27:47 +00:00
Max Horn
691e1f390a rewrote Actor::needBgReset related code (this could cause regressions...)
svn-id: r8126
2003-05-30 00:55:21 +00:00
Max Horn
d8844871f5 cleanup
svn-id: r8109
2003-05-29 17:14:47 +00:00
Max Horn
59acd18cee they are getting more and more similar :-)
svn-id: r8073
2003-05-29 02:14:31 +00:00
Max Horn
78ef0ea5b5 fix actor redraw problems in COMI (and possibly other AKOS games); might cause regressions, though. See also patch #699980
svn-id: r8064
2003-05-28 21:43:34 +00:00
Max Horn
1f70da0155 const as const can!
svn-id: r8058
2003-05-28 20:01:47 +00:00
Max Horn
2f9ff35bad moved Actor SaveLoadEntry definition to actor.cpp; made findPathTowards/findPathTowardsOld members of Actor; cleanup
svn-id: r7988
2003-05-26 02:26:13 +00:00
Max Horn
4cda099c57 don't use _gameDataPath directly; minor cleanup
svn-id: r7907
2003-05-24 22:13:01 +00:00
Jamieson Christian
4c531d373b Fixed VC++ warning
svn-id: r7861
2003-05-23 13:45:45 +00:00
Max Horn
28eade1da4 when iterating from 1 to _numActors over all actors, use _actors[] directly instead of derefActor() (unnecessary overhead); added range check to derefActor, and error out if invalid actor is accessed
svn-id: r7858
2003-05-23 12:48:50 +00:00
Max Horn
a5be83b352 fixed meteor animation in MM (and probably others in MM and Zak)
svn-id: r7822
2003-05-22 10:40:49 +00:00
Max Horn
c78664cbc9 renamed talkFrame1/talkFrame2 to talkStartFrame/talkStopFrame
svn-id: r7819
2003-05-22 09:58:33 +00:00
Max Horn
061228688e fix V2 actor initial mouth's (they were missing)
svn-id: r7818
2003-05-22 09:52:21 +00:00
Max Horn
f43fb0dab8 freeze scripts & hide mouse during cutscenes; addde Actor::isPlayer method that should work in V2, too; fixed o2_walkActorToObject
svn-id: r7815
2003-05-22 00:51:42 +00:00
Max Horn
86d57f3c7a many pedantic warning fixes (and some actual potential buglets fixed, too)
svn-id: r7795
2003-05-21 18:09:49 +00:00
Max Horn
34eee8b33b cleanup
svn-id: r7756
2003-05-20 23:05:34 +00:00
Max Horn
49e7f7564a renamed various things for clarity
svn-id: r7754
2003-05-20 20:58:26 +00:00
Max Horn
1a394aa3c7 added enum's for the known actor/object claasses; extended putClass/getClass to translate the X/Y flip classes; made code use the new enum's; some other cleanup
svn-id: r7753
2003-05-20 20:42:28 +00:00
Max Horn
ffadd452a9 got rid of the evil locked-box hack in adjustXYToBeInBox; instead check for locked boxes in walkActorOld, which seems to work just as well (and hopefully better)
svn-id: r7750
2003-05-20 19:35:40 +00:00
Max Horn
1f859e592f this is 100% equivalent to the old walkActorOld() code - I just made an equivalence transformation (anybody who doesn't believe that, I can show you step by step how to transform the code :-)
svn-id: r7749
2003-05-20 17:50:43 +00:00
Max Horn
684cd9c431 fixed warning output
svn-id: r7735
2003-05-20 15:13:18 +00:00
Max Horn
46abb7998f merged common code
svn-id: r7720
2003-05-20 12:25:47 +00:00
Max Horn
1f8d481acb fix for various regressions (not quite sure if the check for V2/v3 is right, but seems to work so far)
svn-id: r7648
2003-05-18 23:14:21 +00:00
Max Horn
8f7f22aeae implemented proper 'invalid walkbox' handling in older games (in newer games, box 0 is used as invalid box, while in older games this is a legal box and box 255 is the 'invalid' box); removed lots of FIXME's which were needed to cope with ScummVM not implementing the invalid walkbox stuff properly in the past; removed other actor FIXMEs.
svn-id: r7642
2003-05-18 19:44:22 +00:00