diff options
| author | Paul Gilbert | 2009-07-14 10:26:56 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2009-07-14 10:26:56 +0000 |
| commit | fb631a7f38eb88cf46a702eda9fe11aa310111c2 (patch) | |
| tree | 14b239037b5ddb4d268d0892925550ab66193e63 | |
| parent | 72e2b9fe5aa5ed58ae742bec39257ca7532994f1 (diff) | |
| download | scummvm-rg350-fb631a7f38eb88cf46a702eda9fe11aa310111c2.tar.gz scummvm-rg350-fb631a7f38eb88cf46a702eda9fe11aa310111c2.tar.bz2 scummvm-rg350-fb631a7f38eb88cf46a702eda9fe11aa310111c2.zip | |
Bugfix for player being able to walk through some objects against room walls
svn-id: r42471
| -rw-r--r-- | engines/cruise/actor.cpp | 2 | ||||
| -rw-r--r-- | engines/cruise/ctp.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp index 969be96573..845867409e 100644 --- a/engines/cruise/actor.cpp +++ b/engines/cruise/actor.cpp @@ -528,7 +528,7 @@ void valide_noeud(int16 table[], int16 p, int *nclick, int16 solution0[20 + 3][2 return; } - /****** COUPE LE CHEMIN ******/ + /****** Trim down any un-necessary walk points ******/ i++; d = 0; diff --git a/engines/cruise/ctp.cpp b/engines/cruise/ctp.cpp index 11d5f582ed..aa2a6c7772 100644 --- a/engines/cruise/ctp.cpp +++ b/engines/cruise/ctp.cpp @@ -106,7 +106,7 @@ void renderCTPWalkBox(int16 *walkboxData, int hotPointX, int hotPointY, int X, i int16 *destination; int startX = X - ((upscaleValue(hotPointX, scale) + 0x8000) >> 16); -// int startY = Y - ((upscaleValue(hotPointY, scale) + 0x8000) >> 16); + int startY = Y - ((upscaleValue(hotPointY, scale) + 0x8000) >> 16); numPoints = *(walkboxData++); @@ -117,7 +117,7 @@ void renderCTPWalkBox(int16 *walkboxData, int hotPointX, int hotPointY, int X, i int pointY = *(walkboxData++); int scaledX = ((upscaleValue(pointX, scale) + 0x8000) >> 16) + startX; - int scaledY = ((upscaleValue(pointY, scale) + 0x8000) >> 16) + startX; + int scaledY = ((upscaleValue(pointY, scale) + 0x8000) >> 16) + startY; *(destination++) = scaledX; *(destination++) = scaledY; |