diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 8cb34908f..dfee71574 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.2: +- Minor fixes for pc-fonts (Outfit screen, gradient color swap) -by Nic - DCQ is now accessed uniformly by routines in gfx_common.c - Fixed OpenGL colors on MacOS X -Mika - Added a sane cmd-line naming scheme: --opt=(pc|3do) see --help for more -PBlue diff --git a/sc2/TODO b/sc2/TODO index cc22221c6..a81bcc412 100644 --- a/sc2/TODO +++ b/sc2/TODO @@ -92,6 +92,8 @@ Implementation bugs (low priority): - Still using 3DO menu hierarchy, so menu text isn't identical to PC -PC Font issues: - Lander font isn't correct (for PC or 3DO) + - The PC version has text about the ship in the Outfit screen (Velocity etc) + but we don't have that yet. Stuff still to do (large): - add some way to configure your keys diff --git a/sc2/src/sc2code/sis.c b/sc2/src/sc2code/sis.c index ead6fa464..15b132629 100644 --- a/sc2/src/sc2code/sis.c +++ b/sc2/src/sc2code/sis.c @@ -378,10 +378,16 @@ DrawFlagshipName (BOOLEAN InStatusArea) t.baseline.y = r.corner.y + (SHIP_NAME_HEIGHT - InStatusArea); t.align = ALIGN_CENTER; t.CharCount = (COUNT)~0; - if (optWhichFonts == OPT_PC) - SetContextFontEffect (GRADIENT_EFFECT, - BUILD_COLOR_RGBA (0xF7, 0x2C, 0x00, 0xFF), - BUILD_COLOR_RGBA (0xF7, 0xBA, 0x00, 0xFF)); + if (optWhichFonts == OPT_PC) { + if (InStatusArea) + SetContextFontEffect (GRADIENT_EFFECT, + BUILD_COLOR_RGBA (0xF7, 0x2C, 0x00, 0xFF), + BUILD_COLOR_RGBA (0xF7, 0xBA, 0x00, 0xFF)); + else + SetContextFontEffect (GRADIENT_EFFECT, + BUILD_COLOR_RGBA (0x00, 0x00, 0x9C, 0xFF), + BUILD_COLOR_RGBA (0x08, 0x14, 0xFF, 0xFF)); + } else SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x14, 0x0A, 0x00), 0x0C)); DrawText (&t); @@ -528,8 +534,8 @@ void DrawPC_SIS () DrawFilledRectangle (&r); SetContextFontEffect (GRADIENT_EFFECT, - BUILD_COLOR_RGBA (0x00, 0x4D, 0x00, 0xFF), - BUILD_COLOR_RGBA (0x00, 0xAE, 0x00, 0xFF)); + BUILD_COLOR_RGBA (0x6B, 0x00, 0x00, 0xFF), + BUILD_COLOR_RGBA (0xF7, 0x00, 0x00, 0xFF)); wsprintf (buf, "FUEL"); DrawText (&t); @@ -538,8 +544,8 @@ void DrawPC_SIS () DrawFilledRectangle (&r); SetContextFontEffect (GRADIENT_EFFECT, - BUILD_COLOR_RGBA (0x6B, 0x00, 0x00, 0xFF), - BUILD_COLOR_RGBA (0xF7, 0x00, 0x00, 0xFF)); + BUILD_COLOR_RGBA (0x00, 0x4D, 0x00, 0xFF), + BUILD_COLOR_RGBA (0x00, 0xAE, 0x00, 0xFF)); wsprintf (buf, "CREW"); DrawText (&t); SetContextFontEffect (0, 0, 0);