diff options
Diffstat (limited to 'engines/tinsel/text.cpp')
| -rw-r--r-- | engines/tinsel/text.cpp | 15 | 
1 files changed, 6 insertions, 9 deletions
diff --git a/engines/tinsel/text.cpp b/engines/tinsel/text.cpp index d2939281eb..ecb1e153f3 100644 --- a/engines/tinsel/text.cpp +++ b/engines/tinsel/text.cpp @@ -18,9 +18,6 @@   * 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$ - *   * Text utilities.   */ @@ -78,8 +75,8 @@ int StringLengthPix(char *szStr, const FONT *pFont) {   * @param mode			Mode flags for the string   */  int JustifyText(char *szStr, int xPos, const FONT *pFont, int mode) { -	if (mode & TXT_CENTRE) { -		// centre justify the text +	if (mode & TXT_CENTER) { +		// center justify the text  		// adjust x positioning by half the length of line in pixels  		xPos -= StringLengthPix(szStr, pFont) / 2; @@ -100,14 +97,14 @@ int JustifyText(char *szStr, int xPos, const FONT *pFont, int mode) {   * of the list is returned.   * @param pList			Object list to add text to   * @param szStr			String to output - * @param colour		Colour for monochrome text + * @param color		Color for monochrome text   * @param xPos			X position of string   * @param yPos			Y position of string   * @param hFont			Which font to use   * @param mode			Mode flags for the string   * @param sleepTime		Sleep time between each character (if non-zero)   */ -OBJECT *ObjectTextOut(OBJECT *pList, char *szStr, int colour, +OBJECT *ObjectTextOut(OBJECT **pList, char *szStr, int color,  					  int xPos, int yPos, SCNHANDLE hFont, int mode, int sleepTime) {  	int xJustify;	// x position of text after justification  	int yOffset;	// offset to next line of text @@ -183,8 +180,8 @@ OBJECT *ObjectTextOut(OBJECT *pList, char *szStr, int colour,  				if (mode & TXT_ABSOLUTE)  					pChar->flags |= DMA_ABS; -				// set characters colour - only effective for mono fonts -				pChar->constant = colour; +				// set characters color - only effective for mono fonts +				pChar->constant = color;  				// get Y animation offset  				GetAniOffset(hImg, pChar->flags, &aniX, &aniY);  | 
