diff --git a/Standard Gaming Platform/Font.cpp b/Standard Gaming Platform/Font.cpp index b965d7d2..37cb4aec 100644 --- a/Standard Gaming Platform/Font.cpp +++ b/Standard Gaming Platform/Font.cpp @@ -224,6 +224,13 @@ void SetRGBFontForeground( UINT32 uiRed, UINT32 uiGreen, UINT32 uiBlue ) if((FontDefault < 0) || (FontDefault > MAX_FONTS)) return; FontForeground16 = Get16BPPColor( FROMRGB( uiRed, uiGreen, uiBlue ) ); + if (iUseWinFonts) { + if (GET_WINFONT() != -1) + { + uiRed = FROMRGB(uiRed, uiGreen, uiBlue); + SetWinFontForeColor(GET_WINFONT(), &uiRed); + } + } } void SetRGBFontBackground( UINT32 uiRed, UINT32 uiGreen, UINT32 uiBlue ) @@ -231,6 +238,13 @@ void SetRGBFontBackground( UINT32 uiRed, UINT32 uiGreen, UINT32 uiBlue ) if((FontDefault < 0) || (FontDefault > MAX_FONTS)) return; FontBackground16 = Get16BPPColor( FROMRGB( uiRed, uiGreen, uiBlue ) ); + if (iUseWinFonts) { + if (GET_WINFONT() != -1) + { + uiRed = FROMRGB(uiRed, uiGreen, uiBlue); + SetWinFontBackColor(GET_WINFONT(), &uiRed); + } + } } void SetRGBFontShadow( UINT32 uiRed, UINT32 uiGreen, UINT32 uiBlue ) @@ -245,6 +259,13 @@ void SetRGBFontShadow( UINT32 uiRed, UINT32 uiGreen, UINT32 uiBlue ) void SetRGBFontForeground( UINT16 usFontForeground16 ) { FontForeground16 = usFontForeground16; + if (iUseWinFonts) { + if (GET_WINFONT() != -1) + { + UINT32 uiRed = GetRGBColor(usFontForeground16); + SetWinFontForeColor(GET_WINFONT(), &uiRed); + } + } } void SetRGBFontShadow( UINT16 usFontShadow16 ) diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 31af0c66..f1175656 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -5090,10 +5090,10 @@ STR16 gsAtmSideButtonText[] = STR16 gsAtmStartButtonText[] = { - L"转帐 $", // transfer money to merc -- short form - L"状态", // view stats of the merc - L"物品清单", // view the inventory of the merc - L"雇佣合同", + L"状态", //L"Stats", // view stats of the merc + L"更多状态", //L"More Stats", + L"雇佣合同", //L"Employment", + L"物品清单", //L"Inventory", // view the inventory of the merc }; STR16 sATMText[ ]=