adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some color-related cleanups.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2462 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2006-10-26 22:07:22 +00:00
parent 734ea17e21
commit ea1657a589
36 changed files with 336 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/border.c
+11 -8
View File
@@ -52,7 +52,8 @@ DrawSISFrame (void)
BatchGraphics ();
{
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08));
r.corner.x = 0;
r.corner.y = 0;
r.extent.width = SIS_ORG_X + SIS_SCREEN_WIDTH + 1;
@@ -80,7 +81,7 @@ DrawSISFrame (void)
r.extent.height = SIS_SCREEN_HEIGHT + 2;
DrawStarConBox (&r, 1,
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19),
BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F),
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F),
TRUE, BLACK_COLOR);
r.corner.y = 0;
@@ -89,15 +90,15 @@ DrawSISFrame (void)
r.corner.x = SIS_ORG_X;
r.extent.width = SIS_SCREEN_WIDTH - 69;
DrawStarConBox (&r, 1,
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0xE), 0x54),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1, 0x1C), 0x4E),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x0E), 0x54),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x01, 0x1C), 0x4E),
TRUE, BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
r.extent.width = 57;
r.corner.x = SIS_ORG_X + SIS_SCREEN_WIDTH - 57;
DrawStarConBox (&r, 1,
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0xE), 0x54),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1, 0x1C), 0x4E),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x0E), 0x54),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x01, 0x1C), 0x4E),
TRUE, BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
SetContextForeGroundColor (BLACK_COLOR);
@@ -112,7 +113,8 @@ DrawSISFrame (void)
r.corner.x = SCREEN_WIDTH - 1;
DrawPoint (&r.corner);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19));
r.corner.y = 1;
r.extent.width = 1;
r.extent.height = SAFE_Y + 8;
@@ -147,7 +149,8 @@ DrawSISFrame (void)
r.extent.height = (SCREEN_HEIGHT - 1) - r.corner.y;
DrawFilledRectangle (&r);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F));
r.corner.y = 1;
r.extent.width = 1;
r.extent.height = SAFE_Y + 8;
sc2/src/sc2code/clock.c
+7 -7
View File
@@ -49,13 +49,13 @@ static int clock_task_func(void* data)
DWORD cycle_index, delay_count;
COLOR cycle_tab[] =
{
BUILD_COLOR (MAKE_RGB15 (0xA, 0x14, 0x18), 0x5B),
BUILD_COLOR (MAKE_RGB15 (0x6, 0x10, 0x16), 0x5C),
BUILD_COLOR (MAKE_RGB15 (0x3, 0xE, 0x14), 0x5D),
BUILD_COLOR (MAKE_RGB15 (0x2, 0xC, 0x11), 0x5E),
BUILD_COLOR (MAKE_RGB15 (0x1, 0xB, 0xF), 0x5F),
BUILD_COLOR (MAKE_RGB15 (0x1, 0x9, 0xD), 0x60),
BUILD_COLOR (MAKE_RGB15 (0x0, 0x7, 0xB), 0x61),
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x14, 0x18), 0x5B),
BUILD_COLOR (MAKE_RGB15 (0x06, 0x10, 0x16), 0x5C),
BUILD_COLOR (MAKE_RGB15 (0x03, 0x0E, 0x14), 0x5D),
BUILD_COLOR (MAKE_RGB15 (0x02, 0x0C, 0x11), 0x5E),
BUILD_COLOR (MAKE_RGB15 (0x01, 0x0B, 0x0F), 0x5F),
BUILD_COLOR (MAKE_RGB15 (0x01, 0x09, 0x0D), 0x60),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x07, 0x0B), 0x61),
};
#define NUM_CYCLES (sizeof (cycle_tab) / sizeof (cycle_tab[0]))
#define NUM_DELAYS (ONE_SECOND * 3 / 40) // 9 @ 120 ticks/second
sc2/src/sc2code/confirm.c
+1 -1
View File
@@ -44,7 +44,7 @@ DrawConfirmationWindow (BOOLEAN answer)
RECT r;
TEXT t;
dark = BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F);
dark = BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F);
medium = BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19);
BatchGraphics ();
sc2/src/sc2code/credits.c
+4 -3
View File
@@ -312,8 +312,8 @@ credit_roll_task (void *data)
strcnt = GetStringTableCount (CreditsTab);
TransColor = BUILD_COLOR (MAKE_RGB15 (0, 0, 0x10), 1);
TextBack = BUILD_COLOR (MAKE_RGB15 (0, 0, 0), 0);
TransColor = BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x10), 0x01);
TextBack = BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00);
TextFore = BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F);
LocalContext = CaptureContext (CreateContext ());
@@ -719,7 +719,8 @@ Credits (BOOLEAN WithOuttakes)
LockMutex (GraphicsLock);
SetContext (ScreenContext);
SetContextClipRect (NULL_PTR);
SetContextBackGroundColor (BUILD_COLOR (MAKE_RGB15 (0x0, 0x0, 0x0), 0x00));
SetContextBackGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00));
ClearDrawable ();
fade_buf[0] = FadeAllToColor;
XFormColorMap ((COLORMAPPTR)fade_buf, 0);
sc2/src/sc2code/encount.c
+19 -18
View File
@@ -214,7 +214,8 @@ InitEncounter (void)
t.align = ALIGN_CENTER;
SetContextFont (MicroFont);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
if (LOBYTE (GLOBAL (CurrentActivity)) == IN_HYPERSPACE)
{
t.pStr = GAME_STRING (ENCOUNTER_STRING_BASE + 0);
@@ -341,13 +342,13 @@ DrawFadeText (const UNICODE *str1, const UNICODE *str2, BOOLEAN fade_in,
TEXT t1, t2;
COLOR fade_cycle[] =
{
BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x1D),
BUILD_COLOR (MAKE_RGB15 (0x9, 0x9, 0x9), 0x1E),
BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F),
BUILD_COLOR (MAKE_RGB15 (0x6, 0x6, 0x6), 0x20),
BUILD_COLOR (MAKE_RGB15 (0x5, 0x5, 0x5), 0x21),
BUILD_COLOR (MAKE_RGB15 (0x4, 0x4, 0x4), 0x22),
BUILD_COLOR (MAKE_RGB15 (0x3, 0x3, 0x3), 0x23),
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x1D),
BUILD_COLOR (MAKE_RGB15 (0x09, 0x09, 0x09), 0x1E),
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F),
BUILD_COLOR (MAKE_RGB15 (0x06, 0x06, 0x06), 0x20),
BUILD_COLOR (MAKE_RGB15 (0x05, 0x05, 0x05), 0x21),
BUILD_COLOR (MAKE_RGB15 (0x04, 0x04, 0x04), 0x22),
BUILD_COLOR (MAKE_RGB15 (0x03, 0x03, 0x03), 0x23),
};
#define NUM_FADES (sizeof (fade_cycle) / sizeof (fade_cycle[0]))
@@ -393,8 +394,8 @@ DrawFadeText (const UNICODE *str1, const UNICODE *str2, BOOLEAN fade_in,
SleepThreadUntil (TimeIn + (ONE_SECOND / 20));
TimeIn = GetTimeCounter ();
}
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA),
0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08));
font_DrawText (&t1);
font_DrawText (&t2);
}
@@ -438,14 +439,14 @@ UninitEncounter (void)
SHIP_FRAGMENTPTR FragPtr;
COLOR fade_ship_cycle[] =
{
BUILD_COLOR (MAKE_RGB15 (0x7, 0x00, 0x00), 0x2F),
BUILD_COLOR (MAKE_RGB15 (0xF, 0x00, 0x00), 0x2D),
BUILD_COLOR (MAKE_RGB15 (0x07, 0x00, 0x00), 0x2F),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2D),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2B),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0xA, 0xA), 0x27),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x0A), 0x27),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x14, 0x14), 0x25),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x14, 0x14), 0x25),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0xA, 0xA), 0x27),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x0A), 0x27),
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2A),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2B),
};
@@ -536,8 +537,8 @@ UninitEncounter (void)
ship_s.frame = IncFrameIndex (
FragPtr->ShipInfo.icons);
DrawStamp (&ship_s);
SetContextForeGroundColor (BUILD_COLOR (
MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F));
SetContextFont (TinyFont);
GetStringContents (
@@ -588,8 +589,8 @@ UninitEncounter (void)
t.align = ALIGN_RIGHT;
t.pStr = buf;
t.CharCount = (COUNT)~0;
SetContextForeGroundColor (BUILD_COLOR (
MAKE_RGB15 (0x00, 0x00, 0x18), 0x50));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x18), 0x50));
font_DrawText (&t);
DeltaSISGauges (0, 0, j);
sc2/src/sc2code/gameopt.c
+26 -20
View File
@@ -91,9 +91,10 @@ ConfirmSaveLoad (STAMP *MsgStamp)
}
DrawStarConBox (&r, 2,
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19),
BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F),
TRUE, BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08));
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x14, 0x14, 0x14), 0x0F));
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F),
TRUE, BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x14, 0x14, 0x14), 0x0F));
font_DrawText (&t);
}
@@ -240,8 +241,8 @@ DrawDescriptionString (PMENU_STATE pMS, COUNT which_string, COUNT state)
r.extent.width -= 2;
lf.baseline.x = r.corner.x + (r.extent.width >> 1) - 1;
BackGround = BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0x1F), 0x09);
ForeGround = BUILD_COLOR (MAKE_RGB15 (0xA, 0x1F, 0x1F), 0x0B);
BackGround = BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09);
ForeGround = BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B);
}
else
{
@@ -249,8 +250,8 @@ DrawDescriptionString (PMENU_STATE pMS, COUNT which_string, COUNT state)
r.corner.y = 20;
lf.baseline.x = r.corner.x + (r.extent.width >> 1);
BackGround = BUILD_COLOR (MAKE_RGB15 (0xF, 0x00, 0x00), 0x2D);
ForeGround = BUILD_COLOR (MAKE_RGB15 (0x1F, 0xA, 0x00), 0x7D);
BackGround = BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2D);
ForeGround = BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x00), 0x7D);
}
lf.baseline.y = r.corner.y + r.extent.height - 1;
@@ -631,15 +632,15 @@ DrawCargo (COUNT redraw_state)
UNICODE buf[40];
COLOR cargo_color[] =
{
BUILD_COLOR (MAKE_RGB15 (2, 14, 19), 0x00),
BUILD_COLOR (MAKE_RGB15 (25, 0x00, 0x00), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x02, 0x0E, 0x13), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x19, 0x00, 0x00), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x00),
BUILD_COLOR (MAKE_RGB15 (3, 5, 30), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x00, 24, 0x00), 0x00),
BUILD_COLOR (MAKE_RGB15 (27, 27, 0x00), 0x00),
BUILD_COLOR (MAKE_RGB15 (30, 13, 0x00), 0x00),
BUILD_COLOR (MAKE_RGB15 (20, 0x00, 20), 0x00),
BUILD_COLOR (MAKE_RGB15 (15, 0x00, 25), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x03, 0x05, 0x1E), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x18, 0x00), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x1B, 0x00), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x1E, 0x0D, 0x00), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x14, 0x00, 0x14), 0x05),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x19), 0x00),
};
r.extent.width = 23;
@@ -696,7 +697,8 @@ ShowSummary (SUMMARY_DESC *pSD)
r.corner.y = 139;
r.extent.width = SIS_SCREEN_WIDTH - 4;
r.extent.height = 7;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
DrawFilledRectangle (&r);
}
else
@@ -805,7 +807,8 @@ ShowSummary (SUMMARY_DESC *pSD)
r.corner.y = t.baseline.y - SHIP_NAME_HEIGHT + 1;
SetContextForeGroundColor (BLACK_COLOR);
DrawFilledRectangle (&r);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x10, 0x00, 0x10), 0x01));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x10, 0x00, 0x10), 0x01));
font_DrawText (&t);
t.CharCount = (COUNT)~0;
}
@@ -817,14 +820,16 @@ ShowSummary (SUMMARY_DESC *pSD)
r.corner.y = t.baseline.y - SHIP_NAME_HEIGHT + 1;
SetContextForeGroundColor (BLACK_COLOR);
DrawFilledRectangle (&r);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x10, 0x00, 0x10), 0x01));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x10, 0x00, 0x10), 0x01));
font_DrawText (&t);
r.corner.x = 2;
r.corner.y = 139;
r.extent.width = SIS_SCREEN_WIDTH - 4;
r.extent.height = 7;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
DrawFilledRectangle (&r);
t.baseline.x = /*r.corner.x + (SIS_MESSAGE_WIDTH >> 1)*/ 6;
t.baseline.y = r.corner.y + (r.extent.height - 1);
@@ -867,7 +872,8 @@ ShowSummary (SUMMARY_DESC *pSD)
}
SetContextFont (TinyFont);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x1B), 0x33));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x1B), 0x33));
t.CharCount = (COUNT)~0;
font_DrawText (&t);
t.align = ALIGN_CENTER;
sc2/src/sc2code/hyper.c
+12 -6
View File
@@ -325,17 +325,20 @@ LoadHyperspace (void)
DrawSISMessage (NULL_PTR);
SetContext (RadarContext);
SetContextBackGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0xE, 0x00), 0x6C));
SetContextBackGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x0E, 0x00), 0x6C));
SetContext (SpaceContext);
if (GET_GAME_STATE (ARILOU_SPACE_SIDE) <= 1)
{
SetContextBackGroundColor (BUILD_COLOR (MAKE_RGB15 (0x7, 0x00, 0x00), 0x2F));
SetContextBackGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x07, 0x00, 0x00), 0x2F));
SetColorMap (GetColorMapAddress (hypercmaps[0]));
}
else
{
SetContextBackGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x1A, 0x00), 0x2F));
SetContextBackGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1A, 0x00), 0x2F));
SetColorMap (GetColorMapAddress (hypercmaps[1]));
SET_GAME_STATE (USED_BROADCASTER, 0);
SET_GAME_STATE (BROADCASTER_RESPONSE, 0);
@@ -1524,7 +1527,8 @@ SeedUniverse (void)
// draws borders to mini-map
RECT r;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xE, 0xE, 0xE), 0x00));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0E, 0x0E, 0x0E), 0x00));
r.corner.x = 0;
r.corner.y = 0;
r.extent.width = RADAR_WIDTH - 1;
@@ -1534,7 +1538,8 @@ SeedUniverse (void)
r.extent.height = RADAR_HEIGHT - 1;
DrawFilledRectangle (&r);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x6, 0x6, 0x6), 0x00));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x06, 0x06, 0x06), 0x00));
r.corner.x = RADAR_WIDTH - 1;
r.corner.y = 1;
r.extent.height = RADAR_HEIGHT - 1;
@@ -1545,7 +1550,8 @@ SeedUniverse (void)
r.extent.height = 1;
DrawFilledRectangle (&r);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x00));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x00));
r.corner.x = 0;
DrawPoint (&r.corner);
r.corner.x = RADAR_WIDTH - 1;
sc2/src/sc2code/intro.c
+5 -5
View File
@@ -204,7 +204,7 @@ Present_GenerateSIS (PRESENTATION_INPUT_STATE* pPIS)
));
SetContextFGFrame (SisFrame);
SetContextClipRect (NULL_PTR);
SisBack = BUILD_COLOR (MAKE_RGB15 (1, 1, 1), 7);
SisBack = BUILD_COLOR (MAKE_RGB15 (0x01, 0x01, 0x01), 0x07);
SetContextBackGroundColor (SisBack);
ClearDrawable ();
SetFrameTransparentColor (SisFrame, SisBack);
@@ -659,8 +659,8 @@ DoPresentation (PVOID pIS)
GetContextClipRect (&r);
r.corner.x = r.corner.y = 0;
/* paint black rect over screen */
SetContextForeGroundColor (BUILD_COLOR (
MAKE_RGB15 (0x0, 0x0, 0x0), 0x00));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00));
DrawFilledRectangle (&r);
UnlockMutex (GraphicsLock);
}
@@ -699,8 +699,8 @@ ShowPresentation (STRING PresStr)
GetContextClipRect (&OldRect);
OldFont = SetContextFont (NULL);
/* paint black rect over screen */
SetContextBackGroundColor (BUILD_COLOR (
MAKE_RGB15 (0x0, 0x0, 0x0), 0x00));
SetContextBackGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00));
ClearDrawable ();
UnlockMutex (GraphicsLock);
sc2/src/sc2code/libs/graphics/context.c
+4 -5
View File
@@ -31,7 +31,8 @@ SetContext (CONTEXT Context)
{
CONTEXT LastContext;
if (Context != (LastContext = (CONTEXT)_pCurContext))
LastContext = (CONTEXT)_pCurContext;
if (Context != LastContext)
{
if (LastContext)
{
@@ -77,11 +78,9 @@ CreateContext (void)
/* initialize context */
OldContext = SetContext (CaptureContext (ContextRef));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F)
);
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F));
SetContextBackGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00)
);
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00));
SetContextClipping (TRUE);
ReleaseContext (SetContext (OldContext));
}
sc2/src/sc2code/libs/graphics/widgets.c
+13 -7
View File
@@ -7,12 +7,18 @@
WIDGET *widget_focus = NULL;
/* Some basic color defines */
#define WIDGET_ACTIVE_COLOR BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x00), 0x0E)
#define WIDGET_INACTIVE_COLOR BUILD_COLOR (MAKE_RGB15 (0x18, 0x18, 0x1F), 0x09)
#define WIDGET_INACTIVE_SELECTED_COLOR BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F)
#define WIDGET_CURSOR_COLOR BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00)
#define WIDGET_DIALOG_COLOR BUILD_COLOR (MAKE_RGB15 (0x14, 0x14, 0x14), 0x07)
#define WIDGET_DIALOG_TEXT_COLOR BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00)
#define WIDGET_ACTIVE_COLOR \
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x00), 0x0E)
#define WIDGET_INACTIVE_COLOR \
BUILD_COLOR (MAKE_RGB15 (0x18, 0x18, 0x1F), 0x00)
#define WIDGET_INACTIVE_SELECTED_COLOR \
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F)
#define WIDGET_CURSOR_COLOR \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00)
#define WIDGET_DIALOG_COLOR \
BUILD_COLOR (MAKE_RGB15 (0x14, 0x14, 0x14), 0x07)
#define WIDGET_DIALOG_TEXT_COLOR \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00)
void
DrawShadowedBox(PRECT r, COLOR bg, COLOR dark, COLOR medium)
@@ -64,7 +70,7 @@ DrawLabelAsWindow(WIDGET_LABEL *label)
TEXT t;
int i, win_w, win_h;
dark = BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F);
dark = BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F);
medium = BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19);
/* Compute the dimensions of the label */
sc2/src/sc2code/libs/video/vidplayer.c
+2 -2
View File
@@ -93,8 +93,8 @@ TFB_FadeClearScreen (void)
// paint black rect over screen
LockMutex (GraphicsLock);
SetContext (ScreenContext);
SetContextForeGroundColor (BUILD_COLOR (
MAKE_RGB15 (0x0, 0x0, 0x0), 0x00));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00));
DrawFilledRectangle (&r);
UnlockMutex (GraphicsLock);
sc2/src/sc2code/menu.c
+20 -10
View File
@@ -41,17 +41,20 @@ static BYTE ConvertAlternateMenu (BYTE BaseState, BYTE NewState);
static void
DrawPCMenuFrame (RECT *r)
{
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x0F, 0x0F, 0x0F), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x0F, 0x0F), 0x00));
DrawRectangle (r);
r->corner.x++;
r->corner.y++;
r->extent.height--;
r->extent.width--;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x06, 0x06, 0x06), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x06, 0x06, 0x06), 0x00));
DrawRectangle (r);
r->extent.height--;
r->extent.width--;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x15), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x15), 0x00));
DrawFilledRectangle (r);
}
@@ -92,7 +95,8 @@ DrawPCMenu (BYTE beg_index, BYTE end_index, BYTE NewState, BYTE hilite, RECT *r)
t.CharCount = (COUNT)~0;
r->corner.x++;
r->extent.width -= 2;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x15, 0x15), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x15, 0x15), 0x00));
for (i = beg_index; i <= end_index; i++)
{
utf8StringCopy (buf, sizeof (buf),
@@ -101,13 +105,16 @@ DrawPCMenu (BYTE beg_index, BYTE end_index, BYTE NewState, BYTE hilite, RECT *r)
GAME_STRING (MAINMENU_STRING_BASE + i));
if (hilite && pos == i)
{
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x00));
r->corner.y = t.baseline.y - PC_MENU_HEIGHT + 2;
r->extent.height = PC_MENU_HEIGHT - 1;
DrawFilledRectangle (r);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x00));
font_DrawText (&t);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x15, 0x15), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x15, 0x15), 0x00));
}
else
font_DrawText (&t);
@@ -473,7 +480,8 @@ DrawMenuStateStrings (BYTE beg_index, SWORD NewState)
r.corner.y = s.origin.y - 11;
r.extent.width = RADAR_WIDTH + 2;
BatchGraphics ();
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x1D));
if (s.frame && optWhichMenu == OPT_PC)
{
if (beg_index == PM_CREW)
@@ -559,7 +567,8 @@ DrawMenuStateStrings (BYTE beg_index, SWORD NewState)
t.pStr = buf;
sprintf (buf, "%u", GLOBAL (CrewCost));
SetContextFont (TinyFont);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x1F, 0x00), 0x02));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1F, 0x00), 0x00));
font_DrawText (&t);
break;
case PM_FUEL:
@@ -570,7 +579,8 @@ DrawMenuStateStrings (BYTE beg_index, SWORD NewState)
t.pStr = buf;
sprintf (buf, "%u", GLOBAL (FuelCost));
SetContextFont (TinyFont);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x1F, 0x00), 0x02));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1F, 0x00), 0x00));
font_DrawText (&t);
break;
}
sc2/src/sc2code/misc.c
+1 -1
View File
@@ -209,7 +209,7 @@ crew_preprocess (PELEMENT ElementPtr)
SetPrimColor (&DisplayArray[ElementPtr->PrimIndex],
GetPrimColor (&DisplayArray[ElementPtr->PrimIndex])
^ BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08));
^ BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08));
ElementPtr->state_flags |= CHANGING;
if ((hTarget = ElementPtr->hTarget) == 0)
sc2/src/sc2code/outfit.c
+10 -5
View File
@@ -56,14 +56,16 @@ DrawModuleStrings (PMENU_STATE pMS, BYTE NewModule)
r.extent.width = RADAR_WIDTH + 2;
r.extent.height = 11;
BatchGraphics ();
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08));
DrawFilledRectangle (&r);
if (NewModule >= EMPTY_SLOT)
{
r.corner = s.origin;
r.extent.width = RADAR_WIDTH;
r.extent.height = RADAR_HEIGHT;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00));
DrawFilledRectangle (&r);
}
else if (pMS->CurFrame)
@@ -80,7 +82,8 @@ DrawModuleStrings (PMENU_STATE pMS, BYTE NewModule)
t.pStr = buf;
sprintf (buf, "%u", GLOBAL (ModuleCost[NewModule]) * MODULE_COST_SCALE);
SetContextFont (TinyFont);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x1F, 0x00), 0x02));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1F, 0x00), 0x02));
font_DrawText (&t);
}
UnbatchGraphics ();
@@ -122,7 +125,8 @@ RedistributeFuel (void)
while ((GLOBAL_SIS (FuelOnBoard) += FUEL_VOLUME_PER_ROW) <
GetFTankCapacity (&r.corner))
{
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xB, 0x00, 0x00), 0x2E));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0B, 0x00, 0x00), 0x2E));
DrawFilledRectangle (&r);
}
@@ -586,7 +590,8 @@ ChangeFuelQuantity (void)
% FUEL_VOLUME_PER_ROW == 0)
{
GetFTankCapacity (&r.corner);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xB, 0x00, 0x00), 0x2E));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0B, 0x00, 0x00), 0x2E));
r.extent.width = 5;
DrawFilledRectangle (&r);
}
sc2/src/sc2code/pickship.c
+4 -3
View File
@@ -103,7 +103,8 @@ DoPickBattleShip (PMENU_STATE pMS)
LockMutex (GraphicsLock);
#ifdef NEVER
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x1D));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x1D));
DrawRectangle (&pMS->flash_rect0);
#endif /* NEVER */
pMS->first_item.y = new_row;
@@ -513,8 +514,8 @@ DrawArmadaPickShip (BOOLEAN draw_salvage_frame, PRECT pPickRect)
else
{
/* Ship ran away */
SetContextForeGroundColor (BUILD_COLOR (
MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
DrawFilledStamp (&s);
}
}
sc2/src/sc2code/planets/cargo.c
+29 -15
View File
@@ -51,9 +51,11 @@ ShowRemainingCapacity (void)
r.extent.height = 7;
BatchGraphics ();
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
DrawFilledRectangle (&r);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0x1F), 0x09));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09));
font_DrawText (&rt);
UnbatchGraphics ();
@@ -94,7 +96,7 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement)
r.extent.height = 109;
DrawStarConBox (&r, 1,
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19),
BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F),
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F),
TRUE,
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
@@ -104,7 +106,8 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement)
ct.align = ALIGN_CENTER;
ct.pStr = GAME_STRING (CARGO_STRING_BASE);
ct.CharCount = (COUNT)~0;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0x1F, 0x1F), 0x0B));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B));
font_DrawText (&ct);
SetContextFont (TinyFont);
@@ -124,7 +127,8 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement)
rt.baseline.y = cy - 7;
rt.CharCount = 1;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0x1F), 0x09));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09));
rt.baseline.x = 32;
rt_amount_buf[0] = '$';
font_DrawText (&rt);
@@ -148,14 +152,16 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement)
{
rt.baseline.y = cy;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0x1F), 0x09));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09));
rt.baseline.x = 32;
sprintf (rt_amount_buf, "%u",
GLOBAL (ElementWorth[OldElement]));
rt.CharCount = (COUNT)~0;
font_DrawText (&rt);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03));
rt.baseline.x = 58;
sprintf (rt_amount_buf, "%u",
GLOBAL_SIS (ElementAmounts[OldElement]));
@@ -178,7 +184,8 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement)
s.frame = SetAbsFrameIndex (s.frame, 68);
DrawStamp (&s);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03));
rt.baseline.x = 58;
sprintf (rt_amount_buf, "%u", GLOBAL_SIS (TotalBioMass));
rt.CharCount = (COUNT)~0;
@@ -188,7 +195,8 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement)
r.corner.y = 117;
r.extent.width = 56;
r.extent.height = 1;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0x1F), 0x09));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09));
DrawFilledRectangle (&r);
{
@@ -216,7 +224,8 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement)
else
cy = y + (OldElement * 9);
r.corner.y = cy - 6;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
DrawFilledRectangle (&r);
rt.baseline.y = cy;
@@ -225,7 +234,8 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement)
sprintf (rt_amount_buf, "%u", GLOBAL_SIS (TotalBioMass));
else
{
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0x1F), 0x09));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09));
rt.baseline.x = 32;
sprintf (rt_amount_buf, "%u", GLOBAL (ElementWorth[OldElement]));
rt.CharCount = (COUNT)~0;
@@ -233,7 +243,8 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement)
sprintf (rt_amount_buf, "%u", GLOBAL_SIS (ElementAmounts[OldElement]));
}
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03));
rt.baseline.x = 58;
rt.CharCount = (COUNT)~0;
font_DrawText (&rt);
@@ -246,7 +257,8 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement)
else
cy = y + (NewElement * 9);
r.corner.y = cy - 6;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0x1F), 0x09));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09));
DrawFilledRectangle (&r);
rt.baseline.y = cy;
@@ -255,7 +267,8 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement)
sprintf (rt_amount_buf, "%u", GLOBAL_SIS (TotalBioMass));
else
{
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03));
rt.baseline.x = 32;
sprintf (rt_amount_buf, "%u", GLOBAL (ElementWorth[NewElement]));
rt.CharCount = (COUNT)~0;
@@ -263,7 +276,8 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement)
sprintf (rt_amount_buf, "%u", GLOBAL_SIS (ElementAmounts[NewElement]));
}
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0x1F, 0x1F), 0x0B));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B));
rt.baseline.x = 58;
rt.CharCount = (COUNT)~0;
font_DrawText (&rt);
sc2/src/sc2code/planets/devices.c
+4 -4
View File
@@ -83,7 +83,7 @@ DrawDevices (PMENU_STATE pMS, BYTE OldDevice, BYTE NewDevice)
r.extent.height = 109;
DrawStarConBox (&r, 1,
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19),
BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F),
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F),
TRUE,
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
@@ -94,7 +94,7 @@ DrawDevices (PMENU_STATE pMS, BYTE OldDevice, BYTE NewDevice)
ct.pStr = GAME_STRING (DEVICE_STRING_BASE);
ct.CharCount = (COUNT)~0;
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0xA, 0x1F, 0x1F), 0x0B));
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B));
font_DrawText (&ct);
SetContextFont (TinyFont);
@@ -169,11 +169,11 @@ DrawDevices (PMENU_STATE pMS, BYTE OldDevice, BYTE NewDevice)
cy = y + ((NewDevice - pMS->first_item.y) * 18);
r.corner.y = cy - 6;
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0x1F), 0x09));
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09));
DrawFilledRectangle (&r);
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0xA, 0x1F, 0x1F), 0x0B));
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B));
t.baseline.y = cy;
t.pStr = GAME_STRING (pDeviceMap[NewDevice] + DEVICE_STRING_BASE + 1);
t.CharCount = utf8StringPos (t.pStr, ' ');
sc2/src/sc2code/planets/pstarmap.c
+8 -4
View File
@@ -291,14 +291,17 @@ DrawStarMap (COUNT race_update, PRECT pClipRect)
if (which_space <= 1)
{
SDPtr = &star_array[0];
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x7), 0x57));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x07), 0x57));
SetContextBackGroundColor (BLACK_COLOR);
}
else
{
SDPtr = &star_array[NUM_SOLAR_SYSTEMS + 1];
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0xB, 0x00), 0x6D));
SetContextBackGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x8, 0x00), 0x6E));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x0B, 0x00), 0x6D));
SetContextBackGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x08, 0x00), 0x6E));
}
ClearDrawable ();
@@ -330,7 +333,8 @@ DrawStarMap (COUNT race_update, PRECT pClipRect)
r.corner.y = UNIVERSE_TO_DISPY (r.corner.y)
- (r.extent.height >> 1);
OldColor = SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x3, 0x3, 0x3), 0x22));
OldColor = SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x03, 0x03, 0x03), 0x22));
DrawFilledOval (&r);
SetContextForeGroundColor (OldColor);
}
sc2/src/sc2code/planets/report.c
+4 -3
View File
@@ -56,8 +56,8 @@ ClearReportArea (void)
SetContextBackGroundColor (BLACK_COLOR);
ClearDrawable ();
SetContextClipping (FALSE);
SetContextForeGroundColor (BUILD_COLOR (
MAKE_RGB15 (0x00, 0x07, 0x00), 0x57));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x07, 0x00), 0x57));
startx = 1 + (r.extent.width >> 1) - 1;
s.origin.y = 1;
@@ -231,7 +231,8 @@ InitPageCell:
if (!Sleepy)
BatchGraphics ();
ClearReportArea();
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0, 0x1F, 0), 0xFF));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1F, 0x00), 0xFF));
if (Sleepy)
UnlockMutex (GraphicsLock);
}
sc2/src/sc2code/planets/scan.c
+9 -6
View File
@@ -108,7 +108,7 @@ PrintScanTitlePC (TEXT *t, RECT *r, const char *txt, int xpos)
TextRect (t, r, NULL_PTR);
t->baseline.x += r->extent.width;
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0xF, 0x00, 0x19), 0x3B));
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x19), 0x3B));
}
static void
@@ -200,10 +200,11 @@ PrintCoarseScanPC (void)
t.pStr = buf;
t.CharCount = (COUNT)~0;
SetContextForeGroundColor (BUILD_COLOR (
MAKE_RGB15 (0x00, 0x00, 0x15), 0x3B));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x15), 0x3B));
SetContextFont (MicroFont);
font_DrawText (&t);
SetContextFont (TinyFont);
UnlockMutex (GraphicsLock);
@@ -439,7 +440,9 @@ PrintCoarseScan3DO (void)
t.baseline.y = 13;
t.pStr = buf;
t.CharCount = (COUNT)~0;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xF, 0x00, 0x19), 0x3B));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x19), 0x3B));
SetContextFont (MicroFont);
font_DrawText (&t);
@@ -1082,11 +1085,11 @@ DoScan (PMENU_STATE pMS)
break;
case ENERGY_SCAN:
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0xC, 0xC, 0xC), 0x1C));
BUILD_COLOR (MAKE_RGB15 (0x0C, 0x0C, 0x0C), 0x1C));
break;
case BIOLOGICAL_SCAN:
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0xE, 0x00), 0x6C));
BUILD_COLOR (MAKE_RGB15 (0x00, 0x0E, 0x00), 0x6C));
break;
}
font_DrawText (&t);
sc2/src/sc2code/planets/solarsys.c
+2 -2
View File
@@ -1832,7 +1832,7 @@ DrawStarBackGround (BOOLEAN ForPlanet)
SetContext (ScreenContext);
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08));
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08));
r.corner.x = SIS_ORG_X - 1;
r.corner.y = (SIS_ORG_Y + SIS_SCREEN_HEIGHT) - MAP_HEIGHT - 4;
r.extent.width = SIS_SCREEN_WIDTH + 2;
@@ -1840,7 +1840,7 @@ DrawStarBackGround (BOOLEAN ForPlanet)
DrawFilledRectangle (&r);
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F));
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F));
r.extent.width = 1;
r.extent.height = MAP_HEIGHT + 1;
r.corner.y = (SIS_ORG_Y + SIS_SCREEN_HEIGHT) - MAP_HEIGHT;
sc2/src/sc2code/save.c
+2 -2
View File
@@ -491,8 +491,8 @@ SaveProblemMessage (PSTAMP MsgStamp)
BatchGraphics ();
DrawStarConBox (&r, 2,
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19),
BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F),
TRUE, BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08));
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F),
TRUE, BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x14, 0x14, 0x14), 0x0F));
sc2/src/sc2code/ships/arilou/arilou.c
+1 -1
View File
@@ -126,7 +126,7 @@ initialize_autoaim_laser (PELEMENT ShipPtr, HELEMENT LaserArray[])
LaserBlock.sender = (ShipPtr->state_flags & (GOOD_GUY | BAD_GUY))
| IGNORE_SIMILAR;
LaserBlock.pixoffs = ARILOU_OFFSET;
LaserBlock.color = BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0xA), 0x0E);
LaserBlock.color = BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E);
LaserArray[0] = initialize_laser (&LaserBlock);
return (1);
sc2/src/sc2code/ships/chmmr/chmmr.c
+10 -15
View File
@@ -203,9 +203,9 @@ initialize_megawatt_laser (PELEMENT ShipPtr, HELEMENT LaserArray[])
COLOR cycle_array[] =
{
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2B),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x3, 0x00), 0x7F),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7F),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7B),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x3, 0x00), 0x7F),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7F),
};
GetElementStarShip (ShipPtr, &StarShipPtr);
@@ -217,12 +217,8 @@ initialize_megawatt_laser (PELEMENT ShipPtr, HELEMENT LaserArray[])
+ DISPLAY_TO_WORLD (r.corner.x);
LaserBlock.cy = DISPLAY_ALIGN (ShipPtr->next.location.y)
+ DISPLAY_TO_WORLD (r.corner.y);
LaserBlock.ex = COSINE (
FACING_TO_ANGLE (LaserBlock.face), LASER_RANGE
);
LaserBlock.ey = SINE (
FACING_TO_ANGLE (LaserBlock.face), LASER_RANGE
);
LaserBlock.ex = COSINE (FACING_TO_ANGLE (LaserBlock.face), LASER_RANGE);
LaserBlock.ey = SINE (FACING_TO_ANGLE (LaserBlock.face), LASER_RANGE);
LaserBlock.sender = (ShipPtr->state_flags & (GOOD_GUY | BAD_GUY))
| IGNORE_SIMILAR;
LaserBlock.pixoffs = 0;
@@ -353,12 +349,11 @@ chmmr_postprocess (PELEMENT ElementPtr)
DISPLAY_TO_WORLD (8 + 9 + 11 + 14 + 18),
};
COLOR color_tab[] =
{
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x10), 0x53),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0xE), 0x54),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0xC), 0x55),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x9), 0x56),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x7), 0x57),
{ BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x10), 0x53),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x0E), 0x54),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x0C), 0x55),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x09), 0x56),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x07), 0x57),
};
@@ -556,7 +551,7 @@ spawn_point_defense (PELEMENT ElementPtr)
(SattPtr->state_flags & (GOOD_GUY | BAD_GUY))
| IGNORE_SIMILAR;
LaserBlock.pixoffs = 0;
LaserBlock.color = BUILD_COLOR (MAKE_RGB15 (0x00, 0x1, 0x1F), 0x4D);
LaserBlock.color = BUILD_COLOR (MAKE_RGB15 (0x00, 0x01, 0x1F), 0x4D);
hPointDefense = initialize_laser (&LaserBlock);
if (hPointDefense)
{
sc2/src/sc2code/ships/ilwrath/ilwrath.c
+8 -8
View File
@@ -238,14 +238,14 @@ ilwrath_preprocess (PELEMENT ElementPtr)
{
if (Color == BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F))
SetPrimType (lpPrim, STAMP_PRIM);
else if (Color == BUILD_COLOR (MAKE_RGB15 (0xA, 0x1F, 0x1F), 0x0B))
else if (Color == BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F));
else if (Color == BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0xA, 0x1F, 0x1F), 0x0B));
else if (Color == BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0x1F), 0x09))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B));
else if (Color == BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03));
else if (Color == BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0x1F), 0x09));
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09));
else
{
ProcessSound (SetAbsSoundIndex (
@@ -329,14 +329,14 @@ ilwrath_preprocess (PELEMENT ElementPtr)
SetPrimColor (lpPrim, BLACK_COLOR);
Untarget (ElementPtr);
}
else if (Color == BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0x1F), 0x09))
else if (Color == BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
else if (Color == BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0x1F), 0x09));
else if (Color == BUILD_COLOR (MAKE_RGB15 (0xA, 0x1F, 0x1F), 0x0B))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09));
else if (Color == BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03));
else
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0xA, 0x1F, 0x1F), 0x0B));
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B));
ElementPtr->state_flags |= CHANGING;
}
sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c
+1 -1
View File
@@ -269,7 +269,7 @@ initialize_dual_weapons (PELEMENT ShipPtr, HELEMENT WeaponArray[])
LaserBlock.sender = ShipPtr->state_flags & (GOOD_GUY | BAD_GUY);
LaserBlock.pixoffs = 0;
LaserBlock.color = BUILD_COLOR (MAKE_RGB15 (0x1F, 0xA, 0xA), 0x0C);
LaserBlock.color = BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x0A), 0x0C);
LaserBlock.face = facing;
ex = cx + COSINE (angle, LASER_RANGE);
sc2/src/sc2code/ships/shofixti/shofixti.c
+7 -7
View File
@@ -147,7 +147,7 @@ destruct_preprocess (PELEMENT ElementPtr)
{
SetPrimType (lpPrim, STAMPFILL_PRIM);
if (ElementPtr->life_span == DESTRUCT_SWITCH + 2)
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0xA), 0x0E));
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E));
else
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F));
}
@@ -156,12 +156,12 @@ destruct_preprocess (PELEMENT ElementPtr)
ElementPtr->next.image.frame =
IncFrameIndex (ElementPtr->current.image.frame);
if (GetPrimColor (lpPrim) == BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0xA), 0x0E));
else if (GetPrimColor (lpPrim) == BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0xA), 0x0E))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0xA, 0xA), 0x0C));
else if (GetPrimColor (lpPrim) == BUILD_COLOR (MAKE_RGB15 (0x1F, 0xA, 0xA), 0x0C))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x14, 0xA, 0x00), 0x06));
else if (GetPrimColor (lpPrim) == BUILD_COLOR (MAKE_RGB15 (0x14, 0xA, 0x00), 0x06))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E));
else if (GetPrimColor (lpPrim) == BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x0A), 0x0C));
else if (GetPrimColor (lpPrim) == BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x0A), 0x0C))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x14, 0x0A, 0x00), 0x06));
else if (GetPrimColor (lpPrim) == BUILD_COLOR (MAKE_RGB15 (0x14, 0x0A, 0x00), 0x06))
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x14, 0x00, 0x00), 0x04));
}
else
sc2/src/sc2code/ships/slylandr/slylandr.c
+1 -1
View File
@@ -211,7 +211,7 @@ initialize_lightning (PELEMENT ElementPtr, HELEMENT LaserArray[])
case 2:
SetPrimColor (
&(GLOBAL (DisplayArray))[LaserPtr->PrimIndex],
BUILD_COLOR (MAKE_RGB15 (0x6, 0x7, 0x1F), 0x4A)
BUILD_COLOR (MAKE_RGB15 (0x06, 0x07, 0x1F), 0x4A)
);
break;
case 3:
sc2/src/sc2code/ships/urquan/urquan.c
+1 -1
View File
@@ -161,7 +161,7 @@ fighter_postprocess (PELEMENT ElementPtr)
LaserBlock.sender = (ElementPtr->state_flags & (GOOD_GUY | BAD_GUY))
| IGNORE_SIMILAR;
LaserBlock.pixoffs = FIGHTER_OFFSET;
LaserBlock.color = BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0xA), 0x0E);
LaserBlock.color = BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E);
Laser = initialize_laser (&LaserBlock);
if (Laser)
{
sc2/src/sc2code/ships/utwig/utwig.c
+6 -6
View File
@@ -311,14 +311,14 @@ utwig_preprocess (PELEMENT ElementPtr)
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2b),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2c),
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2d),
BUILD_COLOR (MAKE_RGB15 (0xF, 0x00, 0x00), 0x2e),
BUILD_COLOR (MAKE_RGB15 (0xB, 0x00, 0x00), 0x2f),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2e),
BUILD_COLOR (MAKE_RGB15 (0x0B, 0x00, 0x00), 0x2f),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7a),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7b),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0xE, 0x00), 0x7c),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0xA, 0x00), 0x7d),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x7, 0x00), 0x7e),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x3, 0x00), 0x7f), };
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7c),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x00), 0x7d),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7e),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7f), };
#define NUM_TAB_COLORS (sizeof (color_tab) / sizeof (color_tab[0]))
sc2/src/sc2code/ships/vux/vux.c
+1 -1
View File
@@ -240,7 +240,7 @@ initialize_horrific_laser (PELEMENT ShipPtr, HELEMENT LaserArray[])
LaserBlock.sender = (ShipPtr->state_flags & (GOOD_GUY | BAD_GUY))
| IGNORE_SIMILAR;
LaserBlock.pixoffs = VUX_OFFSET;
LaserBlock.color = BUILD_COLOR (MAKE_RGB15 (0xA, 0x1F, 0xA), 0x0A);
LaserBlock.color = BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x0A), 0x0A);
LaserArray[0] = initialize_laser (&LaserBlock);
return (1);
sc2/src/sc2code/shipstat.c
+12 -8
View File
@@ -49,7 +49,7 @@ DrawCrewFuelString (COORD y, SIZE state)
DrawStamp (&Stamp);
else
{
#define LOW_FUEL_COLOR BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0xA), 0x0E)
#define LOW_FUEL_COLOR BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E)
SetContextForeGroundColor (LOW_FUEL_COLOR);
DrawFilledStamp (&Stamp);
}
@@ -70,7 +70,8 @@ DrawShipNameString (UNICODE *pStr, COUNT CharCount, COORD y)
Text.baseline.y = STARCON_TEXT_HEIGHT + 3 + y;
Text.baseline.x = STATUS_WIDTH >> 1;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19));
font_DrawText (&Text);
--Text.baseline.y;
SetContextForeGroundColor (BLACK_COLOR);
@@ -84,7 +85,8 @@ ClearShipStatus (COORD y)
{
RECT r;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08));
r.corner.x = 2;
r.corner.y = 3 + y;
r.extent.width = STATUS_WIDTH - 4;
@@ -97,7 +99,8 @@ OutlineShipStatus (COORD y)
{
RECT r;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F));
r.corner.x = 0;
r.corner.y = 1 + y;
r.extent.width = STATUS_WIDTH;
@@ -112,7 +115,8 @@ OutlineShipStatus (COORD y)
++r.corner.x;
DrawFilledRectangle (&r);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19));
r.corner.x = STATUS_WIDTH - 1;
DrawFilledRectangle (&r);
r.corner.x = STATUS_WIDTH - 2;
@@ -174,7 +178,7 @@ InitShipStatus (STARSHIPPTR StarShipPtr, PRECT pClipRect)
energy_height = (((SIPtr->max_energy + 1) >> 1) << 1) + 1;
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F));
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F));
r.corner.x = CREW_XOFFS - 1;
r.corner.y = GAUGE_YOFFS + 1 + y;
r.extent.width = STAT_WIDTH + 2;
@@ -337,7 +341,7 @@ DeltaStatistics (STARSHIPPTR StarShipPtr, SIZE crew_delta, SIZE
r.corner.y = (y + 1) -
(((oldNumBlocks + 1) >> 1) * (UNIT_HEIGHT + 1));
#define CREW_UNIT_COLOR BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x00), 0x02)
#define ROBOT_UNIT_COLOR BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08)
#define ROBOT_UNIT_COLOR BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08)
SetContextForeGroundColor (
(ShipInfoPtr->ship_flags & CREW_IMMUNE) ?
ROBOT_UNIT_COLOR : CREW_UNIT_COLOR);
@@ -375,7 +379,7 @@ DeltaStatistics (STARSHIPPTR StarShipPtr, SIZE crew_delta, SIZE
ShipInfoPtr->crew_level == 0) && newCrewLevel != 0)
{
// The block indicating the captain needs to change color.
#define PLAYER_UNIT_COLOR BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0x1F), 0x09)
#define PLAYER_UNIT_COLOR BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09)
SetContextForeGroundColor (
(newCrewLevel > MAX_CREW_SIZE) ?
CREW_UNIT_COLOR : PLAYER_UNIT_COLOR);
sc2/src/sc2code/shipyard.c
+10 -10
View File
@@ -218,14 +218,14 @@ DrawRaceStrings (BYTE NewRaceItem)
r.extent.height = 11;
BatchGraphics ();
ClearSISRect (CLEAR_SIS_RADAR);
SetContextForeGroundColor (BUILD_COLOR (
MAKE_RGB15 (0xA, 0xA, 0xA), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08));
DrawFilledRectangle (&r);
r.corner = s.origin;
r.extent.width = RADAR_WIDTH;
r.extent.height = RADAR_HEIGHT;
SetContextForeGroundColor (BUILD_COLOR (
MAKE_RGB15 (0x00, 0x00, 0x00), 0x00));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00));
DrawFilledRectangle (&r);
if (NewRaceItem != (BYTE)~0)
{
@@ -258,8 +258,8 @@ DrawRaceStrings (BYTE NewRaceItem)
t.pStr = buf;
sprintf (buf, "%u", ShipCost[NewRaceItem]);
SetContextFont (TinyFont);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (
0x00, 0x1F, 0x00), 0x02));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1F, 0x00), 0x02));
font_DrawText (&t);
}
UnbatchGraphics ();
@@ -1060,8 +1060,8 @@ DrawBluePrint (PMENU_STATE pMS)
s.origin.x = s.origin.y = 0;
s.frame = DecFrameIndex (pMS->ModuleFrame);
SetContextForeGroundColor (BUILD_COLOR (
MAKE_RGB15 (0x00, 0x00, 0x16), 0x01));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x16), 0x01));
DrawFilledStamp (&s);
for (num_frames = 0; num_frames < NUM_DRIVE_SLOTS; ++num_frames)
@@ -1084,8 +1084,8 @@ DrawBluePrint (PMENU_STATE pMS)
DrawShipPiece (pMS, which_piece, num_frames, TRUE);
}
SetContextForeGroundColor (BUILD_COLOR (
MAKE_RGB15 (0xA, 0xA, 0x1F), 0x09));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09));
for (num_frames = 0; num_frames < NUM_MODULE_SLOTS; ++num_frames)
{
BYTE which_piece;
sc2/src/sc2code/sis.c
+55 -38
View File
@@ -49,7 +49,8 @@ RepairSISBorder (void)
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19));
DrawFilledRectangle (&r);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F));
r.corner.x += (SIS_SCREEN_WIDTH + 2) - 1;
DrawFilledRectangle (&r);
@@ -71,7 +72,8 @@ ClearSISRect (BYTE ClearFlags)
CONTEXT OldContext;
OldContext = SetContext (StatusContext);
OldColor = SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08));
OldColor = SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08));
r.corner.x = 2;
r.extent.width = STATUS_WIDTH - 4;
@@ -95,8 +97,8 @@ ClearSISRect (BYTE ClearFlags)
DrawStarConBox (&r, 1,
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19),
BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F),
TRUE, BUILD_COLOR (MAKE_RGB15 (0x00, 0xE, 0x00), 0x6C));
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F),
TRUE, BUILD_COLOR (MAKE_RGB15 (0x00, 0x0E, 0x00), 0x6C));
#endif /* NEVER */
}
UnbatchGraphics ();
@@ -131,9 +133,11 @@ SetContextClipRect (&r);
SetContextFont (TinyFont);
BatchGraphics ();
SetContextBackGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
SetContextBackGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
ClearDrawable ();
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x1B), 0x33));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x1B), 0x33));
font_DrawText (&t);
UnbatchGraphics ();
@@ -357,7 +361,8 @@ DrawStatusMessage (const UNICODE *pStr)
SetContextClipRect (&r);
BatchGraphics ();
SetContextBackGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x8, 0x00), 0x6E));
SetContextBackGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x08, 0x00), 0x6E));
ClearDrawable ();
if (pStr == (UNICODE *)~0)
@@ -396,7 +401,8 @@ DrawStatusMessage (const UNICODE *pStr)
t.CharCount = (COUNT)~0;
SetContextFont (TinyFont);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x10, 0x00), 0x6B));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x10, 0x00), 0x6B));
font_DrawText (&t);
UnbatchGraphics ();
@@ -416,7 +422,8 @@ DrawCaptainsName (void)
OldContext = SetContext (StatusContext);
OldFont = SetContextFont (TinyFont);
OldColor = SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
OldColor = SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
r.corner.x = 2 + 1;
r.corner.y = 10;
@@ -429,7 +436,8 @@ DrawCaptainsName (void)
t.align = ALIGN_CENTER;
t.pStr = GLOBAL_SIS (CommanderName);
t.CharCount = (COUNT)~0;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x16, 0xB, 0x1F), 0x38));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x16, 0x0B, 0x1F), 0x38));
font_DrawText (&t);
SetContextForeGroundColor (OldColor);
@@ -488,7 +496,8 @@ DrawFlagshipName (BOOLEAN InStatusArea)
SetContextFontEffect (SetAbsFrameIndex (FontGradFrame,
InStatusArea ? 0 : 3));
else
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x14, 0x0A, 0x00), 0x0C));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x14, 0x0A, 0x00), 0x0C));
font_DrawText (&t);
@@ -745,7 +754,8 @@ DrawStorageBays (BOOLEAN Refresh)
r.corner.x = (STATUS_WIDTH >> 1)
- ((i * (r.extent.width + 1)) >> 1);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08));
for (j = GLOBAL_SIS (TotalElementMass);
j >= STORAGE_BAY_CAPACITY; j -= STORAGE_BAY_CAPACITY)
{
@@ -764,7 +774,8 @@ DrawStorageBays (BOOLEAN Refresh)
if (r.extent.height)
{
r.corner.y = 123;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x6, 0x6, 0x6), 0x20));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x06, 0x06, 0x06), 0x20));
DrawFilledRectangle (&r);
}
r.corner.x += r.extent.width + 1;
@@ -773,7 +784,8 @@ DrawStorageBays (BOOLEAN Refresh)
}
r.extent.height = 4;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x6, 0x6, 0x6), 0x20));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x06, 0x06, 0x06), 0x20));
while (i--)
{
DrawFilledRectangle (&r);
@@ -829,9 +841,11 @@ DrawPC_SIS (void)
r.corner.y = 3;
r.extent.width = 58;
r.extent.height = 7;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
DrawFilledRectangle (&r);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x02, 0x04, 0x1E), 0x38));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x02, 0x04, 0x1E), 0x38));
t.baseline.y = r.corner.y + 6;
t.pStr = GAME_STRING (STATUS_STRING_BASE + 5); // "CAPTAIN"
font_DrawText (&t);
@@ -979,7 +993,8 @@ DeltaSISGauges (SIZE crew_delta, SIZE fuel_delta, int resunit_delta)
t.CharCount = (COUNT)~0;
SetContextForeGroundColor (BLACK_COLOR);
DrawFilledRectangle (&r);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0xE, 0x00), 0x6C));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x0E, 0x00), 0x6C));
font_DrawText (&t);
}
@@ -1015,7 +1030,8 @@ DeltaSISGauges (SIZE crew_delta, SIZE fuel_delta, int resunit_delta)
t.CharCount = (COUNT)~0;
SetContextForeGroundColor (BLACK_COLOR);
DrawFilledRectangle (&r);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2C));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2C));
font_DrawText (&t);
}
}
@@ -1046,7 +1062,8 @@ DeltaSISGauges (SIZE crew_delta, SIZE fuel_delta, int resunit_delta)
r.corner.y = 130;
r.extent.width = STATUS_MESSAGE_WIDTH;
r.extent.height = STATUS_MESSAGE_HEIGHT;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x8, 0x00), 0x6E));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x08, 0x00), 0x6E));
DrawFilledRectangle (&r);
if ((pMenuState == 0
@@ -1093,16 +1110,16 @@ GetCPodCapacity (PPOINT ppt)
COUNT pod_remainder, which_row;
COLOR crew_rows[] =
{
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1E,0x09), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1E,0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1B,0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x18,0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x15,0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x12,0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x10,0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x0D,0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x0A,0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x07,0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1E, 0x09), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1E, 0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1B, 0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x18, 0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x15, 0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x12, 0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x10, 0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x0D, 0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x0A, 0x00), 0x65),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x07, 0x00), 0x65),
};
pod_remainder = GLOBAL_SIS (CrewEnlisted) - capacity;
@@ -1155,10 +1172,10 @@ GetSBayCapacity (PPOINT ppt)
BUILD_COLOR (MAKE_RGB15 (0x15, 0x15, 0x15), 0x15),
BUILD_COLOR (MAKE_RGB15 (0x12, 0x12, 0x12), 0x17),
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19),
BUILD_COLOR (MAKE_RGB15 (0xD, 0xD, 0xD), 0x1B),
BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x1D),
BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F),
BUILD_COLOR (MAKE_RGB15 (0x5, 0x5, 0x5), 0x21),
BUILD_COLOR (MAKE_RGB15 (0x0D, 0x0D, 0x0D), 0x1B),
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x1D),
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F),
BUILD_COLOR (MAKE_RGB15 (0x05, 0x05, 0x05), 0x21),
};
bay_remainder = GLOBAL_SIS (TotalElementMass) - capacity;
@@ -1207,14 +1224,14 @@ GetFTankCapacity (PPOINT ppt)
COUNT which_row;
COLOR fuel_colors[] =
{
BUILD_COLOR (MAKE_RGB15 (0xF, 0x00, 0x00), 0x2D),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2D),
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2C),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2B),
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2A),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x3, 0x00), 0x7F),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x7, 0x00), 0x7E),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0xA, 0x00), 0x7D),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0xE, 0x00), 0x7C),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7F),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7E),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x00), 0x7D),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7C),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7B),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7A),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x18, 0x00), 0x79),
sc2/src/sc2code/starbase.c
+2 -1
View File
@@ -67,7 +67,8 @@ DrawBaseStateStrings (STARBASE_STATE OldState, STARBASE_STATE NewState)
t.CharCount = (COUNT)~0;
font_DrawText (&t);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0xA), 0x0E));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E));
t.baseline.y = 106 + 28 + (SAFE_Y + 4) + ((23 - 4) * NewState);
t.pStr = GAME_STRING (STARBASE_STRING_BASE + 1 + NewState);
t.CharCount = (COUNT)~0;
sc2/src/sc2code/status.c
+23 -17
View File
@@ -139,7 +139,8 @@ DrawBattleCrewAmount (STARSHIPPTR StarShipPtr)
sprintf (buf, "%u", StarShipPtr->RaceDescPtr->ship_info.crew_level);
SetContextFont (StarConFont);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08));
DrawFilledRectangle (&r);
SetContextForeGroundColor (BLACK_COLOR);
font_DrawText (&t);
@@ -179,12 +180,14 @@ DrawCaptainsWindow (STARSHIPPTR StarShipPtr)
r.corner.y = y_offs - 4;
r.extent.width = STATUS_WIDTH - CAPTAIN_XOFFS;
r.extent.height = SHIP_STATUS_HEIGHT - CAPTAIN_YOFFS + 2;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08));
DrawFilledRectangle (&r);
y = y_offs - CAPTAIN_YOFFS;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F));
r.corner.x = 1;
r.corner.y = SHIP_INFO_HEIGHT + y;
r.extent.width = 1;
@@ -194,7 +197,8 @@ DrawCaptainsWindow (STARSHIPPTR StarShipPtr)
++r.extent.height;
DrawFilledRectangle (&r);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19));
r.corner.x = STATUS_WIDTH - 1;
r.corner.y = SHIP_INFO_HEIGHT + y;
r.extent.width = 1;
@@ -213,7 +217,8 @@ DrawCaptainsWindow (STARSHIPPTR StarShipPtr)
DrawFilledRectangle (&r);
{
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x8, 0x8, 0x8), 0x1F));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F));
r.corner.x = 59;
r.corner.y = y_offs;
r.extent.width = 1;
@@ -225,7 +230,8 @@ DrawCaptainsWindow (STARSHIPPTR StarShipPtr)
r.extent.height = 1;
DrawFilledRectangle (&r);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19));
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19));
r.corner.x = 3;
r.extent.width = 57;
r.corner.y = y_offs - 1;
@@ -418,7 +424,7 @@ PostProcessStatus (PELEMENT ShipPtr)
{
COLOR flash_tab0[] =
{
BUILD_COLOR (MAKE_RGB15 (0xF, 0x00, 0x00), 0x2D),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2D),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x19, 0x19), 0x24),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7B),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1C, 0x00), 0x78),
@@ -440,20 +446,20 @@ PostProcessStatus (PELEMENT ShipPtr)
COLOR flash_tab1[] =
{
BUILD_COLOR (MAKE_RGB15 (0x1E, 0x1F, 0x12), 0x70),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0xA), 0x0E),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x00), 0x71),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1C, 0x00), 0x78),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x18, 0x00), 0x79),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7A),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7B),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0xE, 0x00), 0x7C),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0xA, 0x00), 0x7D),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x7, 0x00), 0x7E),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x3, 0x00), 0x7F),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7C),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x00), 0x7D),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7E),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7F),
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2A),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2B),
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2C),
BUILD_COLOR (MAKE_RGB15 (0xF, 0x00, 0x00), 0x2D),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2D),
};
c = flash_tab1[i];
@@ -484,7 +490,7 @@ PostProcessStatus (PELEMENT ShipPtr)
case 1:
r.corner.x = CAPTAIN_XOFFS + 16;
i = CAPTAIN_WIDTH - ((17 + 1) << 1);
c = BUILD_COLOR (MAKE_RGB15 (0x7, 0x00, 0x00), 0x2F);
c = BUILD_COLOR (MAKE_RGB15 (0x07, 0x00, 0x00), 0x2F);
break;
case 2:
r.corner.x = CAPTAIN_XOFFS + 18;
@@ -500,7 +506,7 @@ PostProcessStatus (PELEMENT ShipPtr)
r.corner.x = CAPTAIN_XOFFS + 25;
i = 1;
r.extent.width = 2;
c = BUILD_COLOR (MAKE_RGB15 (0x1F, 0x50, 0x5), 0x28);
c = BUILD_COLOR (MAKE_RGB15 (0x1F, 0x50, 0x05), 0x28);
break;
default:
// Should not happen.
@@ -522,8 +528,8 @@ PostProcessStatus (PELEMENT ShipPtr)
COLOR flash_tab2[] =
{
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2B),
BUILD_COLOR (MAKE_RGB15 (0xF, 0x00, 0x00), 0x2D),
BUILD_COLOR (MAKE_RGB15 (0xB, 0x00, 0x00), 0x2E),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2D),
BUILD_COLOR (MAKE_RGB15 (0x0B, 0x00, 0x00), 0x2E),
};
c = flash_tab2[i];