From: Alyssa M. <fu...@us...> - 2013-01-14 09:33:10
|
gemrb: Infinity Engine emulator The branch master has been updated via 6a8535548ee2e2332e85462d9a56ef99fa335bf2 (commit) Summary of changes: gemrb/core/Font.cpp | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) from 2708fb242d00fd4c1531dba499e677ae454388b5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=6a8535548ee2e2332e85462d9a56ef99fa335bf2 commit 6a8535548ee2e2332e85462d9a56ef99fa335bf2 Author: Alyssa Milburn <fu...@fu...> Date: Mon Jan 14 10:31:19 2013 +0100 Font: partially revert 473d7776 to fix the build diff --git a/gemrb/core/Font.cpp b/gemrb/core/Font.cpp index dc91f07..fba7022 100644 --- a/gemrb/core/Font.cpp +++ b/gemrb/core/Font.cpp @@ -263,10 +263,10 @@ void Font::PrintFromLine(int startrow, Region rgn, const unsigned char* string, } if (strnicmp( tag, "color=", 6 ) == 0) { - ieByte r,g,b; + unsigned int r,g,b; if (sscanf( tag, "color=%02X%02X%02X", &r, &g, &b ) != 3) continue; - const Color c = {r, g, b, 0}; + const Color c = {(unsigned char)r, (unsigned char)g, (unsigned char)b, 0}; Palette* newPal = core->CreatePalette( c, palette->back ); SET_BLIT_PALETTE(newPal); gamedata->FreePalette( newPal ); @@ -455,10 +455,10 @@ void Font::Print(Region cliprgn, Region rgn, const unsigned char* string, } if (strnicmp( tag, "color=", 6 ) == 0) { - ieByte r,g,b; + unsigned int r,g,b; if (sscanf( tag, "color=%02X%02X%02X", &r, &g, &b ) != 3) continue; - const Color c = {r, g, b, 0}; + const Color c = {(unsigned char)r, (unsigned char)g, (unsigned char)b, 0}; Palette* newPal = core->CreatePalette( c, palette->back ); SET_BLIT_PALETTE(newPal); gamedata->FreePalette( newPal ); ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |