diff -ur ScummVM-cvs20021205/scummvm/scumm/object.cpp ScummVM-cvs20021205+hack/scummvm/scumm/object.cpp
old
|
new
|
|
38 | 38 | |
39 | 39 | if (cls == 32) // CLASS_TOUCHABLE |
40 | 40 | cls = 24; |
41 | | |
42 | | if (_gameId == GID_INDY3_256 && cls == 22 && _currentRoom == 76) // Masking fix for Indy3 |
43 | | cls = 21; |
44 | 41 | } |
45 | 42 | return (_classData[obj] & (1 << (cls - 1))) != 0; |
46 | 43 | } |
… |
… |
|
59 | 56 | if (cls == 32) // CLASS_TOUCHABLE |
60 | 57 | cls = 24; |
61 | 58 | |
62 | | if (_gameId == GID_INDY3_256 && cls == 22 && _currentRoom == 76) // Masking fix for Indy3 |
63 | | cls = 21; |
| 59 | // FIXME: It isn't enough for the Indy3 intro to make the |
| 60 | // little trains ignore boxes (class 22), they have to always |
| 61 | // clip (class 21) as well. Is this yet another walkbox 0 |
| 62 | // error? |
| 63 | if (_gameId == GID_INDY3_256 && cls == 22 && _currentRoom == 76) |
| 64 | putClass(obj, 21, set); |
64 | 65 | } |
65 | 66 | |
66 | 67 | if (set) |