diff options
| author | Filippos Karapetis | 2015-10-22 11:10:42 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2015-10-22 11:10:42 +0300 |
| commit | 4a38e2618dc94df70342db7a25c0d6f87267984e (patch) | |
| tree | a01e2bbeca559a375018be7640b28069ebc02e73 /engines/neverhood | |
| parent | af87fc7b65ebd56dbd2cb1a1484c9a9764aab1e6 (diff) | |
| parent | 42bf369d689545b8a221635ab9d7522c259c5edd (diff) | |
| download | scummvm-rg350-4a38e2618dc94df70342db7a25c0d6f87267984e.tar.gz scummvm-rg350-4a38e2618dc94df70342db7a25c0d6f87267984e.tar.bz2 scummvm-rg350-4a38e2618dc94df70342db7a25c0d6f87267984e.zip | |
Merge pull request #621 from eriktorbjorn/neverhood-car
NEVERHOOD: Possible fix for bad car behaviour
Diffstat (limited to 'engines/neverhood')
| -rw-r--r-- | engines/neverhood/modules/module2700.cpp | 12 | ||||
| -rw-r--r-- | engines/neverhood/modules/module2700.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/neverhood/modules/module2700.cpp b/engines/neverhood/modules/module2700.cpp index a510c02558..e0c6509793 100644 --- a/engines/neverhood/modules/module2700.cpp +++ b/engines/neverhood/modules/module2700.cpp @@ -761,7 +761,7 @@ void Scene2702::moveCarToPoint(NPoint pt) { _tracks.findTrackPoint(pt, minMatchTrackIndex, minMatchDistance, _dataResource); if (minMatchTrackIndex >= 0 && minMatchTrackIndex != _currTrackIndex) { _newTrackIndex = minMatchTrackIndex; - _newTrackDestX = pt.x; + _newTrackDest = pt; if (_isUpperTrack) { if (_currTrackIndex == 0) sendMessage(_asCar, 0x2003, _trackPoints->size() - 1); @@ -773,7 +773,7 @@ void Scene2702::moveCarToPoint(NPoint pt) { sendMessage(_asCar, 0x2003, _trackPoints->size() - 1); } else { _newTrackIndex = -1; - sendMessage(_asCar, 0x2004, pt.x); + sendMessage(_asCar, 0x2004, pt); } } @@ -790,7 +790,7 @@ void Scene2702::changeTrack() { sendMessage(_asCar, NM_POSITION_CHANGE, 0); else sendMessage(_asCar, NM_POSITION_CHANGE, _trackPoints->size() - 1); - sendMessage(_asCar, 0x2004, _newTrackDestX); + sendMessage(_asCar, 0x2004, _newTrackDest); _newTrackIndex = -1; } @@ -1092,14 +1092,14 @@ void Scene2706::moveCarToPoint(NPoint pt) { _tracks.findTrackPoint(pt, minMatchTrackIndex, minMatchDistance, _dataResource); if (minMatchTrackIndex >= 0 && minMatchTrackIndex != _currTrackIndex) { _newTrackIndex = minMatchTrackIndex; - _newTrackDestX = pt.x; + _newTrackDest = pt; if (_currTrackIndex == 0) sendMessage(_asCar, 0x2003, _trackPoints->size() - 1); else sendMessage(_asCar, 0x2003, 0); } else { _newTrackIndex = -1; - sendMessage(_asCar, 0x2004, pt.x); + sendMessage(_asCar, 0x2004, pt); } } @@ -1111,7 +1111,7 @@ void Scene2706::changeTrack() { sendMessage(_asCar, NM_POSITION_CHANGE, _trackPoints->size() - 1); else sendMessage(_asCar, NM_POSITION_CHANGE, 0); - sendMessage(_asCar, 0x2004, _newTrackDestX); + sendMessage(_asCar, 0x2004, _newTrackDest); _newTrackIndex = -1; } diff --git a/engines/neverhood/modules/module2700.h b/engines/neverhood/modules/module2700.h index 9ac2159765..ece8866cd4 100644 --- a/engines/neverhood/modules/module2700.h +++ b/engines/neverhood/modules/module2700.h @@ -76,7 +76,7 @@ protected: Sprite *_asCarShadow; Sprite *_asCarTrackShadow; Sprite *_asCarConnectorShadow; - int16 _newTrackDestX; + NPoint _newTrackDest; bool _isInLight; int _currTrackIndex, _newTrackIndex; bool _isUpperTrack; @@ -132,7 +132,7 @@ protected: Sprite *_asCarConnector; Sprite *_asCarTrackShadow; Sprite *_asCarConnectorShadow; - int16 _newTrackDestX; + NPoint _newTrackDest; int _currTrackIndex, _newTrackIndex; Tracks _tracks; NPointArray *_trackPoints; |