diff options
| author | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
| commit | aa49b38c5a8032586cb94fc4ca07149eecabe64a (patch) | |
| tree | ea5c7617f8c482c8cf4141b728b3ccff5a7f84c7 /engines/sword2/maketext.h | |
| parent | d3ea9ab2a9334747eb445c1b45aa30cb17ffdf1b (diff) | |
| parent | c86a6c466fabe31fbf36363aa8d0ac8ea6001b9f (diff) | |
| download | scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.gz scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.bz2 scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
engines/groovie/script.cpp
Diffstat (limited to 'engines/sword2/maketext.h')
| -rw-r--r-- | engines/sword2/maketext.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/sword2/maketext.h b/engines/sword2/maketext.h index 52740d9de9..726c23a5f9 100644 --- a/engines/sword2/maketext.h +++ b/engines/sword2/maketext.h @@ -20,9 +20,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ */ #ifndef SWORD2_MAKETEXT_H @@ -94,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); |