From: <ave...@us...> - 2003-11-02 12:22:48
|
Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core In directory sc8-pr-cvs1:/tmp/cvs-serv22853/Core Modified Files: Button.cpp Log Message: Fixed button text color (bugged previously) Index: Button.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Button.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Button.cpp 2 Nov 2003 11:53:24 -0000 1.26 --- Button.cpp 2 Nov 2003 12:22:41 -0000 1.27 *************** *** 124,128 **** Changed = false; if(!(Flags & 0x1)) { ! Color white = {0xff, 0xff, 0xff, 0x00}, black = {0x00, 0x00, 0x00, 0x00}; int align=0; --- 124,129 ---- Changed = false; if(!(Flags & 0x1)) { ! Color *ppoi=NULL; ! // Color white = {0xff, 0xff, 0xff, 0x00}, black = {0x00, 0x00, 0x00, 0x00}; int align=0; *************** *** 168,176 **** core->GetVideoDriver()->BlitSprite(Unpressed, x+XPos, y+YPos, true); } } break; } if(hasText) ! font->Print(Region(x+XPos, y+YPos, Width, Height), (unsigned char*)Text, NULL, align | IE_FONT_SINGLE_LINE, true); } if(Picture && (Flags&0x2)) { --- 169,178 ---- core->GetVideoDriver()->BlitSprite(Unpressed, x+XPos, y+YPos, true); } + ppoi=palette; } break; } if(hasText) ! font->Print(Region(x+XPos, y+YPos, Width, Height), (unsigned char*)Text, ppoi, align | IE_FONT_SINGLE_LINE, true); } if(Picture && (Flags&0x2)) { |