diff options
| author | Matthew Hoops | 2011-05-25 10:48:13 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-25 10:50:47 -0400 |
| commit | 28301e2bd1ff9b6da313cd212b0e2695f201c85e (patch) | |
| tree | 6601ec05a2dcf61e0e60a7d39e252cbac5c4496c /engines/sword2 | |
| parent | e18401a07c7defe7a461d2a78150748ca7833474 (diff) | |
| download | scummvm-rg350-28301e2bd1ff9b6da313cd212b0e2695f201c85e.tar.gz scummvm-rg350-28301e2bd1ff9b6da313cd212b0e2695f201c85e.tar.bz2 scummvm-rg350-28301e2bd1ff9b6da313cd212b0e2695f201c85e.zip | |
ALL: analyse -> analyze
Diffstat (limited to 'engines/sword2')
| -rw-r--r-- | engines/sword2/maketext.cpp | 6 | ||||
| -rw-r--r-- | engines/sword2/maketext.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword2/maketext.cpp b/engines/sword2/maketext.cpp index dc88f6e68e..804862e13f 100644 --- a/engines/sword2/maketext.cpp +++ b/engines/sword2/maketext.cpp @@ -112,7 +112,7 @@ byte *FontRenderer::makeTextSprite(byte *sentence, uint16 maxWidth, uint8 pen, u // Get details of sentence breakdown into array of LineInfo structures // and get the number of lines involved - uint16 noOfLines = analyseSentence(sentence, maxWidth, fontRes, (LineInfo *)line); + uint16 noOfLines = analyzeSentence(sentence, maxWidth, fontRes, (LineInfo *)line); // Construct the sprite based on the info gathered - returns floating // mem block @@ -123,7 +123,7 @@ byte *FontRenderer::makeTextSprite(byte *sentence, uint16 maxWidth, uint8 pen, u return textSprite; } -uint16 FontRenderer::analyseSentence(byte *sentence, uint16 maxWidth, uint32 fontRes, LineInfo *line) { +uint16 FontRenderer::analyzeSentence(byte *sentence, uint16 maxWidth, uint32 fontRes, LineInfo *line) { // joinWidth = how much extra space is needed to append a word to a // line. NB. SPACE requires TWICE the '_charSpacing' to join a word // to line @@ -199,7 +199,7 @@ uint16 FontRenderer::analyseSentence(byte *sentence, uint16 maxWidth, uint32 fon * @param sentence pointer to a null-terminated string * @param fontRes the font resource id * @param pen the text color, or zero to use the source colors - * @param line array of LineInfo structures, created by analyseSentence() + * @param line array of LineInfo structures, created by analyzeSentence() * @param noOfLines the number of lines, i.e. the number of elements in 'line' * @return a handle to a floating memory block containing the text sprite * @note The sentence must contain no leading, trailing or extra spaces. diff --git a/engines/sword2/maketext.h b/engines/sword2/maketext.h index db5833ac55..726c23a5f9 100644 --- a/engines/sword2/maketext.h +++ b/engines/sword2/maketext.h @@ -91,7 +91,7 @@ private: // each line - negative for overlap uint8 _borderPen; // output pen color of character borders - uint16 analyseSentence(byte *sentence, uint16 maxWidth, uint32 fontRes, LineInfo *line); + uint16 analyzeSentence(byte *sentence, uint16 maxWidth, uint32 fontRes, LineInfo *line); byte *buildTextSprite(byte *sentence, uint32 fontRes, uint8 pen, LineInfo *line, uint16 noOfLines); uint16 charWidth(byte ch, uint32 fontRes); uint16 charHeight(uint32 fontRes); |