fix 1283705

and actor regression

svn-id: r18789
This commit is contained in:
Andrew Kurushin 2005-09-08 18:01:39 +00:00
parent b6a5b0acaf
commit b17c47f74a
2 changed files with 5 additions and 0 deletions

View File

@ -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);

View File

@ -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;