diff options
| author | Andrew Kurushin | 2005-09-08 18:01:39 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2005-09-08 18:01:39 +0000 |
| commit | b17c47f74a04865a2e88acd2585a43717ab372d4 (patch) | |
| tree | 630a9edc18aba6293cfe4f10ad5127b9d92765e9 | |
| parent | b6a5b0acaf353992a5949e4b1abf98fe43ce768a (diff) | |
| download | scummvm-rg350-b17c47f74a04865a2e88acd2585a43717ab372d4.tar.gz scummvm-rg350-b17c47f74a04865a2e88acd2585a43717ab372d4.tar.bz2 scummvm-rg350-b17c47f74a04865a2e88acd2585a43717ab372d4.zip | |
fix 1283705
and actor regression
svn-id: r18789
| -rw-r--r-- | saga/actor.cpp | 1 | ||||
| -rw-r--r-- | saga/font.cpp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/saga/actor.cpp b/saga/actor.cpp index d3607aad1a..73bc427f21 100644 --- a/saga/actor.cpp +++ b/saga/actor.cpp @@ -2543,6 +2543,7 @@ int Actor::fillPathArray(const Point &fromPoint, const Point &toPoint, Point &be bestRating = currentRating; bestPath = nextPoint; } + pathDirection = &_pathDirectionList[i]; } ++i; } while (i < _pathDirectionListCount); diff --git a/saga/font.cpp b/saga/font.cpp index d5400b43c0..649feb6e00 100644 --- a/saga/font.cpp +++ b/saga/font.cpp @@ -504,6 +504,10 @@ int Font::getHeight(FontId fontId, const char *text, int width, FontEffectFlags } // Wrap what we've got and restart textPoint.y += h + TEXT_LINESPACING; + if (foundPointer == NULL) { + // Since word hit NULL but fit, we are done + return textPoint.y + h; + } w_total = 0; len_total = 0; wc = 0; |