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

All graphics operations use 24-bits colors at the game level too now,

Browse Source 
instead of 16 bits colors. Using a structure 'Color' instead of 'COLOR'
and 'TFB_Palette' now.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3367 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2009-11-29 15:29:38 +00:00
parent af41b0f118
commit e6b2bc9930
83 changed files with 785 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+2
View File
@@ -1,4 +1,6 @@
Changes towards version 0.7: Changes towards version 0.7:
- All graphics operations use 24-bits colors at the game level too now,
instead of 16 bits colors. - SvdB
- Cross-platform safemode (ignores uqm.cfg, bug #946) - Michael - Cross-platform safemode (ignores uqm.cfg, bug #946) - Michael
- Correct Chmmr response when asking about Sa-Matra (bug #1073) - Alex - Correct Chmmr response when asking about Sa-Matra (bug #1073) - Alex
- Refactored universe generation - SvdB - Refactored universe generation - SvdB
sc2/build/msvc6/UrQuanMasters.dsp
-4
View File
@@ -481,10 +481,6 @@ SOURCE=..\..\src\libs\graphics\gfxintrn.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\libs\graphics\gfxother.h
# End Source File
# Begin Source File
SOURCE=..\..\src\libs\graphics\intersec.c SOURCE=..\..\src\libs\graphics\intersec.c
# End Source File # End Source File
# Begin Source File # Begin Source File
sc2/src/libs/gfxlib.h
+84 -14
View File
@@ -38,12 +38,36 @@ typedef UWORD TIME_VALUE;
#define MAX_TIME_VALUE ((1 << TIME_SHIFT) + 1) #define MAX_TIME_VALUE ((1 << TIME_SHIFT) + 1)
typedef SWORD COORD; typedef SWORD COORD;
typedef DWORD COLOR;
#define BUILD_COLOR(c32k,c256) \ typedef struct Color {
(COLOR)(((DWORD)(c32k)<<8)|(BYTE)(c256)) BYTE r;
// BUILD_COLOR combines a 15-bit RGB color tripple with a BYTE g;
BYTE b;
BYTE a; // Currently unused
} Color;
static inline bool
sameColor(Color c1, Color c2)
{
return c1.r == c2.r &&
c1.g == c2.g &&
c1.b == c2.b &&
c1.a == c2.a;
}
// Transform a 5-bits color component to an 8-bits color component.
// Form 1, calculates '(r5 / 31.0) * 255.0, highest value is 0xff:
#define CC5TO8(c) (((c) << 3) | ((c) >> 2))
// Form 2, calculates '(r5 / 32.0) * 256.0, highest value is 0xf8:
//#define CC5TO8(c) ((c) << 3)
#define BUILD_COLOR(col, c256) col
// BUILD_COLOR used to combine a 15-bit RGB color tripple with a
// destination VGA palette index into a 32-bit value. // destination VGA palette index into a 32-bit value.
// Now, it is an empty wrapper which returns the first argument,
// which is of type Color, and ignores the second argument,
// the palette index.
//
// It is a remnant of 8bpp hardware paletted display (VGA). // It is a remnant of 8bpp hardware paletted display (VGA).
// The palette index would be overwritten with the RGB value // The palette index would be overwritten with the RGB value
// and the drawing op would use this index on screen. // and the drawing op would use this index on screen.
@@ -54,10 +78,56 @@ typedef DWORD COLOR;
// the standard ones (see colors.h; most likely unchanged from SC1) // the standard ones (see colors.h; most likely unchanged from SC1)
// The palette index is meaningless in UQM for the most part. // The palette index is meaningless in UQM for the most part.
// New code should just use index 0. // New code should just use index 0.
#define COLOR_32k(c) (UWORD)((COLOR)(c)>>8)
#define COLOR_256(c) LOBYTE((COLOR)c) // Turn a 15 bits color into a 24-bits color.
#define MAKE_RGB15(r,g,b) (UWORD)(((r)<<10)|((g)<<5)|(b)) // r, g, and b are each 5-bits color components.
#define BUILD_COLOR_RGBA(r,g,b,a) (DWORD)(((r)<<24)|((g)<<16)|((b)<<8)|(a)) static inline Color
colorFromRgb15 (BYTE r, BYTE g, BYTE b)
{
Color c;
c.r = CC5TO8 (r);
c.g = CC5TO8 (g);
c.b = CC5TO8 (b);
c.a = 0;
return c;
}
#define MAKE_RGB15(r, g, b) colorFromRgb15 ((r), (g), (b))
#ifdef NOTYET /* Need C'99 support */
#define MAKE_RGB15(r, g, b) (Color) { \
.r = CC5TO8 (r), \
.g = CC5TO8 (g), \
.b = CC5TO8 (b), \
.a = 0 \
}
#endif
// Temporary, until we can use C'99 features. Then MAKE_RGB15 will be usable
// anywhere.
// This define is intended for global initialisations, where the
// expression must be constant.
#define MAKE_RGB15_INIT(r, g, b) { \
CC5TO8 (r), \
CC5TO8 (g), \
CC5TO8 (b), \
0 \
}
static inline Color
buildColorRgba (BYTE r, BYTE g, BYTE b, BYTE a)
{
Color c;
c.r = r;
c.g = g;
c.b = b;
c.a = a;
return c;
}
#define BUILD_COLOR_RGBA(r, g, b, a) \
buildColorRgba ((r), (g), (b), (a))
typedef BYTE CREATE_FLAGS; typedef BYTE CREATE_FLAGS;
#define WANT_MASK (CREATE_FLAGS)(1 << 0) #define WANT_MASK (CREATE_FLAGS)(1 << 0)
@@ -168,10 +238,10 @@ extern BOOLEAN InitGraphics (int argc, char *argv[], COUNT
extern void UninitGraphics (void); extern void UninitGraphics (void);
extern CONTEXT SetContext (CONTEXT Context); extern CONTEXT SetContext (CONTEXT Context);
extern COLOR SetContextForeGroundColor (COLOR Color); extern Color SetContextForeGroundColor (Color Color);
extern COLOR GetContextForeGroundColor (void); extern Color GetContextForeGroundColor (void);
extern COLOR SetContextBackGroundColor (COLOR Color); extern Color SetContextBackGroundColor (Color Color);
extern COLOR GetContextBackGroundColor (void); extern Color GetContextBackGroundColor (void);
extern FRAME SetContextFGFrame (FRAME Frame); extern FRAME SetContextFGFrame (FRAME Frame);
extern FRAME GetContextFGFrame (void); extern FRAME GetContextFGFrame (void);
extern BOOLEAN SetContextClipping (BOOLEAN ClipStatus); extern BOOLEAN SetContextClipping (BOOLEAN ClipStatus);
@@ -186,7 +256,7 @@ extern void DrawRectangle (RECT *pRect);
extern void DrawFilledRectangle (RECT *pRect); extern void DrawFilledRectangle (RECT *pRect);
extern void DrawLine (LINE *pLine); extern void DrawLine (LINE *pLine);
extern void font_DrawText (TEXT *pText); extern void font_DrawText (TEXT *pText);
extern void font_DrawTracedText (TEXT *pText, COLOR text, COLOR trace); extern void font_DrawTracedText (TEXT *pText, Color text, Color trace);
extern void DrawBatch (PRIMITIVE *pBasePrim, PRIM_LINKS PrimLinks, extern void DrawBatch (PRIMITIVE *pBasePrim, PRIM_LINKS PrimLinks,
BATCH_FLAGS BatchFlags); BATCH_FLAGS BatchFlags);
extern void BatchGraphics (void); extern void BatchGraphics (void);
@@ -236,7 +306,7 @@ extern FRAME SetEquFrameIndex (FRAME DstFrame, FRAME SrcFrame);
extern FRAME IncFrameIndex (FRAME Frame); extern FRAME IncFrameIndex (FRAME Frame);
extern FRAME DecFrameIndex (FRAME Frame); extern FRAME DecFrameIndex (FRAME Frame);
extern DRAWABLE RotateFrame (FRAME Frame, int angle_deg); extern DRAWABLE RotateFrame (FRAME Frame, int angle_deg);
extern void SetFrameTransparentColor (FRAME Frame, COLOR c32k); extern void SetFrameTransparentColor (FRAME Frame, Color c32k);
extern FRAME CaptureDrawable (DRAWABLE Drawable); extern FRAME CaptureDrawable (DRAWABLE Drawable);
extern DRAWABLE ReleaseDrawable (FRAME Frame); extern DRAWABLE ReleaseDrawable (FRAME Frame);
sc2/src/libs/graphics/cmap.c
+11 -11
View File
@@ -41,7 +41,7 @@ typedef struct xform_control
SIZE Ticks; SIZE Ticks;
DWORD StartTime; DWORD StartTime;
DWORD EndTime; DWORD EndTime;
TFB_Palette OldCMap[NUMBER_OF_PLUTVALS]; Color OldCMap[NUMBER_OF_PLUTVALS];
} XFORM_CONTROL; } XFORM_CONTROL;
#define MAX_XFORMS 16 #define MAX_XFORMS 16
@@ -225,7 +225,7 @@ TFB_GetColorMap (int index)
} }
void void
TFB_ColorMapToRGB (TFB_Palette *pal, int index) TFB_ColorMapToRGB (Color *pal, int index)
{ {
TFB_ColorMap *map = NULL; TFB_ColorMap *map = NULL;
@@ -239,7 +239,7 @@ TFB_ColorMapToRGB (TFB_Palette *pal, int index)
return; return;
} }
memcpy (pal, map->colors, sizeof (map->colors)); memcpy (pal, map->colors, sizeof map->colors);
} }
BOOLEAN BOOLEAN
@@ -288,7 +288,7 @@ SetColorMap (COLORMAPPTR map)
for (mpp = colormaps + start; start <= end; ++start, ++mpp) for (mpp = colormaps + start; start <= end; ++start, ++mpp)
{ {
int i; int i;
TFB_Palette *pal; Color *pal;
TFB_ColorMap *newmap; TFB_ColorMap *newmap;
TFB_ColorMap *oldmap; TFB_ColorMap *oldmap;
@@ -464,7 +464,7 @@ XFormColorMap_step (void)
#define XFORM_SCALE 0x10000 #define XFORM_SCALE 0x10000
TFB_ColorMap *newmap = NULL; TFB_ColorMap *newmap = NULL;
UBYTE *pNewCMap; UBYTE *pNewCMap;
TFB_Palette *pCurCMap, *pOldCMap; Color *pCurCMap, *pOldCMap;
int frac; int frac;
int i; int i;
@@ -480,16 +480,16 @@ XFormColorMap_step (void)
for (i = 0; i < NUMBER_OF_PLUTVALS; i++, ++pCurCMap, ++pOldCMap) for (i = 0; i < NUMBER_OF_PLUTVALS; i++, ++pCurCMap, ++pOldCMap)
{ {
pCurCMap->r = (UBYTE)(pOldCMap->r + ((int)*pNewCMap - pOldCMap->r) pCurCMap->r = (UBYTE)(pOldCMap->r +
* frac / XFORM_SCALE); ((int)*pNewCMap - pOldCMap->r) * frac / XFORM_SCALE);
pNewCMap++; pNewCMap++;
pCurCMap->g = (UBYTE)(pOldCMap->g + ((int)*pNewCMap - pOldCMap->g) pCurCMap->g = (UBYTE)(pOldCMap->g +
* frac / XFORM_SCALE); ((int)*pNewCMap - pOldCMap->g) * frac / XFORM_SCALE);
pNewCMap++; pNewCMap++;
pCurCMap->b = (UBYTE)(pOldCMap->b + ((int)*pNewCMap - pOldCMap->b) pCurCMap->b = (UBYTE)(pOldCMap->b +
* frac / XFORM_SCALE); ((int)*pNewCMap - pOldCMap->b) * frac / XFORM_SCALE);
pNewCMap++; pNewCMap++;
} }
sc2/src/libs/graphics/cmap.h
+2 -2
View File
@@ -40,7 +40,7 @@
typedef struct tfb_colormap typedef struct tfb_colormap
{ {
TFB_Palette colors[NUMBER_OF_PLUTVALS]; Color colors[NUMBER_OF_PLUTVALS];
int index; int index;
int version; int version;
int refcount; int refcount;
@@ -52,7 +52,7 @@ extern volatile int FadeAmount;
extern void InitColorMaps (void); extern void InitColorMaps (void);
extern void UninitColorMaps (void); extern void UninitColorMaps (void);
extern void TFB_ColorMapToRGB (TFB_Palette *pal, int colormap_index); extern void TFB_ColorMapToRGB (Color *pal, int colormap_index);
extern TFB_ColorMap * TFB_GetColorMap (int index); extern TFB_ColorMap * TFB_GetColorMap (int index);
extern void TFB_ReturnColorMap (TFB_ColorMap *map); extern void TFB_ReturnColorMap (TFB_ColorMap *map);
sc2/src/libs/graphics/context.c
+15 -17
View File
@@ -17,7 +17,6 @@
*/ */
#include "gfxintrn.h" #include "gfxintrn.h"
#include "gfxother.h"
GRAPHICS_STATUS _GraphicsStatusFlags; GRAPHICS_STATUS _GraphicsStatusFlags;
CONTEXT _pCurContext; CONTEXT _pCurContext;
@@ -145,30 +144,30 @@ DestroyContext (CONTEXT ContextRef)
return TRUE; return TRUE;
} }
COLOR Color
SetContextForeGroundColor (COLOR Color) SetContextForeGroundColor (Color color)
{ {
COLOR oldColor; Color oldColor;
if (!ContextActive ()) if (!ContextActive ())
return (BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F)); return (BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F));
oldColor = _get_context_fg_color (); oldColor = _get_context_fg_color ();
if (oldColor != Color) if (!sameColor(oldColor, color))
{ {
SwitchContextForeGroundColor (Color); SwitchContextForeGroundColor (color);
if (!(_get_context_fbk_flags () & FBK_IMAGE)) if (!(_get_context_fbk_flags () & FBK_IMAGE))
{ {
SetContextFBkFlags (FBK_DIRTY); SetContextFBkFlags (FBK_DIRTY);
} }
} }
SetPrimColor (&_locPrim, Color); SetPrimColor (&_locPrim, color);
return (oldColor); return (oldColor);
} }
COLOR Color
GetContextForeGroundColor (void) GetContextForeGroundColor (void)
{ {
if (!ContextActive ()) if (!ContextActive ())
@@ -177,22 +176,22 @@ GetContextForeGroundColor (void)
return _get_context_fg_color (); return _get_context_fg_color ();
} }
COLOR Color
SetContextBackGroundColor (COLOR Color) SetContextBackGroundColor (Color color)
{ {
COLOR oldColor; Color oldColor;
if (!ContextActive ()) if (!ContextActive ())
return (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00)); return (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00));
oldColor = _get_context_bg_color (); oldColor = _get_context_bg_color ();
if (oldColor != Color) if (!sameColor(oldColor, color))
SwitchContextBackGroundColor (Color); SwitchContextBackGroundColor (color);
return (oldColor); return oldColor;
} }
COLOR Color
GetContextBackGroundColor (void) GetContextBackGroundColor (void)
{ {
if (!ContextActive ()) if (!ContextActive ())
@@ -301,10 +300,9 @@ FixContextFontEffect (void)
} }
else else
{ // solid color backing { // solid color backing
TFB_Palette color;
RECT r = { {0, 0}, {w, h} }; RECT r = { {0, 0}, {w, h} };
Color color = _get_context_fg_color ();
COLORtoPalette (_get_context_fg_color (), &color);
TFB_DrawImage_Rect (&r, color.r, color.g, color.b, img); TFB_DrawImage_Rect (&r, color.r, color.g, color.b, img);
} }
sc2/src/libs/graphics/context.h
+1 -1
View File
@@ -30,7 +30,7 @@ struct context_desc
{ {
UWORD Flags; UWORD Flags;
COLOR ForeGroundColor, BackGroundColor; Color ForeGroundColor, BackGroundColor;
FRAME ForeGroundFrame; FRAME ForeGroundFrame;
FONT Font; FONT Font;
sc2/src/libs/graphics/drawable.c
+2 -5
View File
@@ -19,7 +19,6 @@
#include "gfxintrn.h" #include "gfxintrn.h"
#include "libs/memlib.h" #include "libs/memlib.h"
#include "tfb_draw.h" #include "tfb_draw.h"
#include "gfxother.h"
#include <math.h> #include <math.h>
#ifndef M_PI #ifndef M_PI
@@ -251,12 +250,10 @@ RotateFrame (FRAME Frame, int angle_deg)
return Drawable; return Drawable;
} }
// color.a is ignored
void void
SetFrameTransparentColor (FRAME Frame, COLOR c32k) SetFrameTransparentColor (FRAME Frame, Color color)
{ {
TFB_Palette color;
COLORtoPalette (c32k, &color);
TFB_DrawCanvas_SetTransparentColor (Frame->image->NormalImg, TFB_DrawCanvas_SetTransparentColor (Frame->image->NormalImg,
color.r, color.g, color.b, FALSE); color.r, color.g, color.b, FALSE);
} }
sc2/src/libs/graphics/font.c
+2 -6
View File
@@ -18,7 +18,6 @@
#include "gfxintrn.h" #include "gfxintrn.h"
#include "tfb_prim.h" #include "tfb_prim.h"
#include "gfxother.h"
#include "libs/log.h" #include "libs/log.h"
extern void FixContextFontEffect (void); extern void FixContextFontEffect (void);
@@ -64,10 +63,10 @@ font_DrawText (TEXT *lpText)
* background color one pixel shifted to all 4 directions. * background color one pixel shifted to all 4 directions.
*/ */
void void
font_DrawTracedText (TEXT *pText, COLOR text, COLOR trace) font_DrawTracedText (TEXT *pText, Color text, Color trace)
{ {
// Preserve current foreground color for full correctness // Preserve current foreground color for full correctness
COLOR oldfg = SetContextForeGroundColor (trace); Color oldfg = SetContextForeGroundColor (trace);
pText->baseline.x--; pText->baseline.x--;
font_DrawText (pText); font_DrawText (pText);
pText->baseline.x += 2; pText->baseline.x += 2;
@@ -235,7 +234,6 @@ _text_blt (RECT *pClipRect, PRIMITIVE *PrimPtr)
const unsigned char *pStr; const unsigned char *pStr;
TEXT *TextPtr; TEXT *TextPtr;
POINT origin; POINT origin;
TFB_Palette color;
TFB_Image *backing; TFB_Image *backing;
FontPtr = _CurFontPtr; FontPtr = _CurFontPtr;
@@ -245,8 +243,6 @@ _text_blt (RECT *pClipRect, PRIMITIVE *PrimPtr)
if (!backing) if (!backing)
return; return;
COLORtoPalette (_get_context_fg_color (), &color);
TextPtr = &PrimPtr->Object.Text; TextPtr = &PrimPtr->Object.Text;
origin.x = _save_stamp.origin.x; origin.x = _save_stamp.origin.x;
origin.y = TextPtr->baseline.y; origin.y = TextPtr->baseline.y;
sc2/src/libs/graphics/frame.c
+30 -45
View File
@@ -20,7 +20,6 @@
#include "gfx_common.h" #include "gfx_common.h"
#include "tfb_draw.h" #include "tfb_draw.h"
#include "tfb_prim.h" #include "tfb_prim.h"
#include "gfxother.h"
HOT_SPOT HOT_SPOT
MAKE_HOT_SPOT (COORD x, COORD y) MAKE_HOT_SPOT (COORD x, COORD y)
@@ -45,7 +44,7 @@ typedef struct
{ {
PRIM_LINKS Links; PRIM_LINKS Links;
GRAPHICS_PRIM Type; GRAPHICS_PRIM Type;
COLOR Color; Color Color;
INTERNAL_PRIM_DESC Object; INTERNAL_PRIM_DESC Object;
} INTERNAL_PRIMITIVE; } INTERNAL_PRIMITIVE;
@@ -84,10 +83,8 @@ GetFrameValidRect (RECT *pValidRect, HOT_SPOT *pOldHot)
void void
ClearBackGround (RECT *pClipRect) ClearBackGround (RECT *pClipRect)
{ {
TFB_Palette color; Color color = _get_context_bg_color ();
TFB_Prim_FillRect (pClipRect, color);
COLORtoPalette (_get_context_bg_color (), &color);
TFB_Prim_FillRect (pClipRect, &color);
} }
void void
@@ -103,9 +100,7 @@ DrawBatch (PRIMITIVE *lpBasePrim, PRIM_LINKS PrimLinks,
PRIM_LINKS OldLinks; PRIM_LINKS OldLinks;
PRIMITIVE *lpPrim; PRIMITIVE *lpPrim;
BatchFlags &= BATCH_SINGLE BatchFlags &= BATCH_SINGLE | BATCH_BUILD_PAGE | BATCH_XFORM;
| BATCH_BUILD_PAGE
| BATCH_XFORM;
BatchFlags |= _get_context_flags () & BATCH_CLIP_GRAPHICS; BatchFlags |= _get_context_flags () & BATCH_CLIP_GRAPHICS;
@@ -131,12 +126,13 @@ DrawBatch (PRIMITIVE *lpBasePrim, PRIM_LINKS PrimLinks,
} }
} }
for (; CurIndex != END_OF_LIST; CurIndex = GetSuccLink (GetPrimLinks (lpPrim))) for (; CurIndex != END_OF_LIST;
CurIndex = GetSuccLink (GetPrimLinks (lpPrim)))
{ {
GRAPHICS_PRIM PrimType; GRAPHICS_PRIM PrimType;
PRIMITIVE *lpWorkPrim; PRIMITIVE *lpWorkPrim;
RECT ClipRect; RECT ClipRect;
TFB_Palette color; Color color;
lpPrim = &lpBasePrim[CurIndex]; lpPrim = &lpBasePrim[CurIndex];
PrimType = GetPrimType (lpPrim); PrimType = GetPrimType (lpPrim);
@@ -148,19 +144,19 @@ DrawBatch (PRIMITIVE *lpBasePrim, PRIM_LINKS PrimLinks,
switch (PrimType) switch (PrimType)
{ {
case POINT_PRIM: case POINT_PRIM:
COLORtoPalette (GetPrimColor (lpWorkPrim), &color); color = GetPrimColor (lpWorkPrim);
TFB_Prim_Point (&lpWorkPrim->Object.Point, &color); TFB_Prim_Point (&lpWorkPrim->Object.Point, color);
break; break;
case STAMP_PRIM: case STAMP_PRIM:
TFB_Prim_Stamp (&lpWorkPrim->Object.Stamp); TFB_Prim_Stamp (&lpWorkPrim->Object.Stamp);
break; break;
case STAMPFILL_PRIM: case STAMPFILL_PRIM:
COLORtoPalette (GetPrimColor (lpWorkPrim), &color); color = GetPrimColor (lpWorkPrim);
TFB_Prim_StampFill (&lpWorkPrim->Object.Stamp, &color); TFB_Prim_StampFill (&lpWorkPrim->Object.Stamp, color);
break; break;
case LINE_PRIM: case LINE_PRIM:
COLORtoPalette (GetPrimColor (lpWorkPrim), &color); color = GetPrimColor (lpWorkPrim);
TFB_Prim_Line (&lpWorkPrim->Object.Line, &color); TFB_Prim_Line (&lpWorkPrim->Object.Line, color);
break; break;
case TEXT_PRIM: case TEXT_PRIM:
if (!TextRect (&lpWorkPrim->Object.Text, if (!TextRect (&lpWorkPrim->Object.Text,
@@ -172,12 +168,12 @@ DrawBatch (PRIMITIVE *lpBasePrim, PRIM_LINKS PrimLinks,
_text_blt (&ClipRect, lpWorkPrim); _text_blt (&ClipRect, lpWorkPrim);
break; break;
case RECT_PRIM: case RECT_PRIM:
COLORtoPalette (GetPrimColor (lpWorkPrim), &color); color = GetPrimColor (lpWorkPrim);
TFB_Prim_Rect (&lpWorkPrim->Object.Rect, &color); TFB_Prim_Rect (&lpWorkPrim->Object.Rect, color);
break; break;
case RECTFILL_PRIM: case RECTFILL_PRIM:
COLORtoPalette (GetPrimColor (lpWorkPrim), &color); color = GetPrimColor (lpWorkPrim);
TFB_Prim_FillRect (&lpWorkPrim->Object.Rect, &color); TFB_Prim_FillRect (&lpWorkPrim->Object.Rect, color);
break; break;
} }
} }
@@ -188,9 +184,7 @@ DrawBatch (PRIMITIVE *lpBasePrim, PRIM_LINKS PrimLinks,
if (BatchFlags & BATCH_SINGLE) if (BatchFlags & BATCH_SINGLE)
SetPrimLinks (lpBasePrim, SetPrimLinks (lpBasePrim,
GetPredLink (OldLinks), GetPredLink (OldLinks), GetSuccLink (OldLinks));
GetSuccLink (OldLinks));
} }
} }
@@ -218,10 +212,8 @@ DrawPoint (POINT *lpPoint)
if (GraphicsSystemActive () && GetFrameValidRect (&ValidRect, &OldHot)) if (GraphicsSystemActive () && GetFrameValidRect (&ValidRect, &OldHot))
{ {
TFB_Palette color; Color color = GetPrimColor (&_locPrim);
TFB_Prim_Point (lpPoint, color);
COLORtoPalette (GetPrimColor (&_locPrim), &color);
TFB_Prim_Point (lpPoint, &color);
_CurFramePtr->HotSpot = OldHot; _CurFramePtr->HotSpot = OldHot;
} }
} }
@@ -234,10 +226,8 @@ DrawRectangle (RECT *lpRect)
if (GraphicsSystemActive () && GetFrameValidRect (&ValidRect, &OldHot)) if (GraphicsSystemActive () && GetFrameValidRect (&ValidRect, &OldHot))
{ {
TFB_Palette color; Color color = GetPrimColor (&_locPrim);
TFB_Prim_Rect (lpRect, color);
COLORtoPalette (GetPrimColor (&_locPrim), &color);
TFB_Prim_Rect (lpRect, &color);
_CurFramePtr->HotSpot = OldHot; _CurFramePtr->HotSpot = OldHot;
} }
} }
@@ -250,10 +240,8 @@ DrawFilledRectangle (RECT *lpRect)
if (GraphicsSystemActive () && GetFrameValidRect (&ValidRect, &OldHot)) if (GraphicsSystemActive () && GetFrameValidRect (&ValidRect, &OldHot))
{ {
TFB_Palette color; Color color = GetPrimColor (&_locPrim);
TFB_Prim_FillRect (lpRect, color);
COLORtoPalette (GetPrimColor (&_locPrim), &color);
TFB_Prim_FillRect (lpRect, &color);
_CurFramePtr->HotSpot = OldHot; _CurFramePtr->HotSpot = OldHot;
} }
} }
@@ -266,12 +254,10 @@ DrawLine (LINE *lpLine)
if (GraphicsSystemActive () && GetFrameValidRect (&ValidRect, &OldHot)) if (GraphicsSystemActive () && GetFrameValidRect (&ValidRect, &OldHot))
{ {
TFB_Palette color; Color color = GetPrimColor (&_locPrim);
TFB_Prim_Line (lpLine, color);
COLORtoPalette (GetPrimColor (&_locPrim), &color);
TFB_Prim_Line (lpLine, &color);
_CurFramePtr->HotSpot = OldHot; _CurFramePtr->HotSpot = OldHot;
} }
} }
void void
@@ -295,10 +281,9 @@ DrawFilledStamp (STAMP *stmp)
if (GraphicsSystemActive () && GetFrameValidRect (&ValidRect, &OldHot)) if (GraphicsSystemActive () && GetFrameValidRect (&ValidRect, &OldHot))
{ {
TFB_Palette color; Color color = GetPrimColor (&_locPrim);
TFB_Prim_StampFill (stmp, color);
COLORtoPalette (GetPrimColor (&_locPrim), &color);
TFB_Prim_StampFill (stmp, &color);
_CurFramePtr->HotSpot = OldHot; _CurFramePtr->HotSpot = OldHot;
} }
} }
sc2/src/libs/graphics/gfxother.h
-32
View File
@@ -1,32 +0,0 @@
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef GFXOTHER_H
#define GFXOTHER_H
#include "gfxintrn.h"
#include "tfb_draw.h"
static inline void
COLORtoPalette (DWORD c32k, TFB_Palette* color)
{
c32k >>= 8; // shift out color index
color->r = (UBYTE)((c32k >> (10 - (8 - 5))) & 0xF8);
color->g = (UBYTE)((c32k >> (5 - (8 - 5))) & 0xF8);
color->b = (UBYTE)((c32k << (8 - 5)) & 0xF8);
}
#endif /* GFXOTHER */
sc2/src/libs/graphics/prim.h
+3 -3
View File
@@ -45,7 +45,7 @@ typedef struct
{ {
PRIM_LINKS Links; PRIM_LINKS Links;
GRAPHICS_PRIM Type; GRAPHICS_PRIM Type;
COLOR Color; Color color;
PRIM_DESC Object; PRIM_DESC Object;
} PRIMITIVE; } PRIMITIVE;
@@ -58,8 +58,8 @@ typedef struct
#define GetPrimLinks(pPrim) ((pPrim)->Links) #define GetPrimLinks(pPrim) ((pPrim)->Links)
#define SetPrimType(pPrim,t) ((pPrim)->Type = t) #define SetPrimType(pPrim,t) ((pPrim)->Type = t)
#define GetPrimType(pPrim) ((pPrim)->Type) #define GetPrimType(pPrim) ((pPrim)->Type)
#define SetPrimColor(pPrim,c) ((pPrim)->Color = c) #define SetPrimColor(pPrim,c) ((pPrim)->color = c)
#define GetPrimColor(pPrim) ((pPrim)->Color) #define GetPrimColor(pPrim) ((pPrim)->color)
static inline void static inline void
SetPrimNextLink (PRIMITIVE *pPrim, COUNT Link) SetPrimNextLink (PRIMITIVE *pPrim, COUNT Link)
sc2/src/libs/graphics/sdl/canvas.c
+10 -8
View File
@@ -84,7 +84,7 @@ TFB_DrawCanvas_Image (TFB_Image *img, int x, int y, int scale,
{ {
SDL_Rect srcRect, targetRect, *pSrcRect; SDL_Rect srcRect, targetRect, *pSrcRect;
SDL_Surface *surf; SDL_Surface *surf;
TFB_Palette* palette; Color *palette;
if (img == 0) if (img == 0)
{ {
@@ -483,7 +483,8 @@ TFB_DrawCanvas_New_ForScreen (int w, int h, BOOLEAN withalpha)
} }
TFB_Canvas TFB_Canvas
TFB_DrawCanvas_New_Paletted (int w, int h, TFB_Palette *palette, int transparent_index) TFB_DrawCanvas_New_Paletted (int w, int h, Color *palette,
int transparent_index)
{ {
SDL_Surface *new_surf; SDL_Surface *new_surf;
new_surf = SDL_CreateRGBSurface (SDL_SWSURFACE, w, h, 8, 0, 0, 0, 0); new_surf = SDL_CreateRGBSurface (SDL_SWSURFACE, w, h, 8, 0, 0, 0, 0);
@@ -589,7 +590,7 @@ TFB_DrawCanvas_Delete (TFB_Canvas canvas)
log_add (log_Warning, "INTERNAL PANIC: Attempted" log_add (log_Warning, "INTERNAL PANIC: Attempted"
" to delete a NULL canvas!"); " to delete a NULL canvas!");
/* Should we actually die here? */ /* Should we actually die here? */
} }
else else
{ {
SDL_FreeSurface ((SDL_Surface *) canvas); SDL_FreeSurface ((SDL_Surface *) canvas);
@@ -597,11 +598,11 @@ TFB_DrawCanvas_Delete (TFB_Canvas canvas)
} }
TFB_Palette * Color *
TFB_DrawCanvas_ExtractPalette (TFB_Canvas canvas) TFB_DrawCanvas_ExtractPalette (TFB_Canvas canvas)
{ {
int i; int i;
TFB_Palette *result; Color *result;
SDL_Surface *surf = (SDL_Surface *)canvas; SDL_Surface *surf = (SDL_Surface *)canvas;
@@ -610,7 +611,7 @@ TFB_DrawCanvas_ExtractPalette (TFB_Canvas canvas)
return NULL; return NULL;
} }
result = (TFB_Palette*) HMalloc (sizeof (TFB_Palette) * 256); result = (Color *) HMalloc (sizeof (Color) * 256);
for (i = 0; i < 256; ++i) for (i = 0; i < 256; ++i)
{ {
result[i].r = surf->format->palette->colors[i].r; result[i].r = surf->format->palette->colors[i].r;
@@ -650,7 +651,7 @@ TFB_DrawCanvas_IsPaletted (TFB_Canvas canvas)
} }
void void
TFB_DrawCanvas_SetPalette (TFB_Canvas target, TFB_Palette *palette) TFB_DrawCanvas_SetPalette (TFB_Canvas target, Color *palette)
{ {
SDL_SetColors ((SDL_Surface *)target, (SDL_Color *)palette, 0, 256); SDL_SetColors ((SDL_Surface *)target, (SDL_Color *)palette, 0, 256);
} }
@@ -722,7 +723,8 @@ TFB_DrawCanvas_GetTransparentColor (TFB_Canvas canvas, int *r, int *g, int *b)
} }
void void
TFB_DrawCanvas_SetTransparentColor (TFB_Canvas canvas, int r, int g, int b, BOOLEAN rleaccel) TFB_DrawCanvas_SetTransparentColor (TFB_Canvas canvas, int r, int g, int b,
BOOLEAN rleaccel)
{ {
Uint32 color; Uint32 color;
int flags = SDL_SRCCOLORKEY; int flags = SDL_SRCCOLORKEY;
sc2/src/libs/graphics/tfb_draw.h
+47 -33
View File
@@ -32,14 +32,6 @@ typedef enum {
TFB_GFX_NUMSCREENS TFB_GFX_NUMSCREENS
} SCREEN; } SCREEN;
typedef struct tfb_palette
{
UBYTE r;
UBYTE g;
UBYTE b;
UBYTE unused;
} TFB_Palette;
#include "libs/graphics/gfx_common.h" #include "libs/graphics/gfx_common.h"
#include "cmap.h" #include "cmap.h"
@@ -49,7 +41,7 @@ typedef struct tfb_image
TFB_Canvas ScaledImg; TFB_Canvas ScaledImg;
TFB_Canvas MipmapImg; TFB_Canvas MipmapImg;
TFB_Canvas FilledImg; TFB_Canvas FilledImg;
TFB_Palette *Palette; Color *Palette;
int colormap_index; int colormap_index;
int colormap_version; int colormap_version;
HOT_SPOT NormalHs; HOT_SPOT NormalHs;
@@ -57,7 +49,7 @@ typedef struct tfb_image
HOT_SPOT last_scale_hs; HOT_SPOT last_scale_hs;
int last_scale; int last_scale;
int last_scale_type; int last_scale_type;
TFB_Palette last_fill; Color last_fill;
EXTENT extent; EXTENT extent;
Mutex mutex; Mutex mutex;
BOOLEAN dirty; BOOLEAN dirty;
@@ -87,15 +79,20 @@ typedef struct tfb_pixelformat
// Drawing commands // Drawing commands
void TFB_DrawScreen_Line (int x1, int y1, int x2, int y2, int r, int g, int b, SCREEN dest); void TFB_DrawScreen_Line (int x1, int y1, int x2, int y2, int r, int g, int b,
SCREEN dest);
void TFB_DrawScreen_Rect (RECT *rect, int r, int g, int b, SCREEN dest); void TFB_DrawScreen_Rect (RECT *rect, int r, int g, int b, SCREEN dest);
void TFB_DrawScreen_Image (TFB_Image *img, int x, int y, int scale, TFB_ColorMap *cmap, SCREEN dest); void TFB_DrawScreen_Image (TFB_Image *img, int x, int y, int scale,
TFB_ColorMap *cmap, SCREEN dest);
void TFB_DrawScreen_Copy (RECT *r, SCREEN src, SCREEN dest); void TFB_DrawScreen_Copy (RECT *r, SCREEN src, SCREEN dest);
void TFB_DrawScreen_FilledImage (TFB_Image *img, int x, int y, int scale, int r, int g, int b, SCREEN dest); void TFB_DrawScreen_FilledImage (TFB_Image *img, int x, int y, int scale,
void TFB_DrawScreen_FontChar (TFB_Char *, TFB_Image *backing, int x, int y, SCREEN dest); int r, int g, int b, SCREEN dest);
void TFB_DrawScreen_FontChar (TFB_Char *, TFB_Image *backing, int x, int y,
SCREEN dest);
void TFB_DrawScreen_CopyToImage (TFB_Image *img, RECT *lpRect, SCREEN src); void TFB_DrawScreen_CopyToImage (TFB_Image *img, RECT *lpRect, SCREEN src);
void TFB_DrawScreen_SetMipmap (TFB_Image *img, TFB_Image *mmimg, int hotx, int hoty); void TFB_DrawScreen_SetMipmap (TFB_Image *img, TFB_Image *mmimg, int hotx,
int hoty);
void TFB_DrawScreen_DeleteImage (TFB_Image *img); void TFB_DrawScreen_DeleteImage (TFB_Image *img);
void TFB_DrawScreen_DeleteData (void *); void TFB_DrawScreen_DeleteData (void *);
void TFB_DrawScreen_WaitForSignal (void); void TFB_DrawScreen_WaitForSignal (void);
@@ -105,20 +102,27 @@ void TFB_DrawScreen_Callback (void (*callback) (void *arg), void *arg);
TFB_Image *TFB_DrawImage_New (TFB_Canvas canvas); TFB_Image *TFB_DrawImage_New (TFB_Canvas canvas);
TFB_Image *TFB_DrawImage_CreateForScreen (int w, int h, BOOLEAN withalpha); TFB_Image *TFB_DrawImage_CreateForScreen (int w, int h, BOOLEAN withalpha);
TFB_Image *TFB_DrawImage_New_Rotated (TFB_Image *img, int angle); TFB_Image *TFB_DrawImage_New_Rotated (TFB_Image *img, int angle);
void TFB_DrawImage_SetMipmap (TFB_Image *img, TFB_Image *mmimg, int hotx, int hoty); void TFB_DrawImage_SetMipmap (TFB_Image *img, TFB_Image *mmimg, int hotx,
int hoty);
void TFB_DrawImage_Delete (TFB_Image *image); void TFB_DrawImage_Delete (TFB_Image *image);
void TFB_DrawImage_FixScaling (TFB_Image *image, int target, int type); void TFB_DrawImage_FixScaling (TFB_Image *image, int target, int type);
void TFB_DrawImage_Line (int x1, int y1, int x2, int y2, int r, int g, int b, TFB_Image *dest); void TFB_DrawImage_Line (int x1, int y1, int x2, int y2, int r, int g, int b,
TFB_Image *dest);
void TFB_DrawImage_Rect (RECT *rect, int r, int g, int b, TFB_Image *image); void TFB_DrawImage_Rect (RECT *rect, int r, int g, int b, TFB_Image *image);
void TFB_DrawImage_Image (TFB_Image *img, int x, int y, int scale, TFB_ColorMap *cmap, TFB_Image *target); void TFB_DrawImage_Image (TFB_Image *img, int x, int y, int scale,
void TFB_DrawImage_FilledImage (TFB_Image *img, int x, int y, int scale, int r, int g, int b, TFB_Image *target); TFB_ColorMap *cmap, TFB_Image *target);
void TFB_DrawImage_FontChar (TFB_Char *, TFB_Image *backing, int x, int y, TFB_Image *target); void TFB_DrawImage_FilledImage (TFB_Image *img, int x, int y, int scale,
int r, int g, int b, TFB_Image *target);
void TFB_DrawImage_FontChar (TFB_Char *, TFB_Image *backing, int x, int y,
TFB_Image *target);
TFB_Canvas TFB_DrawCanvas_New_TrueColor (int w, int h, BOOLEAN hasalpha); TFB_Canvas TFB_DrawCanvas_New_TrueColor (int w, int h, BOOLEAN hasalpha);
TFB_Canvas TFB_DrawCanvas_New_ForScreen (int w, int h, BOOLEAN withalpha); TFB_Canvas TFB_DrawCanvas_New_ForScreen (int w, int h, BOOLEAN withalpha);
TFB_Canvas TFB_DrawCanvas_New_Paletted (int w, int h, TFB_Palette *palette, int transparent_index); TFB_Canvas TFB_DrawCanvas_New_Paletted (int w, int h, Color *palette,
TFB_Canvas TFB_DrawCanvas_New_ScaleTarget (TFB_Canvas canvas, TFB_Canvas oldcanvas, int type, int last_type); int transparent_index);
TFB_Canvas TFB_DrawCanvas_New_ScaleTarget (TFB_Canvas canvas,
TFB_Canvas oldcanvas, int type, int last_type);
TFB_Canvas TFB_DrawCanvas_New_RotationTarget (TFB_Canvas src, int angle); TFB_Canvas TFB_DrawCanvas_New_RotationTarget (TFB_Canvas src, int angle);
TFB_Canvas TFB_DrawCanvas_ToScreenFormat (TFB_Canvas canvas); TFB_Canvas TFB_DrawCanvas_ToScreenFormat (TFB_Canvas canvas);
BOOLEAN TFB_DrawCanvas_IsPaletted (TFB_Canvas canvas); BOOLEAN TFB_DrawCanvas_IsPaletted (TFB_Canvas canvas);
@@ -132,24 +136,32 @@ void TFB_DrawCanvas_Rescale_Trilinear (TFB_Canvas src, TFB_Canvas mipmap,
void TFB_DrawCanvas_GetScaledExtent (TFB_Canvas src_canvas, HOT_SPOT* src_hs, void TFB_DrawCanvas_GetScaledExtent (TFB_Canvas src_canvas, HOT_SPOT* src_hs,
TFB_Canvas src_mipmap, HOT_SPOT* mm_hs, TFB_Canvas src_mipmap, HOT_SPOT* mm_hs,
int scale, int type, EXTENT *size, HOT_SPOT *hs); int scale, int type, EXTENT *size, HOT_SPOT *hs);
void TFB_DrawCanvas_Rotate (TFB_Canvas src, TFB_Canvas dst, int angle, EXTENT size); void TFB_DrawCanvas_Rotate (TFB_Canvas src, TFB_Canvas dst, int angle,
EXTENT size);
void TFB_DrawCanvas_GetRotatedExtent (TFB_Canvas src, int angle, EXTENT *size); void TFB_DrawCanvas_GetRotatedExtent (TFB_Canvas src, int angle, EXTENT *size);
void TFB_DrawCanvas_GetExtent (TFB_Canvas canvas, EXTENT *size); void TFB_DrawCanvas_GetExtent (TFB_Canvas canvas, EXTENT *size);
void TFB_DrawCanvas_Delete (TFB_Canvas canvas); void TFB_DrawCanvas_Delete (TFB_Canvas canvas);
void TFB_DrawCanvas_Line (int x1, int y1, int x2, int y2, int r, int g, int b, TFB_Canvas dest); void TFB_DrawCanvas_Line (int x1, int y1, int x2, int y2, int r, int g, int b,
TFB_Canvas dest);
void TFB_DrawCanvas_Rect (RECT *rect, int r, int g, int b, TFB_Canvas image); void TFB_DrawCanvas_Rect (RECT *rect, int r, int g, int b, TFB_Canvas image);
void TFB_DrawCanvas_Image (TFB_Image *img, int x, int y, int scale, TFB_ColorMap *cmap, TFB_Canvas target); void TFB_DrawCanvas_Image (TFB_Image *img, int x, int y, int scale,
void TFB_DrawCanvas_FilledImage (TFB_Image *img, int x, int y, int scale, int r, int g, int b, TFB_Canvas target); TFB_ColorMap *cmap, TFB_Canvas target);
void TFB_DrawCanvas_FontChar (TFB_Char *, TFB_Image *backing, int x, int y, TFB_Canvas target); void TFB_DrawCanvas_FilledImage (TFB_Image *img, int x, int y, int scale,
int r, int g, int b, TFB_Canvas target);
void TFB_DrawCanvas_FontChar (TFB_Char *, TFB_Image *backing, int x, int y,
TFB_Canvas target);
TFB_Palette *TFB_DrawCanvas_ExtractPalette (TFB_Canvas canvas); Color *TFB_DrawCanvas_ExtractPalette (TFB_Canvas canvas);
void TFB_DrawCanvas_SetPalette (TFB_Canvas target, TFB_Palette *palette); void TFB_DrawCanvas_SetPalette (TFB_Canvas target, Color *palette);
int TFB_DrawCanvas_GetTransparentIndex (TFB_Canvas canvas); int TFB_DrawCanvas_GetTransparentIndex (TFB_Canvas canvas);
void TFB_DrawCanvas_SetTransparentIndex (TFB_Canvas canvas, int i, BOOLEAN rleaccel); void TFB_DrawCanvas_SetTransparentIndex (TFB_Canvas canvas, int i,
BOOLEAN TFB_DrawCanvas_GetTransparentColor (TFB_Canvas canvas, int *r, int *g, int *b); BOOLEAN rleaccel);
void TFB_DrawCanvas_SetTransparentColor (TFB_Canvas canvas, int r, int g, int b, BOOLEAN rleaccel); BOOLEAN TFB_DrawCanvas_GetTransparentColor (TFB_Canvas canvas,
int *r, int *g, int *b);
void TFB_DrawCanvas_SetTransparentColor (TFB_Canvas canvas,
int r, int g, int b, BOOLEAN rleaccel);
void TFB_DrawCanvas_CopyTransparencyInfo (TFB_Canvas src, TFB_Canvas dst); void TFB_DrawCanvas_CopyTransparencyInfo (TFB_Canvas src, TFB_Canvas dst);
void TFB_DrawCanvas_Initialize (void); void TFB_DrawCanvas_Initialize (void);
void TFB_DrawCanvas_Lock (TFB_Canvas canvas); void TFB_DrawCanvas_Lock (TFB_Canvas canvas);
@@ -157,8 +169,10 @@ void TFB_DrawCanvas_Unlock (TFB_Canvas canvas);
void TFB_DrawCanvas_GetScreenFormat (TFB_PixelFormat *fmt); void TFB_DrawCanvas_GetScreenFormat (TFB_PixelFormat *fmt);
int TFB_DrawCanvas_GetStride (TFB_Canvas canvas); int TFB_DrawCanvas_GetStride (TFB_Canvas canvas);
void *TFB_DrawCanvas_GetLine (TFB_Canvas canvas, int line); void *TFB_DrawCanvas_GetLine (TFB_Canvas canvas, int line);
void TFB_DrawCanvas_GetPixel (TFB_Canvas canvas, int x, int y, int *r, int *g, int *b); void TFB_DrawCanvas_GetPixel (TFB_Canvas canvas, int x, int y,
int *r, int *g, int *b);
TFB_Canvas TFB_GetScreenCanvas (SCREEN screen); TFB_Canvas TFB_GetScreenCanvas (SCREEN screen);
#endif #endif
sc2/src/libs/graphics/tfb_prim.c
+19 -14
View File
@@ -29,7 +29,7 @@
#include "libs/log.h" #include "libs/log.h"
void void
TFB_Prim_Point (POINT *p, TFB_Palette *color) TFB_Prim_Point (POINT *p, Color color)
{ {
RECT r; RECT r;
@@ -38,13 +38,14 @@ TFB_Prim_Point (POINT *p, TFB_Palette *color)
r.extent.width = r.extent.height = 1; r.extent.width = r.extent.height = 1;
if (_CurFramePtr->Type == SCREEN_DRAWABLE) if (_CurFramePtr->Type == SCREEN_DRAWABLE)
TFB_DrawScreen_Rect (&r, color->r, color->g, color->b, TFB_SCREEN_MAIN); TFB_DrawScreen_Rect (&r, color.r, color.g, color.b, TFB_SCREEN_MAIN);
else else
TFB_DrawImage_Rect (&r, color->r, color->g, color->b, _CurFramePtr->image); TFB_DrawImage_Rect (&r, color.r, color.g, color.b,
_CurFramePtr->image);
} }
void void
TFB_Prim_Rect (RECT *r, TFB_Palette *color) TFB_Prim_Rect (RECT *r, Color color)
{ {
RECT arm; RECT arm;
int gscale; int gscale;
@@ -69,7 +70,7 @@ TFB_Prim_Rect (RECT *r, TFB_Palette *color)
} }
void void
TFB_Prim_FillRect (RECT *r, TFB_Palette *color) TFB_Prim_FillRect (RECT *r, Color color)
{ {
RECT rect; RECT rect;
int gscale; int gscale;
@@ -93,13 +94,15 @@ TFB_Prim_FillRect (RECT *r, TFB_Palette *color)
} }
if (_CurFramePtr->Type == SCREEN_DRAWABLE) if (_CurFramePtr->Type == SCREEN_DRAWABLE)
TFB_DrawScreen_Rect (&rect, color->r, color->g, color->b, TFB_SCREEN_MAIN); TFB_DrawScreen_Rect (&rect, color.r, color.g, color.b,
TFB_SCREEN_MAIN);
else else
TFB_DrawImage_Rect (&rect, color->r, color->g, color->b, _CurFramePtr->image); TFB_DrawImage_Rect (&rect, color.r, color.g, color.b,
_CurFramePtr->image);
} }
void void
TFB_Prim_Line (LINE *line, TFB_Palette *color) TFB_Prim_Line (LINE *line, Color color)
{ {
int x1, y1, x2, y2; int x1, y1, x2, y2;
@@ -109,9 +112,11 @@ TFB_Prim_Line (LINE *line, TFB_Palette *color)
y2=line->second.y - _CurFramePtr->HotSpot.y; y2=line->second.y - _CurFramePtr->HotSpot.y;
if (_CurFramePtr->Type == SCREEN_DRAWABLE) if (_CurFramePtr->Type == SCREEN_DRAWABLE)
TFB_DrawScreen_Line (x1, y1, x2, y2, color->r, color->g, color->b, TFB_SCREEN_MAIN); TFB_DrawScreen_Line (x1, y1, x2, y2, color.r, color.g, color.b,
TFB_SCREEN_MAIN);
else else
TFB_DrawImage_Line (x1, y1, x2, y2, color->r, color->g, color->b, _CurFramePtr->image); TFB_DrawImage_Line (x1, y1, x2, y2, color.r, color.g, color.b,
_CurFramePtr->image);
} }
void void
@@ -164,7 +169,7 @@ TFB_Prim_Stamp (STAMP *stmp)
} }
void void
TFB_Prim_StampFill (STAMP *stmp, TFB_Palette *color) TFB_Prim_StampFill (STAMP *stmp, Color color)
{ {
int x, y; int x, y;
FRAME SrcFramePtr; FRAME SrcFramePtr;
@@ -194,9 +199,9 @@ TFB_Prim_StampFill (STAMP *stmp, TFB_Palette *color)
x = stmp->origin.x - _CurFramePtr->HotSpot.x; x = stmp->origin.x - _CurFramePtr->HotSpot.x;
y = stmp->origin.y - _CurFramePtr->HotSpot.y; y = stmp->origin.y - _CurFramePtr->HotSpot.y;
r = color->r; r = color.r;
g = color->g; g = color.g;
b = color->b; b = color.b;
UnlockMutex (img->mutex); UnlockMutex (img->mutex);
sc2/src/libs/graphics/tfb_prim.h
+7 -6
View File
@@ -20,10 +20,11 @@
#include "tfb_draw.h" #include "tfb_draw.h"
void TFB_Prim_Line (LINE *line, TFB_Palette *color); void TFB_Prim_Line (LINE *line, Color color);
void TFB_Prim_Point (POINT *p, TFB_Palette *color); void TFB_Prim_Point (POINT *p, Color color);
void TFB_Prim_Rect (RECT *r, TFB_Palette *color); void TFB_Prim_Rect (RECT *r, Color color);
void TFB_Prim_FillRect (RECT *r, TFB_Palette *color); void TFB_Prim_FillRect (RECT *r, Color color);
void TFB_Prim_Stamp (STAMP *stamp); void TFB_Prim_Stamp (STAMP *stamp);
void TFB_Prim_StampFill (STAMP *stamp, TFB_Palette *color); void TFB_Prim_StampFill (STAMP *stamp, Color color);
void TFB_Prim_FontChar (POINT *origin, TFB_Char *, TFB_Image *backing); void TFB_Prim_FontChar (POINT *origin, TFB_Char *fontChar,
TFB_Image *backing);
sc2/src/libs/graphics/widgets.c
+27 -23
View File
@@ -34,17 +34,20 @@ WIDGET *widget_focus = NULL;
#define WIDGET_DIALOG_TEXT_COLOR \ #define WIDGET_DIALOG_TEXT_COLOR \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00) BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00)
static COLOR win_bg_clr = BUILD_COLOR (MAKE_RGB15 (0x18, 0x18, 0x1F), 0x00); static Color win_bg_clr =
static COLOR win_medium_clr = BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x18), 0x00); BUILD_COLOR (MAKE_RGB15_INIT (0x18, 0x18, 0x1F), 0x00);
static COLOR win_dark_clr = BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x10), 0x00); static Color win_medium_clr =
BUILD_COLOR (MAKE_RGB15_INIT (0x10, 0x10, 0x18), 0x00);
static Color win_dark_clr =
BUILD_COLOR (MAKE_RGB15_INIT (0x08, 0x08, 0x10), 0x00);
static FONT cur_font; static FONT cur_font;
void void
DrawShadowedBox (RECT *r, COLOR bg, COLOR dark, COLOR medium) DrawShadowedBox (RECT *r, Color bg, Color dark, Color medium)
{ {
RECT t; RECT t;
COLOR oldcolor; Color oldcolor;
BatchGraphics (); BatchGraphics ();
@@ -84,7 +87,7 @@ DrawShadowedBox (RECT *r, COLOR bg, COLOR dark, COLOR medium)
void void
DrawLabelAsWindow (WIDGET_LABEL *label, RECT *windowRect) DrawLabelAsWindow (WIDGET_LABEL *label, RECT *windowRect)
{ {
COLOR oldfg = SetContextForeGroundColor (WIDGET_DIALOG_TEXT_COLOR); Color oldfg = SetContextForeGroundColor (WIDGET_DIALOG_TEXT_COLOR);
FONT oldfont = 0; FONT oldfont = 0;
FRAME oldFontEffect = SetContextFontEffect (NULL); FRAME oldFontEffect = SetContextFontEffect (NULL);
RECT r; RECT r;
@@ -144,7 +147,7 @@ DrawLabelAsWindow (WIDGET_LABEL *label, RECT *windowRect)
} }
void void
Widget_SetWindowColors (COLOR bg, COLOR dark, COLOR medium) Widget_SetWindowColors (Color bg, Color dark, Color medium)
{ {
win_bg_clr = bg; win_bg_clr = bg;
win_dark_clr = dark; win_dark_clr = dark;
@@ -165,7 +168,7 @@ Widget_DrawToolTips (int numlines, const char **tips)
RECT r; RECT r;
FONT oldfont = 0; FONT oldfont = 0;
FRAME oldFontEffect = SetContextFontEffect (NULL); FRAME oldFontEffect = SetContextFontEffect (NULL);
COLOR oldtext = SetContextForeGroundColor (WIDGET_INACTIVE_SELECTED_COLOR); Color oldtext = SetContextForeGroundColor (WIDGET_INACTIVE_SELECTED_COLOR);
TEXT t; TEXT t;
int i; int i;
@@ -199,8 +202,8 @@ void
Widget_DrawMenuScreen (WIDGET *_self, int x, int y) Widget_DrawMenuScreen (WIDGET *_self, int x, int y)
{ {
RECT r; RECT r;
COLOR title, oldtext; Color title, oldtext;
COLOR inactive, default_color, selected; Color inactive, default_color, selected;
FONT oldfont = 0; FONT oldfont = 0;
FRAME oldFontEffect = SetContextFontEffect (NULL); FRAME oldFontEffect = SetContextFontEffect (NULL);
TEXT t; TEXT t;
@@ -265,8 +268,8 @@ void
Widget_DrawChoice (WIDGET *_self, int x, int y) Widget_DrawChoice (WIDGET *_self, int x, int y)
{ {
WIDGET_CHOICE *self = (WIDGET_CHOICE *)_self; WIDGET_CHOICE *self = (WIDGET_CHOICE *)_self;
COLOR oldtext; Color oldtext;
COLOR inactive, default_color, selected; Color inactive, default_color, selected;
FONT oldfont = 0; FONT oldfont = 0;
FRAME oldFontEffect = SetContextFontEffect (NULL); FRAME oldFontEffect = SetContextFontEffect (NULL);
TEXT t; TEXT t;
@@ -299,7 +302,8 @@ Widget_DrawChoice (WIDGET *_self, int x, int y)
t.align = ALIGN_CENTER; t.align = ALIGN_CENTER;
for (i = 0; i < self->numopts; i++) for (i = 0; i < self->numopts; i++)
{ {
t.baseline.x = home_x + ((i % 3) * (ScreenWidth / (self->maxcolumns + 1))); t.baseline.x = home_x + ((i % 3) *
(ScreenWidth / (self->maxcolumns + 1)));
t.baseline.y = home_y + (8 * (i / 3)); t.baseline.y = home_y + (8 * (i / 3));
t.pStr = self->options[i].optname; t.pStr = self->options[i].optname;
if ((widget_focus == _self) && if ((widget_focus == _self) &&
@@ -307,7 +311,7 @@ Widget_DrawChoice (WIDGET *_self, int x, int y)
{ {
SetContextForeGroundColor (selected); SetContextForeGroundColor (selected);
Widget_DrawToolTips (3, self->options[i].tooltip); Widget_DrawToolTips (3, self->options[i].tooltip);
} }
else if (i == self->selected) else if (i == self->selected)
{ {
SetContextForeGroundColor (default_color); SetContextForeGroundColor (default_color);
@@ -328,8 +332,8 @@ void
Widget_DrawButton (WIDGET *_self, int x, int y) Widget_DrawButton (WIDGET *_self, int x, int y)
{ {
WIDGET_BUTTON *self = (WIDGET_BUTTON *)_self; WIDGET_BUTTON *self = (WIDGET_BUTTON *)_self;
COLOR oldtext; Color oldtext;
COLOR inactive, selected; Color inactive, selected;
FONT oldfont = 0; FONT oldfont = 0;
FRAME oldFontEffect = SetContextFontEffect (NULL); FRAME oldFontEffect = SetContextFontEffect (NULL);
TEXT t; TEXT t;
@@ -366,7 +370,7 @@ void
Widget_DrawLabel (WIDGET *_self, int x, int y) Widget_DrawLabel (WIDGET *_self, int x, int y)
{ {
WIDGET_LABEL *self = (WIDGET_LABEL *)_self; WIDGET_LABEL *self = (WIDGET_LABEL *)_self;
COLOR oldtext = SetContextForeGroundColor (WIDGET_INACTIVE_SELECTED_COLOR); Color oldtext = SetContextForeGroundColor (WIDGET_INACTIVE_SELECTED_COLOR);
FONT oldfont = 0; FONT oldfont = 0;
FRAME oldFontEffect = SetContextFontEffect (NULL); FRAME oldFontEffect = SetContextFontEffect (NULL);
TEXT t; TEXT t;
@@ -397,8 +401,8 @@ void
Widget_DrawSlider(WIDGET *_self, int x, int y) Widget_DrawSlider(WIDGET *_self, int x, int y)
{ {
WIDGET_SLIDER *self = (WIDGET_SLIDER *)_self; WIDGET_SLIDER *self = (WIDGET_SLIDER *)_self;
COLOR oldtext; Color oldtext;
COLOR inactive, default_color, selected; Color inactive, default_color, selected;
FONT oldfont = 0; FONT oldfont = 0;
FRAME oldFontEffect = SetContextFontEffect (NULL); FRAME oldFontEffect = SetContextFontEffect (NULL);
TEXT t; TEXT t;
@@ -470,8 +474,8 @@ void
Widget_DrawTextEntry (WIDGET *_self, int x, int y) Widget_DrawTextEntry (WIDGET *_self, int x, int y)
{ {
WIDGET_TEXTENTRY *self = (WIDGET_TEXTENTRY *)_self; WIDGET_TEXTENTRY *self = (WIDGET_TEXTENTRY *)_self;
COLOR oldtext; Color oldtext;
COLOR inactive, default_color, selected; Color inactive, default_color, selected;
FONT oldfont = 0; FONT oldfont = 0;
FRAME oldFontEffect = SetContextFontEffect (NULL); FRAME oldFontEffect = SetContextFontEffect (NULL);
TEXT t; TEXT t;
@@ -607,8 +611,8 @@ void
Widget_DrawControlEntry (WIDGET *_self, int x, int y) Widget_DrawControlEntry (WIDGET *_self, int x, int y)
{ {
WIDGET_CONTROLENTRY *self = (WIDGET_CONTROLENTRY *)_self; WIDGET_CONTROLENTRY *self = (WIDGET_CONTROLENTRY *)_self;
COLOR oldtext; Color oldtext;
COLOR inactive, default_color, selected; Color inactive, default_color, selected;
FONT oldfont = 0; FONT oldfont = 0;
FRAME oldFontEffect = SetContextFontEffect (NULL); FRAME oldFontEffect = SetContextFontEffect (NULL);
TEXT t; TEXT t;
sc2/src/libs/graphics/widgets.h
+2 -2
View File
@@ -175,9 +175,9 @@ typedef struct _widget_controlentry {
char controlname[2][WIDGET_CONTROLENTRY_WIDTH]; char controlname[2][WIDGET_CONTROLENTRY_WIDTH];
} WIDGET_CONTROLENTRY; } WIDGET_CONTROLENTRY;
void DrawShadowedBox (RECT *r, COLOR bg, COLOR dark, COLOR medium); void DrawShadowedBox (RECT *r, Color bg, Color dark, Color medium);
void DrawLabelAsWindow (WIDGET_LABEL *label, RECT *windowRect); void DrawLabelAsWindow (WIDGET_LABEL *label, RECT *windowRect);
void Widget_SetWindowColors (COLOR bg, COLOR dark, COLOR medium); void Widget_SetWindowColors (Color bg, Color dark, Color medium);
FONT Widget_SetFont (FONT newFont); FONT Widget_SetFont (FONT newFont);
sc2/src/uqm/cnctdlg.c
+6 -6
View File
@@ -94,8 +94,8 @@ static void
MCD_DrawButton (WIDGET *_self, int x, int y) MCD_DrawButton (WIDGET *_self, int x, int y)
{ {
WIDGET_BUTTON *self = (WIDGET_BUTTON *)_self; WIDGET_BUTTON *self = (WIDGET_BUTTON *)_self;
COLOR oldtext; Color oldtext;
COLOR inactive, selected; Color inactive, selected;
FONT oldfont = SetContextFont (StarConFont); FONT oldfont = SetContextFont (StarConFont);
FRAME oldFontEffect = SetContextFontEffect (NULL); FRAME oldFontEffect = SetContextFontEffect (NULL);
TEXT t; TEXT t;
@@ -127,8 +127,8 @@ static void
MCD_DrawSlider (WIDGET *_self, int x, int y) MCD_DrawSlider (WIDGET *_self, int x, int y)
{ {
WIDGET_SLIDER *self = (WIDGET_SLIDER *)_self; WIDGET_SLIDER *self = (WIDGET_SLIDER *)_self;
COLOR oldtext; Color oldtext;
COLOR default_color, selected; Color default_color, selected;
FONT oldfont = SetContextFont (PlayerFont); FONT oldfont = SetContextFont (PlayerFont);
FRAME oldFontEffect = SetContextFontEffect (NULL); FRAME oldFontEffect = SetContextFontEffect (NULL);
TEXT t; TEXT t;
@@ -177,8 +177,8 @@ void
MCD_DrawTextEntry (WIDGET *_self, int x, int y) MCD_DrawTextEntry (WIDGET *_self, int x, int y)
{ {
WIDGET_TEXTENTRY *self = (WIDGET_TEXTENTRY *)_self; WIDGET_TEXTENTRY *self = (WIDGET_TEXTENTRY *)_self;
COLOR oldtext; Color oldtext;
COLOR inactive, default_color, selected; Color inactive, default_color, selected;
FONT oldfont = SetContextFont (PlayerFont); FONT oldfont = SetContextFont (PlayerFont);
FRAME oldFontEffect = SetContextFontEffect (NULL); FRAME oldFontEffect = SetContextFontEffect (NULL);
TEXT t; TEXT t;
sc2/src/uqm/colors.h
+53 -38
View File
@@ -16,6 +16,12 @@
#ifndef _COLORS_H #ifndef _COLORS_H
#define _COLORS_H #define _COLORS_H
// To be used as an indicator that the actual value of the color does not
// matter, for instance in structure initialisations for fields which
// are irrelevant in the context.
#define UNDEFINED_COLOR \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00)
#if 0 #if 0
#define DEFAULT_COLOR_00 \ #define DEFAULT_COLOR_00 \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00) BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00)
@@ -230,46 +236,46 @@
// Pulsating color of the string "AUTO-PILOT" // Pulsating color of the string "AUTO-PILOT"
#define AUTOPILOT_COLOR_CYCLE_TABLE \ #define AUTOPILOT_COLOR_CYCLE_TABLE \
{ \ { \
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x14, 0x18), 0x5B), \ BUILD_COLOR (MAKE_RGB15_INIT (0x0A, 0x14, 0x18), 0x5B), \
BUILD_COLOR (MAKE_RGB15 (0x06, 0x10, 0x16), 0x5C), \ BUILD_COLOR (MAKE_RGB15_INIT (0x06, 0x10, 0x16), 0x5C), \
BUILD_COLOR (MAKE_RGB15 (0x03, 0x0E, 0x14), 0x5D), \ BUILD_COLOR (MAKE_RGB15_INIT (0x03, 0x0E, 0x14), 0x5D), \
BUILD_COLOR (MAKE_RGB15 (0x02, 0x0C, 0x11), 0x5E), \ BUILD_COLOR (MAKE_RGB15_INIT (0x02, 0x0C, 0x11), 0x5E), \
BUILD_COLOR (MAKE_RGB15 (0x01, 0x0B, 0x0F), 0x5F), \ BUILD_COLOR (MAKE_RGB15_INIT (0x01, 0x0B, 0x0F), 0x5F), \
BUILD_COLOR (MAKE_RGB15 (0x01, 0x09, 0x0D), 0x60), \ BUILD_COLOR (MAKE_RGB15_INIT (0x01, 0x09, 0x0D), 0x60), \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x07, 0x0B), 0x61), \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x07, 0x0B), 0x61), \
} }
// Colors for the fuel in the fuel tanks as they are filled up, // Colors for the fuel in the fuel tanks as they are filled up,
// when viewed from the shipyard. // when viewed from the shipyard.
#define FUEL_COLOR_TABLE \ #define FUEL_COLOR_TABLE \
{ \ { \
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2D), \ BUILD_COLOR (MAKE_RGB15_INIT (0x0F, 0x00, 0x00), 0x2D), \
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2C), \ BUILD_COLOR (MAKE_RGB15_INIT (0x13, 0x00, 0x00), 0x2C), \
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2B), \ BUILD_COLOR (MAKE_RGB15_INIT (0x17, 0x00, 0x00), 0x2B), \
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2A), \ BUILD_COLOR (MAKE_RGB15_INIT (0x1B, 0x00, 0x00), 0x2A), \
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7F), \ BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x03, 0x00), 0x7F), \
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7E), \ BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x07, 0x00), 0x7E), \
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x00), 0x7D), \ BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0A, 0x00), 0x7D), \
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7C), \ BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0E, 0x00), 0x7C), \
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7B), \ BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x11, 0x00), 0x7B), \
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7A), \ BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x15, 0x00), 0x7A), \
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x18, 0x00), 0x79), \ BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x18, 0x00), 0x79), \
} }
// Colors for the crew in the crew pods as they are filled up, // Colors for the crew in the crew pods as they are filled up,
// when viewed from the shipyard, when using PC fonts. // when viewed from the shipyard, when using PC fonts.
#define PC_CREW_COLOR_TABLE \ #define PC_CREW_COLOR_TABLE \
{ \ { \
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1E, 0x09), 0x65), \ BUILD_COLOR (MAKE_RGB15_INIT (0x0A, 0x1E, 0x09), 0x65), \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1E, 0x00), 0x65), \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x1E, 0x00), 0x65), \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1B, 0x00), 0x65), \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x1B, 0x00), 0x65), \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x18, 0x00), 0x65), \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x18, 0x00), 0x65), \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x15, 0x00), 0x65), \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x15, 0x00), 0x65), \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x12, 0x00), 0x65), \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x12, 0x00), 0x65), \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x10, 0x00), 0x65), \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x10, 0x00), 0x65), \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x0D, 0x00), 0x65), \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x0D, 0x00), 0x65), \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x0A, 0x00), 0x65), \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x0A, 0x00), 0x65), \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x07, 0x00), 0x65), \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x07, 0x00), 0x65), \
} }
// Colors for the crew in the crew pods as they are filled up, // Colors for the crew in the crew pods as they are filled up,
@@ -281,16 +287,16 @@
// when viewed from the shipyard. // when viewed from the shipyard.
#define STORAGE_BAY_COLOR_TABLE \ #define STORAGE_BAY_COLOR_TABLE \
{ \ { \
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F), \ BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x1F, 0x1F), 0x0F), \
BUILD_COLOR (MAKE_RGB15 (0x1C, 0x1C, 0x1C), 0x11), \ BUILD_COLOR (MAKE_RGB15_INIT (0x1C, 0x1C, 0x1C), 0x11), \
BUILD_COLOR (MAKE_RGB15 (0x18, 0x18, 0x18), 0x13), \ BUILD_COLOR (MAKE_RGB15_INIT (0x18, 0x18, 0x18), 0x13), \
BUILD_COLOR (MAKE_RGB15 (0x15, 0x15, 0x15), 0x15), \ BUILD_COLOR (MAKE_RGB15_INIT (0x15, 0x15, 0x15), 0x15), \
BUILD_COLOR (MAKE_RGB15 (0x12, 0x12, 0x12), 0x17), \ BUILD_COLOR (MAKE_RGB15_INIT (0x12, 0x12, 0x12), 0x17), \
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x19), \ BUILD_COLOR (MAKE_RGB15_INIT (0x10, 0x10, 0x10), 0x19), \
BUILD_COLOR (MAKE_RGB15 (0x0D, 0x0D, 0x0D), 0x1B), \ BUILD_COLOR (MAKE_RGB15_INIT (0x0D, 0x0D, 0x0D), 0x1B), \
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x1D), \ BUILD_COLOR (MAKE_RGB15_INIT (0x0A, 0x0A, 0x0A), 0x1D), \
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F), \ BUILD_COLOR (MAKE_RGB15_INIT (0x08, 0x08, 0x08), 0x1F), \
BUILD_COLOR (MAKE_RGB15 (0x05, 0x05, 0x05), 0x21), \ BUILD_COLOR (MAKE_RGB15_INIT (0x05, 0x05, 0x05), 0x21), \
} }
// Color of the storage bay indicator, as shown beneath the flagship, // Color of the storage bay indicator, as shown beneath the flagship,
@@ -335,5 +341,14 @@
BUILD_COLOR (MAKE_RGB15 (0x00, 0x1F, 0x00), 0x00) BUILD_COLOR (MAKE_RGB15 (0x00, 0x1F, 0x00), 0x00)
// Temporary, until we can use C'99 features:
#define BLACK_COLOR_INIT \
BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x00, 0x00), 0x00)
#define WHITE_COLOR_INIT \
BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x1F, 0x1F), 0x0F)
#define UNDEFINED_COLOR_INIT \
BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x00, 0x00), 0x00)
#endif /* _COLORS_H */ #endif /* _COLORS_H */
sc2/src/uqm/comm.c
+1 -1
View File
@@ -1214,7 +1214,7 @@ HailAlien (void)
ENCOUNTER_STATE ES; ENCOUNTER_STATE ES;
FONT PlayerFont, OldFont; FONT PlayerFont, OldFont;
MUSIC_REF SongRef = 0; MUSIC_REF SongRef = 0;
COLOR TextBack; Color TextBack;
pCurInputState = &ES; pCurInputState = &ES;
memset (pCurInputState, 0, sizeof (*pCurInputState)); memset (pCurInputState, 0, sizeof (*pCurInputState));
sc2/src/uqm/comm/arilou/arilouc.c
+2 -2
View File
@@ -30,8 +30,8 @@ static LOCDATA arilou_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
ARILOU_PMAP_ANIM, /* AlienFrame */ ARILOU_PMAP_ANIM, /* AlienFrame */
ARILOU_FONT, /* AlienFont */ ARILOU_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/blackur/blackurc.c
+2 -2
View File
@@ -27,8 +27,8 @@ static LOCDATA blackurq_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
BLACKURQ_PMAP_ANIM, /* AlienFrame */ BLACKURQ_PMAP_ANIM, /* AlienFrame */
BLACKURQ_FONT, /* AlienFont */ BLACKURQ_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/chmmr/chmmrc.c
+2 -2
View File
@@ -32,8 +32,8 @@ static LOCDATA chmmr_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
CHMMR_PMAP_ANIM, /* AlienFrame */ CHMMR_PMAP_ANIM, /* AlienFrame */
CHMMR_FONT, /* AlienFont */ CHMMR_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/comandr/comandr.c
+2 -2
View File
@@ -32,8 +32,8 @@ static LOCDATA commander_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
COMMANDER_PMAP_ANIM, /* AlienFrame */ COMMANDER_PMAP_ANIM, /* AlienFrame */
COMMANDER_FONT, /* AlienFont */ COMMANDER_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/druuge/druugec.c
+2 -2
View File
@@ -33,8 +33,8 @@ static LOCDATA druuge_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
DRUUGE_PMAP_ANIM, /* AlienFrame */ DRUUGE_PMAP_ANIM, /* AlienFrame */
DRUUGE_FONT, /* AlienFont */ DRUUGE_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/ilwrath/ilwrathc.c
+2 -2
View File
@@ -30,8 +30,8 @@ static LOCDATA ilwrath_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
ILWRATH_PMAP_ANIM, /* AlienFrame */ ILWRATH_PMAP_ANIM, /* AlienFrame */
ILWRATH_FONT, /* AlienFont */ ILWRATH_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/melnorm/melnorm.c
+2 -2
View File
@@ -48,8 +48,8 @@ static LOCDATA melnorme_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
MELNORME_PMAP_ANIM, /* AlienFrame */ MELNORME_PMAP_ANIM, /* AlienFrame */
MELNORME_FONT, /* AlienFont */ MELNORME_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/mycon/myconc.c
+2 -2
View File
@@ -31,8 +31,8 @@ static LOCDATA mycon_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
MYCON_PMAP_ANIM, /* AlienFrame */ MYCON_PMAP_ANIM, /* AlienFrame */
MYCON_FONT, /* AlienFont */ MYCON_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/orz/orzc.c
+2 -2
View File
@@ -30,8 +30,8 @@ static LOCDATA orz_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
ORZ_PMAP_ANIM, /* AlienFrame */ ORZ_PMAP_ANIM, /* AlienFrame */
ORZ_FONT, /* AlienFont */ ORZ_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/pkunk/pkunkc.c
+2 -2
View File
@@ -31,8 +31,8 @@ static LOCDATA pkunk_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
PKUNK_PMAP_ANIM, /* AlienFrame */ PKUNK_PMAP_ANIM, /* AlienFrame */
PKUNK_FONT, /* AlienFont */ PKUNK_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/rebel/rebel.c
+2 -2
View File
@@ -30,8 +30,8 @@ static LOCDATA yehat_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
YEHAT_PMAP_ANIM, /* AlienFrame */ YEHAT_PMAP_ANIM, /* AlienFrame */
YEHAT_FONT, /* AlienFont */ YEHAT_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* (SIS_TEXT_WIDTH - 16) * 2 / 3, */ /* AlienTextWidth */ 0, /* (SIS_TEXT_WIDTH - 16) * 2 / 3, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/shofixt/shofixt.c
+2 -2
View File
@@ -30,8 +30,8 @@ static LOCDATA shofixti_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
SHOFIXTI_PMAP_ANIM, /* AlienFrame */ SHOFIXTI_PMAP_ANIM, /* AlienFrame */
SHOFIXTI_FONT, /* AlienFont */ SHOFIXTI_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/slyhome/slyhome.c
+2 -2
View File
@@ -30,8 +30,8 @@ static LOCDATA slylandro_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
SLYLANDRO_PMAP_ANIM, /* AlienFrame */ SLYLANDRO_PMAP_ANIM, /* AlienFrame */
SLYLANDRO_FONT, /* AlienFont */ SLYLANDRO_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/slyland/slyland.c
+2 -2
View File
@@ -32,8 +32,8 @@ static LOCDATA slylandro_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
SLYLAND_PMAP_ANIM, /* AlienFrame */ SLYLAND_PMAP_ANIM, /* AlienFrame */
SLYLAND_FONT, /* AlienFont */ SLYLAND_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/spahome/spahome.c
+2 -2
View File
@@ -31,8 +31,8 @@ static LOCDATA spahome_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
SPATHI_HOME_PMAP_ANIM, /* AlienFrame */ SPATHI_HOME_PMAP_ANIM, /* AlienFrame */
SPATHI_FONT, /* AlienFont */ SPATHI_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/spathi/spathic.c
+2 -2
View File
@@ -30,8 +30,8 @@ static LOCDATA spathi_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
SPATHI_PMAP_ANIM, /* AlienFrame */ SPATHI_PMAP_ANIM, /* AlienFrame */
SPATHI_FONT, /* AlienFont */ SPATHI_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/starbas/starbas.c
+2 -2
View File
@@ -42,8 +42,8 @@ static LOCDATA commander_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
COMMANDER_PMAP_ANIM, /* AlienFrame */ COMMANDER_PMAP_ANIM, /* AlienFrame */
COMMANDER_FONT, /* AlienFont */ COMMANDER_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/supox/supoxc.c
+2 -2
View File
@@ -30,8 +30,8 @@ static LOCDATA supox_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
SUPOX_PMAP_ANIM, /* AlienFrame */ SUPOX_PMAP_ANIM, /* AlienFrame */
SUPOX_FONT, /* AlienFont */ SUPOX_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/syreen/syreenc.c
+2 -2
View File
@@ -31,8 +31,8 @@ static LOCDATA syreen_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
SYREEN_PMAP_ANIM, /* AlienFrame */ SYREEN_PMAP_ANIM, /* AlienFrame */
SYREEN_FONT, /* AlienFont */ SYREEN_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/talkpet/talkpet.c
+2 -2
View File
@@ -33,8 +33,8 @@ static LOCDATA talkpet_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
TALKING_PET_PMAP_ANIM, /* AlienFrame */ TALKING_PET_PMAP_ANIM, /* AlienFrame */
TALKING_PET_FONT, /* AlienFont */ TALKING_PET_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/thradd/thraddc.c
+2 -2
View File
@@ -31,8 +31,8 @@ static LOCDATA thradd_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
THRADD_PMAP_ANIM, /* AlienFrame */ THRADD_PMAP_ANIM, /* AlienFrame */
THRADD_FONT, /* AlienFont */ THRADD_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/umgah/umgahc.c
+2 -2
View File
@@ -30,8 +30,8 @@ static LOCDATA umgah_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
UMGAH_PMAP_ANIM, /* AlienFrame */ UMGAH_PMAP_ANIM, /* AlienFrame */
UMGAH_FONT, /* AlienFont */ UMGAH_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/urquan/urquanc.c
+2 -2
View File
@@ -27,8 +27,8 @@ static LOCDATA urquan_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
URQUAN_PMAP_ANIM, /* AlienFrame */ URQUAN_PMAP_ANIM, /* AlienFrame */
URQUAN_FONT, /* AlienFont */ URQUAN_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/utwig/utwigc.c
+2 -2
View File
@@ -31,8 +31,8 @@ static LOCDATA utwig_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
UTWIG_PMAP_ANIM, /* AlienFrame */ UTWIG_PMAP_ANIM, /* AlienFrame */
UTWIG_FONT, /* AlienFont */ UTWIG_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */ 0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/vux/vuxc.c
+2 -2
View File
@@ -27,8 +27,8 @@ static LOCDATA vux_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
VUX_PMAP_ANIM, /* AlienFrame */ VUX_PMAP_ANIM, /* AlienFrame */
VUX_FONT, /* AlienFont */ VUX_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* (SIS_TEXT_WIDTH - 16) >> 1, */ /* AlienTextWidth */ 0, /* (SIS_TEXT_WIDTH - 16) >> 1, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/yehat/yehatc.c
+2 -2
View File
@@ -32,8 +32,8 @@ static LOCDATA yehat_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
YEHAT_PMAP_ANIM, /* AlienFrame */ YEHAT_PMAP_ANIM, /* AlienFrame */
YEHAT_FONT, /* AlienFont */ YEHAT_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR_INIT, /* AlienTextFColor */
BLACK_COLOR, /* AlienTextBColor */ BLACK_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* (SIS_TEXT_WIDTH - 16) * 2 / 3, */ /* AlienTextWidth */ 0, /* (SIS_TEXT_WIDTH - 16) * 2 / 3, */ /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/comm/zoqfot/zoqfotc.c
+2 -2
View File
@@ -47,8 +47,8 @@ static LOCDATA zoqfot_desc =
NULL, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
ZOQFOTPIK_PMAP_ANIM, /* AlienFrame */ ZOQFOTPIK_PMAP_ANIM, /* AlienFrame */
ZOQFOTPIK_FONT, /* AlienFont */ ZOQFOTPIK_FONT, /* AlienFont */
0, /* AlienTextFColor */ UNDEFINED_COLOR_INIT, /* AlienTextFColor */
0, /* AlienTextBColor */ UNDEFINED_COLOR_INIT, /* AlienTextBColor */
{0, 0}, /* AlienTextBaseline */ {0, 0}, /* AlienTextBaseline */
0, /* AlienTextWidth */ 0, /* AlienTextWidth */
ALIGN_CENTER, /* AlienTextAlign */ ALIGN_CENTER, /* AlienTextAlign */
sc2/src/uqm/confirm.c
+1 -1
View File
@@ -37,7 +37,7 @@
static void static void
DrawConfirmationWindow (BOOLEAN answer) DrawConfirmationWindow (BOOLEAN answer)
{ {
COLOR oldfg = SetContextForeGroundColor (MENU_TEXT_COLOR); Color oldfg = SetContextForeGroundColor (MENU_TEXT_COLOR);
FONT oldfont = SetContextFont (StarConFont); FONT oldfont = SetContextFont (StarConFont);
FRAME oldFontEffect = SetContextFontEffect (NULL); FRAME oldFontEffect = SetContextFontEffect (NULL);
RECT r; RECT r;
sc2/src/uqm/credits.c
+3 -3
View File
@@ -62,7 +62,7 @@ static FONT_SIZE_DEF CreditsFont[] =
static FRAME static FRAME
Credits_MakeTextFrame (int w, int h, COLOR TransColor) Credits_MakeTextFrame (int w, int h, Color TransColor)
{ {
FRAME OldFrame; FRAME OldFrame;
FRAME f; FRAME f;
@@ -102,7 +102,7 @@ ParseTextLines (TEXT *Lines, int MaxLines, char *Buffer)
static FRAME static FRAME
Credits_RenderTextFrame (CONTEXT TempContext, int *istr, int dir, Credits_RenderTextFrame (CONTEXT TempContext, int *istr, int dir,
COLOR BackColor, COLOR ForeColor) Color BackColor, Color ForeColor)
{ {
FRAME f; FRAME f;
CONTEXT OldContext; CONTEXT OldContext;
@@ -294,7 +294,7 @@ credit_roll_task (void *data)
CONTEXT DrawContext; CONTEXT DrawContext;
CONTEXT LocalContext; CONTEXT LocalContext;
FRAME Frame; FRAME Frame;
COLOR TransColor, TextFore, TextBack; Color TransColor, TextFore, TextBack;
STAMP TaskStamp; STAMP TaskStamp;
STAMP s; STAMP s;
FRAME cf[CREDIT_FRAMES]; // preped text frames FRAME cf[CREDIT_FRAMES]; // preped text frames
sc2/src/uqm/element.h
+1 -1
View File
@@ -191,7 +191,7 @@ extern PRIMITIVE DisplayArray[MAX_DISPLAY_PRIMS];
#define OBJECT_CLOAKED(eptr) \ #define OBJECT_CLOAKED(eptr) \
(GetPrimType (&GLOBAL (DisplayArray[(eptr)->PrimIndex])) >= NUM_PRIMS \ (GetPrimType (&GLOBAL (DisplayArray[(eptr)->PrimIndex])) >= NUM_PRIMS \
|| (GetPrimType (&GLOBAL (DisplayArray[(eptr)->PrimIndex])) == STAMPFILL_PRIM \ || (GetPrimType (&GLOBAL (DisplayArray[(eptr)->PrimIndex])) == STAMPFILL_PRIM \
&& GetPrimColor (&GLOBAL (DisplayArray[(eptr)->PrimIndex])) == BLACK_COLOR)) && sameColor (GetPrimColor (&GLOBAL (DisplayArray[(eptr)->PrimIndex])), BLACK_COLOR)))
#define UNDEFINED_LEVEL 0 #define UNDEFINED_LEVEL 0
extern HELEMENT AllocElement (void); extern HELEMENT AllocElement (void);
sc2/src/uqm/encount.c
+19 -19
View File
@@ -352,15 +352,15 @@ DrawFadeText (const UNICODE *str1, const UNICODE *str2, BOOLEAN fade_in,
SIZE i; SIZE i;
DWORD TimeIn; DWORD TimeIn;
TEXT t1, t2; TEXT t1, t2;
static const COLOR fade_cycle[] = static const Color fade_cycle[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x1D), BUILD_COLOR (MAKE_RGB15_INIT (0x0A, 0x0A, 0x0A), 0x1D),
BUILD_COLOR (MAKE_RGB15 (0x09, 0x09, 0x09), 0x1E), BUILD_COLOR (MAKE_RGB15_INIT (0x09, 0x09, 0x09), 0x1E),
BUILD_COLOR (MAKE_RGB15 (0x08, 0x08, 0x08), 0x1F), BUILD_COLOR (MAKE_RGB15_INIT (0x08, 0x08, 0x08), 0x1F),
BUILD_COLOR (MAKE_RGB15 (0x06, 0x06, 0x06), 0x20), BUILD_COLOR (MAKE_RGB15_INIT (0x06, 0x06, 0x06), 0x20),
BUILD_COLOR (MAKE_RGB15 (0x05, 0x05, 0x05), 0x21), BUILD_COLOR (MAKE_RGB15_INIT (0x05, 0x05, 0x05), 0x21),
BUILD_COLOR (MAKE_RGB15 (0x04, 0x04, 0x04), 0x22), BUILD_COLOR (MAKE_RGB15_INIT (0x04, 0x04, 0x04), 0x22),
BUILD_COLOR (MAKE_RGB15 (0x03, 0x03, 0x03), 0x23), BUILD_COLOR (MAKE_RGB15_INIT (0x03, 0x03, 0x03), 0x23),
}; };
#define NUM_FADES (sizeof (fade_cycle) / sizeof (fade_cycle[0])) #define NUM_FADES (sizeof (fade_cycle) / sizeof (fade_cycle[0]))
@@ -449,18 +449,18 @@ UninitEncounter (void)
UNICODE buf[80]; UNICODE buf[80];
HSHIPFRAG hStarShip; HSHIPFRAG hStarShip;
SHIP_FRAGMENT *FragPtr; SHIP_FRAGMENT *FragPtr;
static const COLOR fade_ship_cycle[] = static const Color fade_ship_cycle[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x07, 0x00, 0x00), 0x2F), BUILD_COLOR (MAKE_RGB15_INIT (0x07, 0x00, 0x00), 0x2F),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2D), BUILD_COLOR (MAKE_RGB15_INIT (0x0F, 0x00, 0x00), 0x2D),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2B), BUILD_COLOR (MAKE_RGB15_INIT (0x17, 0x00, 0x00), 0x2B),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x0A), 0x27), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0A, 0x0A), 0x27),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x14, 0x14), 0x25), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x14, 0x14), 0x25),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x1F, 0x1F), 0x0F),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x14, 0x14), 0x25), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x14, 0x14), 0x25),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x0A), 0x27), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0A, 0x0A), 0x27),
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2A), BUILD_COLOR (MAKE_RGB15_INIT (0x1B, 0x00, 0x00), 0x2A),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2B), BUILD_COLOR (MAKE_RGB15_INIT (0x17, 0x00, 0x00), 0x2B),
}; };
#define NUM_SHIP_FADES (sizeof (fade_ship_cycle) / \ #define NUM_SHIP_FADES (sizeof (fade_ship_cycle) / \
sizeof (fade_ship_cycle[0])) sizeof (fade_ship_cycle[0]))
sc2/src/uqm/gameopt.c
+11 -11
View File
@@ -196,7 +196,7 @@ DrawDescriptionString (MENU_STATE *pMS, UNICODE *Str, COUNT CursorPos,
{ {
RECT r; RECT r;
TEXT lf; TEXT lf;
COLOR BackGround, ForeGround; Color BackGround, ForeGround;
FONT Font; FONT Font;
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
@@ -535,17 +535,17 @@ DrawCargo (COUNT redraw_state)
{ {
TEXT t; TEXT t;
UNICODE buf[40]; UNICODE buf[40];
static const COLOR cargo_color[] = static const Color cargo_color[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x02, 0x0E, 0x13), 0x00), BUILD_COLOR (MAKE_RGB15_INIT (0x02, 0x0E, 0x13), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x19, 0x00, 0x00), 0x00), BUILD_COLOR (MAKE_RGB15_INIT (0x19, 0x00, 0x00), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x10, 0x10, 0x10), 0x00), BUILD_COLOR (MAKE_RGB15_INIT (0x10, 0x10, 0x10), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x03, 0x05, 0x1E), 0x00), BUILD_COLOR (MAKE_RGB15_INIT (0x03, 0x05, 0x1E), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x18, 0x00), 0x00), BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x18, 0x00), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x1B, 0x00), 0x00), BUILD_COLOR (MAKE_RGB15_INIT (0x1B, 0x1B, 0x00), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x1E, 0x0D, 0x00), 0x00), BUILD_COLOR (MAKE_RGB15_INIT (0x1E, 0x0D, 0x00), 0x00),
BUILD_COLOR (MAKE_RGB15 (0x14, 0x00, 0x14), 0x05), BUILD_COLOR (MAKE_RGB15_INIT (0x14, 0x00, 0x14), 0x05),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x19), 0x00), BUILD_COLOR (MAKE_RGB15_INIT (0x0F, 0x00, 0x19), 0x00),
}; };
r.extent.width = 23; r.extent.width = 23;
sc2/src/uqm/globdata.h
+1 -1
View File
@@ -99,7 +99,7 @@ typedef struct
RESOURCE AlienFrameRes; RESOURCE AlienFrameRes;
RESOURCE AlienFontRes; RESOURCE AlienFontRes;
COLOR AlienTextFColor, AlienTextBColor; Color AlienTextFColor, AlienTextBColor;
POINT AlienTextBaseline; POINT AlienTextBaseline;
COUNT AlienTextWidth; COUNT AlienTextWidth;
TEXT_ALIGN AlienTextAlign; TEXT_ALIGN AlienTextAlign;
sc2/src/uqm/hyper.c
+1 -1
View File
@@ -1601,7 +1601,7 @@ SeedUniverse (void)
void void
HyperspaceMenu (void) HyperspaceMenu (void)
{ {
COLOR OldColor; Color OldColor;
CONTEXT OldContext; CONTEXT OldContext;
MENU_STATE MenuState; MENU_STATE MenuState;
sc2/src/uqm/intro.c
+8 -8
View File
@@ -58,9 +58,9 @@ typedef struct
int LastDrawKind; int LastDrawKind;
int LastAngle; int LastAngle;
COUNT OperIndex; COUNT OperIndex;
COLOR TextFadeColor; Color TextFadeColor;
COLOR TextColor; Color TextColor;
COLOR TextBackColor; Color TextBackColor;
int TextVPos; int TextVPos;
int TextEffect; int TextEffect;
RECT clip_r; RECT clip_r;
@@ -99,14 +99,14 @@ typedef struct
static BOOLEAN DoPresentation (void *pIS); static BOOLEAN DoPresentation (void *pIS);
static BOOLEAN static BOOLEAN
ParseColorString (const char *Src, COLOR* pColor) ParseColorString (const char *Src, Color* pColor)
{ {
unsigned clr; unsigned clr;
if (1 != sscanf (Src, "%x", &clr)) if (1 != sscanf (Src, "%x", &clr))
return FALSE; return FALSE;
*pColor = BUILD_COLOR (MAKE_RGB15 ( *pColor = BUILD_COLOR_RGBA (
(clr >> 19) & 0x1f, (clr >> 11) & 0x1f, (clr >> 3) & 0x1f), 0); (clr >> 16) & 0xff, (clr >> 8) & 0xff, clr & 0xff, 0);
return TRUE; return TRUE;
} }
@@ -125,7 +125,7 @@ DoFadeScreen (PRESENTATION_INPUT_STATE* pPIS, const char *Src, BYTE FadeType)
} }
static void static void
DrawTextEffect (TEXT *pText, COLOR Fore, COLOR Back, int Effect) DrawTextEffect (TEXT *pText, Color Fore, Color Back, int Effect)
{ {
if (Effect == 'T') if (Effect == 'T')
{ {
@@ -197,7 +197,7 @@ Present_GenerateSIS (PRESENTATION_INPUT_STATE* pPIS)
HOT_SPOT hs; HOT_SPOT hs;
int slot; int slot;
COUNT piece; COUNT piece;
COLOR SisBack; Color SisBack;
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
OldContext = SetContext (OffScreenContext); OldContext = SetContext (OffScreenContext);
sc2/src/uqm/melee.c
+2 -2
View File
@@ -556,7 +556,7 @@ DrawPickIcon (COUNT iship, BYTE DrawErase)
} }
else else
{ // erase icon { // erase icon
COLOR OldColor; Color OldColor;
OldColor = SetContextForeGroundColor (BLACK_COLOR); OldColor = SetContextForeGroundColor (BLACK_COLOR);
DrawFilledStamp (&s); DrawFilledStamp (&s);
@@ -1836,7 +1836,7 @@ DoConnectingDialog (MELEE_STATE *pMS)
{ {
RECT r; RECT r;
FONT oldfont; FONT oldfont;
COLOR oldcolor; Color oldcolor;
TEXT t; TEXT t;
// Build a network connection. // Build a network connection.
sc2/src/uqm/misc.c
+12 -4
View File
@@ -215,17 +215,25 @@ do_damage (ELEMENT *ElementPtr, SIZE damage)
} }
} }
#define CREW_COLOR_LOW_INTENSITY \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x00), 0x02)
#define CREW_COLOR_HIGH_INTENSITY \
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1E, 0x0A), 0x0A)
void void
crew_preprocess (ELEMENT *ElementPtr) crew_preprocess (ELEMENT *ElementPtr)
{ {
HELEMENT hTarget; HELEMENT hTarget;
SetPrimColor (&DisplayArray[ElementPtr->PrimIndex], // Switch from dark to light or vice versa:
GetPrimColor (&DisplayArray[ElementPtr->PrimIndex]) Color oldColor = GetPrimColor (&DisplayArray[ElementPtr->PrimIndex]);
^ BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x0A), 0x08)); Color newColor = sameColor (oldColor, CREW_COLOR_LOW_INTENSITY) ?
CREW_COLOR_HIGH_INTENSITY : CREW_COLOR_LOW_INTENSITY;
SetPrimColor (&DisplayArray[ElementPtr->PrimIndex], newColor);
ElementPtr->state_flags |= CHANGING; ElementPtr->state_flags |= CHANGING;
if ((hTarget = ElementPtr->hTarget) == 0) hTarget = ElementPtr->hTarget;
if (hTarget == 0)
{ {
STARSHIP *StarShipPtr; STARSHIP *StarShipPtr;
sc2/src/uqm/planets/lander.c
+29 -24
View File
@@ -176,38 +176,38 @@ static PLANETSIDE_DESC *planetSideDesc;
#define ON_THE_GROUND 0 #define ON_THE_GROUND 0
static COLOR static Color
DamageColorCycle (COLOR c, COUNT i) DamageColorCycle (Color c, COUNT i)
{ {
static const COLOR damage_tab[DAMAGE_CYCLE + 1] = static const Color damage_tab[DAMAGE_CYCLE + 1] =
{ {
WHITE_COLOR, WHITE_COLOR_INIT,
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2A), BUILD_COLOR (MAKE_RGB15_INIT (0x1B, 0x00, 0x00), 0x2A),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7E), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x07, 0x00), 0x7E),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7C), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0E, 0x00), 0x7C),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7A), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x15, 0x00), 0x7A),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1C, 0x00), 0x78), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x1C, 0x00), 0x78),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x1F, 0x0A), 0x0E),
}; };
if (i) if (i)
c = damage_tab[i]; c = damage_tab[i];
else if (c == WHITE_COLOR) else if (sameColor(c, WHITE_COLOR))
c = damage_tab[6]; c = damage_tab[6];
else if (c == BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E)) else if (sameColor(c, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E)))
c = damage_tab[5]; c = damage_tab[5];
else if (c == BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1C, 0x00), 0x78)) else if (sameColor(c, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1C, 0x00), 0x78)))
c = damage_tab[4]; c = damage_tab[4];
else if (c == BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7A)) else if (sameColor(c, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7A)))
c = damage_tab[3]; c = damage_tab[3];
else if (c == BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7C)) else if (sameColor(c, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7C)))
c = damage_tab[2]; c = damage_tab[2];
else if (c == BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7E)) else if (sameColor(c, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7E)))
c = damage_tab[1]; c = damage_tab[1];
else else
c = damage_tab[0]; c = damage_tab[0];
return (c); return c;
} }
static HELEMENT AddGroundDisaster (COUNT which_disaster); static HELEMENT AddGroundDisaster (COUNT which_disaster);
@@ -223,10 +223,10 @@ object_animation (ELEMENT *ElementPtr)
&& !((ElementPtr->state_flags & FINITE_LIFE) && !((ElementPtr->state_flags & FINITE_LIFE)
&& ElementPtr->mass_points == EARTHQUAKE_DISASTER)) && ElementPtr->mass_points == EARTHQUAKE_DISASTER))
{ {
COLOR c; Color c;
c = DamageColorCycle (GetPrimColor (pPrim), 0); c = DamageColorCycle (GetPrimColor (pPrim), 0);
if (c == WHITE_COLOR) if (sameColor(c, WHITE_COLOR))
{ {
SetPrimType (pPrim, STAMP_PRIM); SetPrimType (pPrim, STAMP_PRIM);
if (ElementPtr->hit_points == 0) if (ElementPtr->hit_points == 0)
@@ -273,7 +273,8 @@ object_animation (ELEMENT *ElementPtr)
else else
s = (14 - frame_index) >> 1; s = (14 - frame_index) >> 1;
// XXX: Was 0x8000 the background flag on 3DO? // XXX: Was 0x8000 the background flag on 3DO?
SetPrimColor (pPrim, BUILD_COLOR (0x8000 | MAKE_RGB15 (0x1F, 0x1F, 0x1F), s)); //SetPrimColor (pPrim, BUILD_COLOR (0x8000 | MAKE_RGB15 (0x1F, 0x1F, 0x1F), s));
SetPrimColor (pPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), s));
if (frame_index == 13) if (frame_index == 13)
PlaySound (SetAbsSoundIndex (LanderSounds, EARTHQUAKE_DISASTER), PlaySound (SetAbsSoundIndex (LanderSounds, EARTHQUAKE_DISASTER),
NotPositional (), NULL, GAME_SOUND_PRIORITY); NotPositional (), NULL, GAME_SOUND_PRIORITY);
@@ -923,7 +924,8 @@ lightning_process (ELEMENT *ElementPtr)
if (s < 0) if (s < 0)
s = 0; s = 0;
// XXX: Was 0x8000 the background flag on 3DO? // XXX: Was 0x8000 the background flag on 3DO?
SetPrimColor (pPrim, BUILD_COLOR (0x8000 | MAKE_RGB15 (0x1F, 0x1F, 0x1F), s)); //SetPrimColor (pPrim, BUILD_COLOR (0x8000 | MAKE_RGB15 (0x1F, 0x1F, 0x1F), s));
SetPrimColor (pPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), s));
if (ElementPtr->mass_points == LIGHTNING_DISASTER) if (ElementPtr->mass_points == LIGHTNING_DISASTER)
{ {
@@ -1253,9 +1255,11 @@ ScrollPlanetSide (SIZE dx, SIZE dy, int landingOffset)
// XXX: Shouldn't this color-cycle with damage_index? // XXX: Shouldn't this color-cycle with damage_index?
// damage_index is used, but only as a VGA index! // damage_index is used, but only as a VGA index!
SetContextForeGroundColor (BUILD_COLOR ( /*SetContextForeGroundColor (BUILD_COLOR (
MAKE_RGB15 (0x1F, 0x1F, 0x1F) | 0x8000, MAKE_RGB15 (0x1F, 0x1F, 0x1F) | 0x8000,
damage_index)); damage_index));*/
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), damage_index));
DrawFilledStamp (&shield_s); DrawFilledStamp (&shield_s);
} }
DrawStamp (&lander_s); DrawStamp (&lander_s);
@@ -1263,7 +1267,8 @@ ScrollPlanetSide (SIZE dx, SIZE dy, int landingOffset)
else else
{ // Direct hit, no shield { // Direct hit, no shield
--damage_index; --damage_index;
SetContextForeGroundColor (DamageColorCycle (0, damage_index)); SetContextForeGroundColor (
DamageColorCycle (BLACK_COLOR, damage_index));
DrawFilledStamp (&lander_s); DrawFilledStamp (&lander_s);
} }
} }
sc2/src/uqm/planets/lander.h
+1 -1
View File
@@ -49,7 +49,7 @@ typedef struct
UNICODE AmountBuf[40]; UNICODE AmountBuf[40];
TEXT MineralText[3]; TEXT MineralText[3];
COLOR ColorCycle[NUM_TEXT_FRAMES >> 1]; Color ColorCycle[NUM_TEXT_FRAMES >> 1];
BYTE TectonicsChance; BYTE TectonicsChance;
BYTE WeatherChance; BYTE WeatherChance;
sc2/src/uqm/planets/pl_stuff.c
+8 -6
View File
@@ -17,6 +17,7 @@
*/ */
#include "planets.h" #include "planets.h"
#include "../colors.h"
#include "../setup.h" #include "../setup.h"
#include "libs/graphics/gfx_common.h" #include "libs/graphics/gfx_common.h"
#include "libs/graphics/drawable.h" #include "libs/graphics/drawable.h"
@@ -123,8 +124,9 @@ RotatePlanet (int x, int dx, int dy, COUNT scale_amt, UBYTE zoom_from,
(void)x; // unused param (void)x; // unused param
} }
// rgb.a is ignored
void void
DrawPlanet (int x, int y, int dy, unsigned int rgb) DrawPlanet (int x, int y, int dy, Color rgb)
{ {
STAMP s; STAMP s;
UBYTE a = 128; UBYTE a = 128;
@@ -134,7 +136,7 @@ DrawPlanet (int x, int y, int dy, unsigned int rgb)
s.origin.y = y; s.origin.y = y;
s.frame = pSolarSysState->TopoFrame; s.frame = pSolarSysState->TopoFrame;
BatchGraphics (); BatchGraphics ();
if (! rgb) if (sameColor (rgb, BLACK_COLOR))
{ // no tint -- just draw the surface { // no tint -- just draw the surface
DrawStamp (&s); DrawStamp (&s);
} }
@@ -151,14 +153,14 @@ DrawPlanet (int x, int y, int dy, unsigned int rgb)
framew = GetFrameWidth (tintFrame[0]); framew = GetFrameWidth (tintFrame[0]);
frameh = GetFrameHeight (tintFrame[0]); frameh = GetFrameHeight (tintFrame[0]);
if (rgb != pSolarSysState->Tint_rgb) if (!sameColor (rgb, pSolarSysState->Tint_rgb))
{ {
pSolarSysState->Tint_rgb = rgb; pSolarSysState->Tint_rgb = rgb;
// Buffer the topoMap to the tintFrame; // Buffer the topoMap to the tintFrame;
arith_frame_blit (s.frame, NULL, tintFrame[0], NULL, 0, 0); arith_frame_blit (s.frame, NULL, tintFrame[0], NULL, 0, 0);
r = (rgb & (0x1f << 10)) >> 8; r = rgb.r / 2;
g = (rgb & (0x1f << 5)) >> 3; g = rgb.g / 2;
b = (rgb & 0x1f) << 2; b = rgb.b / 2;
#ifdef USE_ADDITIVE_SCAN_BLIT #ifdef USE_ADDITIVE_SCAN_BLIT
a = 255; a = 255;
#endif #endif
sc2/src/uqm/planets/planets.c
+3 -2
View File
@@ -20,6 +20,7 @@
#include "scan.h" #include "scan.h"
#include "lander.h" #include "lander.h"
#include "../colors.h"
#include "../element.h" #include "../element.h"
#include "../settings.h" #include "../settings.h"
#include "../setup.h" #include "../setup.h"
@@ -102,7 +103,7 @@ DrawOrbitalDisplay (DRAW_ORBITAL_MODE Mode)
else else
{ {
DrawPlanet (SIS_SCREEN_WIDTH - MAP_WIDTH, DrawPlanet (SIS_SCREEN_WIDTH - MAP_WIDTH,
SIS_SCREEN_HEIGHT - MAP_HEIGHT, 0, 0); SIS_SCREEN_HEIGHT - MAP_HEIGHT, 0, BLACK_COLOR);
} }
if (Mode != DRAW_ORBITAL_UPDATE) if (Mode != DRAW_ORBITAL_UPDATE)
@@ -247,7 +248,7 @@ FreePlanet (void)
DestroyDrawable (ReleaseDrawable (Orbit->TintFrame)); DestroyDrawable (ReleaseDrawable (Orbit->TintFrame));
Orbit->TintFrame = 0; Orbit->TintFrame = 0;
pSolarSysState->Tint_rgb = 0; pSolarSysState->Tint_rgb = BLACK_COLOR;
DestroyDrawable (ReleaseDrawable (Orbit->ObjectFrame)); DestroyDrawable (ReleaseDrawable (Orbit->ObjectFrame));
Orbit->ObjectFrame = 0; Orbit->ObjectFrame = 0;
sc2/src/uqm/planets/planets.h
+3 -3
View File
@@ -114,7 +114,7 @@ struct planet_desc
SIZE radius; SIZE radius;
POINT location; POINT location;
COLOR temp_color; Color temp_color;
COUNT NextIndex; COUNT NextIndex;
STAMP image; STAMP image;
@@ -210,7 +210,7 @@ struct solarsys_state
* [4] = bio 2 (world-specific) * [4] = bio 2 (world-specific)
* [5] = bio 3 (world-specific) * [5] = bio 3 (world-specific)
*/ */
UWORD Tint_rgb; Color Tint_rgb;
UBYTE PauseRotate; UBYTE PauseRotate;
FRAME TopoFrame; FRAME TopoFrame;
PLANET_ORBIT Orbit; PLANET_ORBIT Orbit;
@@ -228,7 +228,7 @@ bool matchWorld (const SOLARSYS_STATE *solarSys, const PLANET_DESC *world,
BYTE planetI, BYTE moonI); BYTE planetI, BYTE moonI);
extern void LoadPlanet (FRAME SurfDefFrame); extern void LoadPlanet (FRAME SurfDefFrame);
extern void DrawPlanet (int x, int y, int dy, unsigned int rgb); extern void DrawPlanet (int x, int y, int dy, Color rgb);
extern void FreePlanet (void); extern void FreePlanet (void);
extern void LoadStdLanderFont (PLANET_INFO *info); extern void LoadStdLanderFont (PLANET_INFO *info);
extern void FreeLanderFont (PLANET_INFO *info); extern void FreeLanderFont (PLANET_INFO *info);
sc2/src/uqm/planets/pstarmap.c
+25 -25
View File
@@ -118,7 +118,7 @@ flashCurrentLocation (POINT *where)
if (GetTimeCounter () >= NextTime) if (GetTimeCounter () >= NextTime)
{ {
COLOR OldColor; Color OldColor;
CONTEXT OldContext; CONTEXT OldContext;
STAMP s; STAMP s;
@@ -130,7 +130,8 @@ flashCurrentLocation (POINT *where)
if (c == 0x00 || c == 0x1A) if (c == 0x00 || c == 0x1A)
val = -val; val = -val;
c += val; c += val;
OldColor = SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (c, c, c), c)); OldColor = SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (c, c, c), c));
s.origin.x = UNIVERSE_TO_DISPX (universe.x); s.origin.x = UNIVERSE_TO_DISPX (universe.x);
s.origin.y = UNIVERSE_TO_DISPY (universe.y); s.origin.y = UNIVERSE_TO_DISPY (universe.y);
s.frame = IncFrameIndex (StarMapFrame); s.frame = IncFrameIndex (StarMapFrame);
@@ -199,7 +200,8 @@ DrawAutoPilot (POINT *pDstPt)
cycle = dy; cycle = dy;
delta = xerror = yerror = cycle >> 1; delta = xerror = yerror = cycle >> 1;
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x04, 0x04, 0x1F), 0x01)); SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x04, 0x04, 0x1F), 0x01));
delta &= ~1; delta &= ~1;
while (delta--) while (delta--)
@@ -260,12 +262,16 @@ GetSphereRect (FLEET_INFO *FleetPtr, RECT *pRect, RECT *pRepairRect)
if (pRepairRect->corner.x <= 0) if (pRepairRect->corner.x <= 0)
pRepairRect->corner.x = 1; pRepairRect->corner.x = 1;
else if (pRepairRect->corner.x + pRepairRect->extent.width >= SIS_SCREEN_WIDTH) else if (pRepairRect->corner.x + pRepairRect->extent.width >=
pRepairRect->corner.x = SIS_SCREEN_WIDTH - pRepairRect->extent.width - 1; SIS_SCREEN_WIDTH)
pRepairRect->corner.x =
SIS_SCREEN_WIDTH - pRepairRect->extent.width - 1;
if (pRepairRect->corner.y <= 0) if (pRepairRect->corner.y <= 0)
pRepairRect->corner.y = 1; pRepairRect->corner.y = 1;
else if (pRepairRect->corner.y + pRepairRect->extent.height >= SIS_SCREEN_HEIGHT) else if (pRepairRect->corner.y + pRepairRect->extent.height >=
pRepairRect->corner.y = SIS_SCREEN_HEIGHT - pRepairRect->extent.height - 1; SIS_SCREEN_HEIGHT)
pRepairRect->corner.y =
SIS_SCREEN_HEIGHT - pRepairRect->extent.height - 1;
BoxUnion (pRepairRect, pRect, pRepairRect); BoxUnion (pRepairRect, pRect, pRepairRect);
pRepairRect->extent.width++; pRepairRect->extent.width++;
@@ -339,7 +345,7 @@ DrawStarMap (COUNT race_update, RECT *pClipRect)
&& which_space < 2 && which_space < 2
&& (diameter = (long)GLOBAL_SIS (FuelOnBoard) << 1)) && (diameter = (long)GLOBAL_SIS (FuelOnBoard) << 1))
{ {
COLOR OldColor; Color OldColor;
if (LOBYTE (GLOBAL (CurrentActivity)) != IN_HYPERSPACE) if (LOBYTE (GLOBAL (CurrentActivity)) != IN_HYPERSPACE)
r.corner = CurStarDescPtr->star_pt; r.corner = CurStarDescPtr->star_pt;
@@ -394,7 +400,7 @@ DrawStarMap (COUNT race_update, RECT *pClipRect)
{ {
COUNT index; COUNT index;
HFLEETINFO hStarShip, hNextShip; HFLEETINFO hStarShip, hNextShip;
static const COLOR race_colors[] = static const Color race_colors[] =
{ {
RACE_COLORS RACE_COLORS
}; };
@@ -423,7 +429,7 @@ DrawStarMap (COUNT race_update, RECT *pClipRect)
&& repair_r.corner.x + repair_r.extent.width > pClipRect->corner.x && repair_r.corner.x + repair_r.extent.width > pClipRect->corner.x
&& repair_r.corner.y + repair_r.extent.height > pClipRect->corner.y))) && repair_r.corner.y + repair_r.extent.height > pClipRect->corner.y)))
{ {
COLOR c; Color c;
TEXT t; TEXT t;
STRING locString; STRING locString;
@@ -456,22 +462,16 @@ DrawStarMap (COUNT race_update, RECT *pClipRect)
t.baseline.y -= (r.corner.y + r.extent.height) t.baseline.y -= (r.corner.y + r.extent.height)
- SIS_SCREEN_HEIGHT + 1; - SIS_SCREEN_HEIGHT + 1;
{ // The text color is slightly lighter than the color of
BYTE r, g, b; // the SoI.
COLOR c32k; c.r = (c.r >= 0xff - CC5TO8 (0x03)) ?
0xff : c.r + CC5TO8 (0x03);
c.g = (c.g >= 0xff - CC5TO8 (0x03)) ?
0xff : c.g + CC5TO8 (0x03);
c.b = (c.b >= 0xff - CC5TO8 (0x03)) ?
0xff : c.b + CC5TO8 (0x03);
c32k = COLOR_32k (c); SetContextForeGroundColor (c);
r = (BYTE)((c32k >> (5 * 2)) & 0x1F);
if ((r += 0x03) > 0x1F) r = 0x1F;
g = (BYTE)((c32k >> (5 * 1)) & 0x1F);
if ((g += 0x03) > 0x1F) g = 0x1F;
b = (BYTE)((c32k >> (5 * 0)) & 0x1F);
if ((b += 0x03) > 0x1F) b = 0x1F;
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (r, g, b), COLOR_256 (c) - 1)
);
}
font_DrawText (&t); font_DrawText (&t);
} }
} }
sc2/src/uqm/planets/roster.c
+17 -1
View File
@@ -79,17 +79,33 @@ getSupportShipIcon (MENU_STATE *pMS)
static void static void
flashSupportShip (MENU_STATE *pMS) flashSupportShip (MENU_STATE *pMS)
{ {
static COLOR c = BUILD_COLOR (MAKE_RGB15 (0x1F, 0x00, 0x00), 0x24); static Color c = BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x00, 0x00), 0x24);
static TimeCount NextTime = 0; static TimeCount NextTime = 0;
if (GetTimeCounter () >= NextTime) if (GetTimeCounter () >= NextTime)
{ {
NextTime = GetTimeCounter () + (ONE_SECOND / 15); NextTime = GetTimeCounter () + (ONE_SECOND / 15);
/* The commented code out code is the old code before the switch
* to 24-bits colors. The current code produces very slightly
* different colors due to rounding errors, but the old code wasn't
* original anyhow, and you can't tell the difference visually.
* - SvdB
if (c >= BUILD_COLOR (MAKE_RGB15 (0x1F, 0x19, 0x19), 0x24)) if (c >= BUILD_COLOR (MAKE_RGB15 (0x1F, 0x19, 0x19), 0x24))
c = BUILD_COLOR (MAKE_RGB15 (0x1F, 0x00, 0x00), 0x24); c = BUILD_COLOR (MAKE_RGB15 (0x1F, 0x00, 0x00), 0x24);
else else
c += BUILD_COLOR (MAKE_RGB15 (0x00, 0x02, 0x02), 0x00); c += BUILD_COLOR (MAKE_RGB15 (0x00, 0x02, 0x02), 0x00);
*/
if (c.g >= CC5TO8 (0x19))
{
c = BUILD_COLOR (MAKE_RGB15 (0x1F, 0x00, 0x00), 0x24);
}
else
{
c.g += CC5TO8 (0x02);
c.b += CC5TO8 (0x02);
}
SetContextForeGroundColor (c); SetContextForeGroundColor (c);
drawSupportShip (pMS, TRUE); drawSupportShip (pMS, TRUE);
sc2/src/uqm/planets/scan.c
+17 -14
View File
@@ -20,6 +20,7 @@
#include "lifeform.h" #include "lifeform.h"
#include "scan.h" #include "scan.h"
#include "../build.h" #include "../build.h"
#include "../colors.h"
#include "../cons_res.h" #include "../cons_res.h"
#include "../controls.h" #include "../controls.h"
#include "../menustat.h" #include "../menustat.h"
@@ -625,7 +626,7 @@ RedrawSurfaceScan (const POINT *newLoc)
OldContext = SetContext (ScanContext); OldContext = SetContext (ScanContext);
BatchGraphics (); BatchGraphics ();
DrawPlanet (0, 0, 0, 0); DrawPlanet (0, 0, 0, BLACK_COLOR);
DrawScannedObjects (TRUE); DrawScannedObjects (TRUE);
if (newLoc) if (newLoc)
{ {
@@ -819,14 +820,14 @@ static void
DrawScannedStuff (COUNT y, BYTE CurState) DrawScannedStuff (COUNT y, BYTE CurState)
{ {
HELEMENT hElement, hNextElement; HELEMENT hElement, hNextElement;
COLOR OldColor; Color OldColor;
OldColor = SetContextForeGroundColor (0); OldColor = SetContextForeGroundColor (BLACK_COLOR);
for (hElement = GetHeadElement (); hElement; hElement = hNextElement) for (hElement = GetHeadElement (); hElement; hElement = hNextElement)
{ {
ELEMENT *ElementPtr; ELEMENT *ElementPtr;
//COLOR OldColor; //Color OldColor;
SIZE dy; SIZE dy;
LockElement (hElement, &ElementPtr); LockElement (hElement, &ElementPtr);
@@ -860,7 +861,7 @@ DrawScannedStuff (COUNT y, BYTE CurState)
else else
{ {
BYTE r, g, b; BYTE r, g, b;
COLOR c; Color c;
// mineral -- white --> turquoise?? (contrasts with red) // mineral -- white --> turquoise?? (contrasts with red)
// energy -- white --> red (contrasts with white) // energy -- white --> red (contrasts with white)
@@ -949,7 +950,8 @@ DoScan (MENU_STATE *pMS)
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetContext (SpaceContext); SetContext (SpaceContext);
BatchGraphics (); BatchGraphics ();
DrawPlanet (SIS_SCREEN_WIDTH - MAP_WIDTH, SIS_SCREEN_HEIGHT - MAP_HEIGHT, 0, 0); DrawPlanet (SIS_SCREEN_WIDTH - MAP_WIDTH,
SIS_SCREEN_HEIGHT - MAP_HEIGHT, 0, BLACK_COLOR);
UnbatchGraphics (); UnbatchGraphics ();
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
@@ -1001,7 +1003,7 @@ DoScan (MENU_STATE *pMS)
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetContext (ScanContext); SetContext (ScanContext);
BatchGraphics (); BatchGraphics ();
DrawPlanet (0, 0, 0, 0); DrawPlanet (0, 0, 0, BLACK_COLOR);
DrawScannedObjects (FALSE); DrawScannedObjects (FALSE);
UnbatchGraphics (); UnbatchGraphics ();
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
@@ -1079,26 +1081,27 @@ DoScan (MENU_STATE *pMS)
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
{ {
DWORD rgb; Color rgb;
// Alpha value will be ignored.
TimeCount TimeOut; TimeCount TimeOut;
switch (min_scan) switch (min_scan)
{ {
case MINERAL_SCAN: case MINERAL_SCAN:
rgb = MAKE_RGB15 (0x1f, 0x00, 0x00); rgb = BUILD_COLOR (MAKE_RGB15 (0x1f, 0x00, 0x00), 0x00);
break; break;
case ENERGY_SCAN: case ENERGY_SCAN:
rgb = MAKE_RGB15 (0x1f, 0x1f, 0x1f); rgb = BUILD_COLOR (MAKE_RGB15 (0x1f, 0x1f, 0x1f), 0x00);
break; break;
case BIOLOGICAL_SCAN: case BIOLOGICAL_SCAN:
rgb = MAKE_RGB15 (0x00, 0x1f, 0x00); rgb = BUILD_COLOR (MAKE_RGB15 (0x00, 0x1f, 0x00), 0x00);
break; break;
} }
// Draw a virgin surface // Draw a virgin surface
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
BatchGraphics (); BatchGraphics ();
DrawPlanet (0, 0, 0, 0); DrawPlanet (0, 0, 0, BLACK_COLOR);
UnbatchGraphics (); UnbatchGraphics ();
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
@@ -1129,7 +1132,7 @@ DoScan (MENU_STATE *pMS)
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
} }
pSolarSysState->Tint_rgb = 0; pSolarSysState->Tint_rgb = BLACK_COLOR;
} }
} }
@@ -1145,7 +1148,7 @@ DoScan (MENU_STATE *pMS)
SetContext (ScanContext); SetContext (ScanContext);
if (pMS->CurState == AUTO_SCAN) if (pMS->CurState == AUTO_SCAN)
{ {
DrawPlanet (0, 0, 0, 0); DrawPlanet (0, 0, 0, BLACK_COLOR);
DrawScannedObjects (FALSE); DrawScannedObjects (FALSE);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
sc2/src/uqm/planets/solarsys.c
+6 -6
View File
@@ -299,13 +299,13 @@ LoadSolarSys (void)
PLANET_DESC *pCurDesc; PLANET_DESC *pCurDesc;
DWORD old_seed; DWORD old_seed;
#define NUM_TEMP_RANGES 5 #define NUM_TEMP_RANGES 5
static const COLOR temp_color_array[NUM_TEMP_RANGES] = static const Color temp_color_array[NUM_TEMP_RANGES] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x0E), 0x54), BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x00, 0x0E), 0x54),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x06, 0x08), 0x62), BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x06, 0x08), 0x62),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x0B, 0x00), 0x6D), BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x0B, 0x00), 0x6D),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2D), BUILD_COLOR (MAKE_RGB15_INIT (0x0F, 0x00, 0x00), 0x2D),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x08, 0x00), 0x75), BUILD_COLOR (MAKE_RGB15_INIT (0x0F, 0x08, 0x00), 0x75),
}; };
pSolarSysState->MenuState.CurState = 0; pSolarSysState->MenuState.CurState = 0;
sc2/src/uqm/races.h
+23 -23
View File
@@ -640,29 +640,29 @@ enum
MAKE_BYTE (1, 5), /* YEHAT_REBEL_SHIP */ MAKE_BYTE (1, 5), /* YEHAT_REBEL_SHIP */
#define RACE_COLORS \ #define RACE_COLORS \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x10), 0x53), /* ARILOU_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x00, 0x10), 0x53), /* ARILOU_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00), /* CHMMR_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x00, 0x00), 0x00), /* CHMMR_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x01, 0x1f), 0x4D), /* HUMAN_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x01, 0x1f), 0x4D), /* HUMAN_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x0E, 0x00, 0x0E), 0x36), /* ORZ_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x0E, 0x00, 0x0E), 0x36), /* ORZ_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x06, 0x08), 0x62), /* PKUNK_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x06, 0x08), 0x62), /* PKUNK_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00), /* SHOFIXTI_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x00, 0x00), 0x00), /* SHOFIXTI_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x0C, 0x05, 0x00), 0x76), /* SPATHI_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x0C, 0x05, 0x00), 0x76), /* SPATHI_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x0C, 0x05, 0x00), 0x76), /* SUPOX_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x0C, 0x05, 0x00), 0x76), /* SUPOX_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x06, 0x08), 0x62), /* THRADDASH_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x06, 0x08), 0x62), /* THRADDASH_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x06, 0x08), 0x62), /* UTWIG_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x06, 0x08), 0x62), /* UTWIG_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x10), 0x53), /* VUX_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x00, 0x10), 0x53), /* VUX_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x00, 0x11), 0x3D), /* YEHAT_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x0A, 0x00, 0x11), 0x3D), /* YEHAT_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x06, 0x08), 0x62), /* MELNORME_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x06, 0x08), 0x62), /* MELNORME_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2D), /* DRUUGE_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x0F, 0x00, 0x00), 0x2D), /* DRUUGE_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x0E, 0x00, 0x0E), 0x36), /* ILWRATH_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x0E, 0x00, 0x0E), 0x36), /* ILWRATH_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x0E, 0x00, 0x0E), 0x36), /* MYCON_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x0E, 0x00, 0x0E), 0x36), /* MYCON_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x0C, 0x05, 0x00), 0x76), /* SLYLANDRO_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x0C, 0x05, 0x00), 0x76), /* SLYLANDRO_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x00, 0x11), 0x3D), /* UMGAH_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x0A, 0x00, 0x11), 0x3D), /* UMGAH_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x08, 0x00), 0x6E), /* URQUAN_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x08, 0x00), 0x6E), /* URQUAN_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2D), /* ZOQFOTPIK_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x0F, 0x00, 0x00), 0x2D), /* ZOQFOTPIK_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00), /* SYREEN_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x00, 0x00), 0x00), /* SYREEN_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x06, 0x06, 0x06), 0x20), /* BLACK_URQUAN_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x06, 0x06, 0x06), 0x20), /* BLACK_URQUAN_SHIP */ \
BUILD_COLOR (MAKE_RGB15 (0x14, 0x07, 0x1F), 0x39), /* YEHAT_REBEL_SHIP */ BUILD_COLOR (MAKE_RGB15_INIT (0x14, 0x07, 0x1F), 0x39), /* YEHAT_REBEL_SHIP */
#endif /* _RACES_H */ #endif /* _RACES_H */
sc2/src/uqm/ships/chmmr/chmmr.c
+13 -12
View File
@@ -205,12 +205,12 @@ initialize_megawatt_laser (ELEMENT *ShipPtr, HELEMENT LaserArray[])
RECT r; RECT r;
STARSHIP *StarShipPtr; STARSHIP *StarShipPtr;
LASER_BLOCK LaserBlock; LASER_BLOCK LaserBlock;
static const COLOR cycle_array[] = static const Color cycle_array[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2B), BUILD_COLOR (MAKE_RGB15_INIT (0x17, 0x00, 0x00), 0x2B),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7F), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x03, 0x00), 0x7F),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7B), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x11, 0x00), 0x7B),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7F), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x03, 0x00), 0x7F),
}; };
GetElementStarShip (ShipPtr, &StarShipPtr); GetElementStarShip (ShipPtr, &StarShipPtr);
@@ -354,13 +354,13 @@ chmmr_postprocess (ELEMENT *ElementPtr)
DISPLAY_TO_WORLD (8 + 9 + 11 + 14), DISPLAY_TO_WORLD (8 + 9 + 11 + 14),
DISPLAY_TO_WORLD (8 + 9 + 11 + 14 + 18), DISPLAY_TO_WORLD (8 + 9 + 11 + 14 + 18),
}; };
static const COLOR color_tab[] = static const Color color_tab[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x10), 0x53), BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x00, 0x10), 0x53),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x0E), 0x54), BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x00, 0x0E), 0x54),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x0C), 0x55), BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x00, 0x0C), 0x55),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x09), 0x56), BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x00, 0x09), 0x56),
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x07), 0x57), BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x00, 0x07), 0x57),
}; };
DWORD current_speed, max_speed; DWORD current_speed, max_speed;
@@ -375,7 +375,8 @@ chmmr_postprocess (ELEMENT *ElementPtr)
+ DISPLAY_TO_WORLD (CHMMR_OFFSET))) + DISPLAY_TO_WORLD (CHMMR_OFFSET)))
- ShipElementPtr->next.location.y; - ShipElementPtr->next.location.y;
angle = ARCTAN (dx, dy); angle = ARCTAN (dx, dy);
magnitude = WORLD_TO_VELOCITY (12) / ShipElementPtr->mass_points; magnitude = WORLD_TO_VELOCITY (12) /
ShipElementPtr->mass_points;
DeltaVelocityComponents (&ShipElementPtr->velocity, DeltaVelocityComponents (&ShipElementPtr->velocity,
COSINE (angle, magnitude), SINE (angle, magnitude)); COSINE (angle, magnitude), SINE (angle, magnitude));
sc2/src/uqm/ships/ilwrath/ilwrath.c
+43 -23
View File
@@ -233,26 +233,36 @@ ilwrath_preprocess (ELEMENT *ElementPtr)
lpPrim = &(GLOBAL (DisplayArray))[ElementPtr->PrimIndex]; lpPrim = &(GLOBAL (DisplayArray))[ElementPtr->PrimIndex];
if (GetPrimType (lpPrim) == STAMPFILL_PRIM) if (GetPrimType (lpPrim) == STAMPFILL_PRIM)
{ {
COLOR Color; Color color;
BOOLEAN weapon_discharge; BOOLEAN weapon_discharge;
Color = GetPrimColor (lpPrim); color = GetPrimColor (lpPrim);
weapon_discharge = ((status_flags & WEAPON) weapon_discharge = ((status_flags & WEAPON)
&& StarShipPtr->RaceDescPtr->ship_info.energy_level >= WEAPON_ENERGY_COST); && StarShipPtr->RaceDescPtr->ship_info.energy_level >= WEAPON_ENERGY_COST);
if (weapon_discharge if (weapon_discharge
|| (StarShipPtr->special_counter == 0 || (StarShipPtr->special_counter == 0
&& ((status_flags & SPECIAL) || Color != BLACK_COLOR))) && ((status_flags & SPECIAL) ||
!sameColor (color, BLACK_COLOR))))
{ {
if (Color == BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F)) if (sameColor (color,
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F)))
SetPrimType (lpPrim, STAMP_PRIM); SetPrimType (lpPrim, STAMP_PRIM);
else if (Color == BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B)) else if (sameColor (color,
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F)); BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B)))
else if (Color == BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03)) SetPrimColor (lpPrim,
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B)); BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F));
else if (Color == BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09)) else if (sameColor (color,
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03)); BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03)))
else if (Color == BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01)) SetPrimColor (lpPrim,
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09)); BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B));
else if (sameColor (color,
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09)))
SetPrimColor (lpPrim,
BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03));
else if (sameColor (color,
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01)))
SetPrimColor (lpPrim,
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09));
else else
{ {
ProcessSound (SetAbsSoundIndex ( ProcessSound (SetAbsSoundIndex (
@@ -329,21 +339,29 @@ ilwrath_preprocess (ELEMENT *ElementPtr)
status_flags &= ~SPECIAL; status_flags &= ~SPECIAL;
StarShipPtr->special_counter = 0; StarShipPtr->special_counter = 0;
} }
else if (Color != BLACK_COLOR) else if (!sameColor (color, BLACK_COLOR))
{ {
if (Color == BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01)) if (sameColor (color,
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01)))
{ {
SetPrimColor (lpPrim, BLACK_COLOR); SetPrimColor (lpPrim, BLACK_COLOR);
Untarget (ElementPtr); Untarget (ElementPtr);
} }
else if (Color == BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09)) else if (sameColor (color,
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01)); BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09)))
else if (Color == BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03)) SetPrimColor (lpPrim,
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09)); BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x14), 0x01));
else if (Color == BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B)) else if (sameColor (color,
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03)); BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03)))
SetPrimColor (lpPrim,
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x0A, 0x1F), 0x09));
else if (sameColor (color,
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B)))
SetPrimColor (lpPrim,
BUILD_COLOR (MAKE_RGB15 (0x00, 0x14, 0x14), 0x03));
else else
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B)); SetPrimColor (lpPrim,
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B));
ElementPtr->state_flags |= CHANGING; ElementPtr->state_flags |= CHANGING;
} }
@@ -353,12 +371,14 @@ ilwrath_preprocess (ELEMENT *ElementPtr)
&& StarShipPtr->special_counter == 0 && StarShipPtr->special_counter == 0
&& DeltaEnergy (ElementPtr, -SPECIAL_ENERGY_COST)) && DeltaEnergy (ElementPtr, -SPECIAL_ENERGY_COST))
{ {
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F)); SetPrimColor (lpPrim,
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F));
SetPrimType (lpPrim, STAMPFILL_PRIM); SetPrimType (lpPrim, STAMPFILL_PRIM);
ProcessSound (SetAbsSoundIndex ( ProcessSound (SetAbsSoundIndex (
/* CLOAKING_ON */ /* CLOAKING_ON */
StarShipPtr->RaceDescPtr->ship_data.ship_sounds, 1), ElementPtr); StarShipPtr->RaceDescPtr->ship_data.ship_sounds, 1),
ElementPtr);
StarShipPtr->special_counter = StarShipPtr->special_counter =
StarShipPtr->RaceDescPtr->characteristics.special_wait; StarShipPtr->RaceDescPtr->characteristics.special_wait;
sc2/src/uqm/ships/orz/orz.c
+13 -13
View File
@@ -318,21 +318,21 @@ ion_preprocess (ELEMENT *ElementPtr)
* entries. It then used some if statements to skip over these. * entries. It then used some if statements to skip over these.
* The current behaviour is the same as the old behavior. * The current behaviour is the same as the old behavior.
*/ */
static const COLOR colorTable[] = static const Color colorTable[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7a), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x15, 0x00), 0x7a),
//BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7b), //BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x11, 0x00), 0x7b),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7c), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0E, 0x00), 0x7c),
//BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x00), 0x7d), //BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0A, 0x00), 0x7d),
//BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7e), //BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x07, 0x00), 0x7e),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7f), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x03, 0x00), 0x7f),
//BUILD_COLOR (MAKE_RGB15 (0x1F, 0x00, 0x00), 0x2a), //BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x00, 0x00), 0x2a),
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2b), BUILD_COLOR (MAKE_RGB15_INIT (0x1B, 0x00, 0x00), 0x2b),
//BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2c), //BUILD_COLOR (MAKE_RGB15_INIT (0x17, 0x00, 0x00), 0x2c),
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2d), BUILD_COLOR (MAKE_RGB15_INIT (0x13, 0x00, 0x00), 0x2d),
//BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2e), //BUILD_COLOR (MAKE_RGB15_INIT (0x0F, 0x00, 0x00), 0x2e),
//BUILD_COLOR (MAKE_RGB15 (0x0B, 0x00, 0x00), 0x2f), //BUILD_COLOR (MAKE_RGB15_INIT (0x0B, 0x00, 0x00), 0x2f),
}; };
const size_t colorTabCount = sizeof colorTable / sizeof colorTable[0]; const size_t colorTabCount = sizeof colorTable / sizeof colorTable[0];
sc2/src/uqm/ships/pkunk/pkunk.c
+13 -13
View File
@@ -317,20 +317,20 @@ intercept_pkunk_death (ELEMENT *ElementPtr)
void void
spawn_phoenix_trail (ELEMENT *ElementPtr) spawn_phoenix_trail (ELEMENT *ElementPtr)
{ {
static const COLOR colorTable[] = static const Color colorTable[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7a), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x15, 0x00), 0x7a),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7b), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x11, 0x00), 0x7b),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7c), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0E, 0x00), 0x7c),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x00), 0x7d), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0A, 0x00), 0x7d),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7e), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x07, 0x00), 0x7e),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7f), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x03, 0x00), 0x7f),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x00, 0x00), 0x2a), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x00, 0x00), 0x2a),
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2b), BUILD_COLOR (MAKE_RGB15_INIT (0x1B, 0x00, 0x00), 0x2b),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2c), BUILD_COLOR (MAKE_RGB15_INIT (0x17, 0x00, 0x00), 0x2c),
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2d), BUILD_COLOR (MAKE_RGB15_INIT (0x13, 0x00, 0x00), 0x2d),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2e), BUILD_COLOR (MAKE_RGB15_INIT (0x0F, 0x00, 0x00), 0x2e),
BUILD_COLOR (MAKE_RGB15 (0x0B, 0x00, 0x00), 0x2f), BUILD_COLOR (MAKE_RGB15_INIT (0x0B, 0x00, 0x00), 0x2f),
}; };
const size_t colorTableCount = sizeof colorTable / sizeof colorTable[0]; const size_t colorTableCount = sizeof colorTable / sizeof colorTable[0];
sc2/src/uqm/ships/shofixti/shofixti.c
+22 -10
View File
@@ -152,22 +152,34 @@ destruct_preprocess (ELEMENT *ElementPtr)
{ {
SetPrimType (lpPrim, STAMPFILL_PRIM); SetPrimType (lpPrim, STAMPFILL_PRIM);
if (ElementPtr->life_span == DESTRUCT_SWITCH + 2) if (ElementPtr->life_span == DESTRUCT_SWITCH + 2)
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E)); SetPrimColor (lpPrim,
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E));
else else
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F)); SetPrimColor (lpPrim,
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F));
} }
else if (ElementPtr->life_span < DESTRUCT_SWITCH) else if (ElementPtr->life_span < DESTRUCT_SWITCH)
{ {
Color color = GetPrimColor (lpPrim);
ElementPtr->next.image.frame = ElementPtr->next.image.frame =
IncFrameIndex (ElementPtr->current.image.frame); IncFrameIndex (ElementPtr->current.image.frame);
if (GetPrimColor (lpPrim) == BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F)) if (sameColor (color,
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E)); BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F)))
else if (GetPrimColor (lpPrim) == BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E)) SetPrimColor (lpPrim,
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x0A), 0x0C)); BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E));
else if (GetPrimColor (lpPrim) == BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x0A), 0x0C)) else if (sameColor (color,
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x14, 0x0A, 0x00), 0x06)); BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E)))
else if (GetPrimColor (lpPrim) == BUILD_COLOR (MAKE_RGB15 (0x14, 0x0A, 0x00), 0x06)) SetPrimColor (lpPrim,
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x14, 0x00, 0x00), 0x04)); BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x0A), 0x0C));
else if (sameColor (color,
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x0A), 0x0C)))
SetPrimColor (lpPrim,
BUILD_COLOR (MAKE_RGB15 (0x14, 0x0A, 0x00), 0x06));
else if (sameColor (color,
BUILD_COLOR (MAKE_RGB15 (0x14, 0x0A, 0x00), 0x06)))
SetPrimColor (lpPrim,
BUILD_COLOR (MAKE_RGB15 (0x14, 0x00, 0x00), 0x04));
} }
else else
{ {
sc2/src/uqm/ships/sis_ship/sis_ship.c
+10 -10
View File
@@ -342,17 +342,17 @@ spawn_point_defense (ELEMENT *ElementPtr)
BOOLEAN PaidFor; BOOLEAN PaidFor;
HELEMENT hObject, hNextObject; HELEMENT hObject, hNextObject;
ELEMENT *ShipPtr; ELEMENT *ShipPtr;
COLOR LaserColor; Color LaserColor;
static const COLOR ColorRange[] = static const Color ColorRange[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7F), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x03, 0x00), 0x7F),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7E), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x07, 0x00), 0x7E),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x00), 0x7D), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0A, 0x00), 0x7D),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7C), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0E, 0x00), 0x7C),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7B), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x11, 0x00), 0x7B),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7A), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x15, 0x00), 0x7A),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x18, 0x00), 0x79), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x18, 0x00), 0x79),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1C, 0x00), 0x78), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x1C, 0x00), 0x78),
}; };
PaidFor = FALSE; PaidFor = FALSE;
sc2/src/uqm/ships/utwig/utwig.c
+13 -13
View File
@@ -325,20 +325,20 @@ utwig_preprocess (ELEMENT *ElementPtr)
* The current behaviour is the same as the old behavior, * The current behaviour is the same as the old behavior,
* but I am not sure that the old behavior was intended. - SvdB * but I am not sure that the old behavior was intended. - SvdB
*/ */
static const COLOR colorTable[] = static const Color colorTable[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7a), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x15, 0x00), 0x7a),
//BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7b), //BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x11, 0x00), 0x7b),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7c), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0E, 0x00), 0x7c),
//BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x00), 0x7d), //BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0A, 0x00), 0x7d),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7e), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x07, 0x00), 0x7e),
//BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7f), //BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x03, 0x00), 0x7f),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x00, 0x00), 0x2a), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x00, 0x00), 0x2a),
//BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2b), //BUILD_COLOR (MAKE_RGB15_INIT (0x1B, 0x00, 0x00), 0x2b),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2c), BUILD_COLOR (MAKE_RGB15_INIT (0x17, 0x00, 0x00), 0x2c),
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2d), BUILD_COLOR (MAKE_RGB15_INIT (0x13, 0x00, 0x00), 0x2d),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2e), BUILD_COLOR (MAKE_RGB15_INIT (0x0F, 0x00, 0x00), 0x2e),
//BUILD_COLOR (MAKE_RGB15 (0x0B, 0x00, 0x00), 0x2f), //BUILD_COLOR (MAKE_RGB15_INIT (0x0B, 0x00, 0x00), 0x2f),
}; };
const size_t colorTableCount = const size_t colorTableCount =
sizeof colorTable / sizeof colorTable[0]; sizeof colorTable / sizeof colorTable[0];
sc2/src/uqm/sis.c
+8 -8
View File
@@ -81,7 +81,7 @@ void
ClearSISRect (BYTE ClearFlags) ClearSISRect (BYTE ClearFlags)
{ {
RECT r; RECT r;
COLOR OldColor; Color OldColor;
CONTEXT OldContext; CONTEXT OldContext;
OldContext = SetContext (StatusContext); OldContext = SetContext (StatusContext);
@@ -441,7 +441,7 @@ DrawCaptainsName (void)
TEXT t; TEXT t;
CONTEXT OldContext; CONTEXT OldContext;
FONT OldFont; FONT OldFont;
COLOR OldColor; Color OldColor;
OldContext = SetContext (StatusContext); OldContext = SetContext (StatusContext);
OldFont = SetContextFont (TinyFont); OldFont = SetContextFont (TinyFont);
@@ -472,7 +472,7 @@ DrawFlagshipName (BOOLEAN InStatusArea)
RECT r; RECT r;
TEXT t; TEXT t;
FONT OldFont; FONT OldFont;
COLOR OldColor; Color OldColor;
CONTEXT OldContext; CONTEXT OldContext;
FRAME OldFontEffect; FRAME OldFontEffect;
UNICODE buf[250]; UNICODE buf[250];
@@ -533,7 +533,7 @@ DrawFlagshipStats (void)
RECT r; RECT r;
TEXT t; TEXT t;
FONT OldFont; FONT OldFont;
COLOR OldColor; Color OldColor;
FRAME OldFontEffect; FRAME OldFontEffect;
CONTEXT OldContext; CONTEXT OldContext;
UNICODE buf[128]; UNICODE buf[128];
@@ -1198,7 +1198,7 @@ GetCPodCapacity (POINT *ppt)
COUNT rowNr; COUNT rowNr;
COUNT colNr; COUNT colNr;
static const COLOR crewRows[] = PC_CREW_COLOR_TABLE; static const Color crewRows[] = PC_CREW_COLOR_TABLE;
crewCount = GetCrewCount (); crewCount = GetCrewCount ();
if (!GetCrewPodForCrewMember (crewCount, &slotNr, &seatNr)) if (!GetCrewPodForCrewMember (crewCount, &slotNr, &seatNr))
@@ -1300,7 +1300,7 @@ GetSBayCapacity (POINT *ppt)
COUNT rowNr; COUNT rowNr;
COUNT colNr; COUNT colNr;
static const COLOR colorBars[] = STORAGE_BAY_COLOR_TABLE; static const Color colorBars[] = STORAGE_BAY_COLOR_TABLE;
massCount = GetElementMass (); massCount = GetElementMass ();
if (!GetStorageCellForMineralUnit (massCount, &slotNr, &cellNr)) if (!GetStorageCellForMineralUnit (massCount, &slotNr, &cellNr))
@@ -1408,7 +1408,7 @@ GetFTankCapacity (POINT *ppt)
COUNT rowNr; COUNT rowNr;
static const COLOR fuelColors[] = FUEL_COLOR_TABLE; static const Color fuelColors[] = FUEL_COLOR_TABLE;
fuelAmount = GetFuelTotal (); fuelAmount = GetFuelTotal ();
if (!GetFuelTankForFuelUnit (fuelAmount, &slotNr, &compartmentNr)) if (!GetFuelTankForFuelUnit (fuelAmount, &slotNr, &compartmentNr))
@@ -1479,7 +1479,7 @@ DrawAutoPilotMessage (BOOLEAN Reset)
static DWORD cycle_index = 0; static DWORD cycle_index = 0;
BOOLEAN OnAutoPilot; BOOLEAN OnAutoPilot;
static const COLOR cycle_tab[] = AUTOPILOT_COLOR_CYCLE_TABLE; static const Color cycle_tab[] = AUTOPILOT_COLOR_CYCLE_TABLE;
const size_t cycleCount = sizeof cycle_tab / sizeof cycle_tab[0]; const size_t cycleCount = sizeof cycle_tab / sizeof cycle_tab[0];
#define BLINK_RATE (ONE_SECOND * 3 / 40) // 9 @ 120 ticks/second #define BLINK_RATE (ONE_SECOND * 3 / 40) // 9 @ 120 ticks/second
sc2/src/uqm/starbase.c
+2 -1
View File
@@ -82,7 +82,8 @@ void
DrawShipPiece (FRAME ModuleFrame, COUNT which_piece, COUNT which_slot, DrawShipPiece (FRAME ModuleFrame, COUNT which_piece, COUNT which_slot,
BOOLEAN DrawBluePrint) BOOLEAN DrawBluePrint)
{ {
COLOR OldColor = 0; // Initialisation is to keep the compiler silent. Color OldColor = UNDEFINED_COLOR;
// Initialisation is just to keep the compiler silent.
RECT r; RECT r;
STAMP Side, Top; STAMP Side, Top;
SBYTE RepairSlot; SBYTE RepairSlot;
sc2/src/uqm/status.c
+28 -28
View File
@@ -422,19 +422,19 @@ PostProcessStatus (ELEMENT *ShipPtr)
if (StarShipPtr->RaceDescPtr->ship_info.crew_level == 0) if (StarShipPtr->RaceDescPtr->ship_info.crew_level == 0)
{ {
BYTE i; BYTE i;
COLOR c; Color c;
RECT r; RECT r;
i = (BYTE)(NUM_EXPLOSION_FRAMES * 3 - 1) - ShipPtr->life_span; i = (BYTE)(NUM_EXPLOSION_FRAMES * 3 - 1) - ShipPtr->life_span;
if (i <= 4) if (i <= 4)
{ {
static const COLOR flash_tab0[] = static const Color flash_tab0[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2D), BUILD_COLOR (MAKE_RGB15_INIT (0x0F, 0x00, 0x00), 0x2D),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x19, 0x19), 0x24), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x19, 0x19), 0x24),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7B), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x11, 0x00), 0x7B),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1C, 0x00), 0x78), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x1C, 0x00), 0x78),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x1F, 0x1F), 0x0F),
}; };
c = flash_tab0[i]; c = flash_tab0[i];
@@ -449,23 +449,23 @@ PostProcessStatus (ELEMENT *ShipPtr)
i -= 5; i -= 5;
if (i <= 14) if (i <= 14)
{ {
static const COLOR flash_tab1[] = static const Color flash_tab1[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x1E, 0x1F, 0x12), 0x70), BUILD_COLOR (MAKE_RGB15_INIT (0x1E, 0x1F, 0x12), 0x70),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x0A), 0x0E), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x1F, 0x0A), 0x0E),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x00), 0x71), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x1F, 0x00), 0x71),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1C, 0x00), 0x78), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x1C, 0x00), 0x78),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x18, 0x00), 0x79), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x18, 0x00), 0x79),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7A), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x15, 0x00), 0x7A),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7B), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x11, 0x00), 0x7B),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7C), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0E, 0x00), 0x7C),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x00), 0x7D), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0A, 0x00), 0x7D),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7E), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x07, 0x00), 0x7E),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7F), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x03, 0x00), 0x7F),
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2A), BUILD_COLOR (MAKE_RGB15_INIT (0x1B, 0x00, 0x00), 0x2A),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2B), BUILD_COLOR (MAKE_RGB15_INIT (0x17, 0x00, 0x00), 0x2B),
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2C), BUILD_COLOR (MAKE_RGB15_INIT (0x13, 0x00, 0x00), 0x2C),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2D), BUILD_COLOR (MAKE_RGB15_INIT (0x0F, 0x00, 0x00), 0x2D),
}; };
c = flash_tab1[i]; c = flash_tab1[i];
@@ -516,7 +516,7 @@ PostProcessStatus (ELEMENT *ShipPtr)
break; break;
default: default:
// Should not happen. // Should not happen.
c = 0; // Keeping compiler quiet. c = UNDEFINED_COLOR; // Keeping compiler quiet.
break; break;
} }
DrawFilledRectangle (&r); DrawFilledRectangle (&r);
@@ -531,11 +531,11 @@ PostProcessStatus (ELEMENT *ShipPtr)
c = BLACK_COLOR; c = BLACK_COLOR;
else else
{ {
static const COLOR flash_tab2[] = static const Color flash_tab2[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2B), BUILD_COLOR (MAKE_RGB15_INIT (0x17, 0x00, 0x00), 0x2B),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2D), BUILD_COLOR (MAKE_RGB15_INIT (0x0F, 0x00, 0x00), 0x2D),
BUILD_COLOR (MAKE_RGB15 (0x0B, 0x00, 0x00), 0x2E), BUILD_COLOR (MAKE_RGB15_INIT (0x0B, 0x00, 0x00), 0x2E),
}; };
c = flash_tab2[i]; c = flash_tab2[i];
sc2/src/uqm/tactrans.c
+34 -34
View File
@@ -583,20 +583,20 @@ ship_death (ELEMENT *ShipPtr)
void void
cycle_ion_trail (ELEMENT *ElementPtr) cycle_ion_trail (ELEMENT *ElementPtr)
{ {
static const COLOR colorTab[] = static const Color colorTab[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7a), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x15, 0x00), 0x7a),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7b), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x11, 0x00), 0x7b),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7c), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0E, 0x00), 0x7c),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x00), 0x7d), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0A, 0x00), 0x7d),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7e), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x07, 0x00), 0x7e),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7f), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x03, 0x00), 0x7f),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x00, 0x00), 0x2a), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x00, 0x00), 0x2a),
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2b), BUILD_COLOR (MAKE_RGB15_INIT (0x1B, 0x00, 0x00), 0x2b),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2c), BUILD_COLOR (MAKE_RGB15_INIT (0x17, 0x00, 0x00), 0x2c),
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2d), BUILD_COLOR (MAKE_RGB15_INIT (0x13, 0x00, 0x00), 0x2d),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2e), BUILD_COLOR (MAKE_RGB15_INIT (0x0F, 0x00, 0x00), 0x2e),
BUILD_COLOR (MAKE_RGB15 (0x0B, 0x00, 0x00), 0x2f), BUILD_COLOR (MAKE_RGB15_INIT (0x0B, 0x00, 0x00), 0x2f),
}; };
const size_t colorTabCount = sizeof colorTab / sizeof colorTab[0]; const size_t colorTabCount = sizeof colorTab / sizeof colorTab[0];
@@ -795,28 +795,28 @@ flee_preprocess (ELEMENT *ElementPtr)
if (--ElementPtr->turn_wait == 0) if (--ElementPtr->turn_wait == 0)
{ {
static const COLOR colorTab[] = static const Color colorTab[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x0A, 0x00, 0x00), 0x2E), BUILD_COLOR (MAKE_RGB15_INIT (0x0A, 0x00, 0x00), 0x2E),
BUILD_COLOR (MAKE_RGB15 (0x0E, 0x00, 0x00), 0x2D), BUILD_COLOR (MAKE_RGB15_INIT (0x0E, 0x00, 0x00), 0x2D),
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2C), BUILD_COLOR (MAKE_RGB15_INIT (0x13, 0x00, 0x00), 0x2C),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2B), BUILD_COLOR (MAKE_RGB15_INIT (0x17, 0x00, 0x00), 0x2B),
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2A), BUILD_COLOR (MAKE_RGB15_INIT (0x1B, 0x00, 0x00), 0x2A),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x00, 0x00), 0x29), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x00, 0x00), 0x29),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x04, 0x04), 0x28), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x04, 0x04), 0x28),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x0A), 0x27), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0A, 0x0A), 0x27),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0F, 0x0F), 0x26), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0F, 0x0F), 0x26),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x13, 0x13), 0x25), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x13, 0x13), 0x25),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x19, 0x19), 0x24), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x19, 0x19), 0x24),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x13, 0x13), 0x25), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x13, 0x13), 0x25),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0F, 0x0F), 0x26), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0F, 0x0F), 0x26),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x0A), 0x27), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x0A, 0x0A), 0x27),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x04, 0x04), 0x28), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x04, 0x04), 0x28),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x00, 0x00), 0x29), BUILD_COLOR (MAKE_RGB15_INIT (0x1F, 0x00, 0x00), 0x29),
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2A), BUILD_COLOR (MAKE_RGB15_INIT (0x1B, 0x00, 0x00), 0x2A),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2B), BUILD_COLOR (MAKE_RGB15_INIT (0x17, 0x00, 0x00), 0x2B),
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2C), BUILD_COLOR (MAKE_RGB15_INIT (0x13, 0x00, 0x00), 0x2C),
BUILD_COLOR (MAKE_RGB15 (0x0E, 0x00, 0x00), 0x2D), BUILD_COLOR (MAKE_RGB15_INIT (0x0E, 0x00, 0x00), 0x2D),
}; };
const size_t colorTabCount = sizeof colorTab / sizeof colorTab[0]; const size_t colorTabCount = sizeof colorTab / sizeof colorTab[0];
sc2/src/uqm/uqmdebug.c
+12 -49
View File
@@ -1630,7 +1630,7 @@ dumpStrings (FILE *out)
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
static COLOR static Color
hsvaToRgba (double hue, double sat, double val, BYTE alpha) hsvaToRgba (double hue, double sat, double val, BYTE alpha)
{ {
unsigned int hi = (int) (hue / 60.0); unsigned int hi = (int) (hue / 60.0);
@@ -1665,31 +1665,6 @@ hsvaToRgba (double hue, double sat, double val, BYTE alpha)
return BUILD_COLOR_RGBA (0, 0, 0, alpha); return BUILD_COLOR_RGBA (0, 0, 0, alpha);
} }
// Work-around: colors returned by BUILD_COLOR_RGBA are not usable to draw
// with.
static DWORD
fixColorRgba (FRAME frame, COLOR col)
{
#if 0
extern DWORD frame_mapRGBA (FRAME FramePtr, BYTE r, BYTE g, BYTE b,
BYTE a);
BYTE r = (col & 0xff000000) >> 24;
BYTE g = (col & 0x00ff0000) >> 16;
BYTE b = (col & 0x0000ff00) >> 8;
BYTE a = (col & 0x000000ff) >> 0;
return (DWORD) frame_mapRGBA (frame, r, g, b, a);
#endif
BYTE r = (col & 0xff000000) >> 24;
BYTE g = (col & 0x00ff0000) >> 16;
BYTE b = (col & 0x0000ff00) >> 8;
(void) frame;
return BUILD_COLOR (MAKE_RGB15 (r >> 3, g >> 3, b >> 3) ,0);
}
// Workaround. DrawFilledRectangle() doesn't handle transparency. // Workaround. DrawFilledRectangle() doesn't handle transparency.
// We use a temporary frame to achieve the same thing. // We use a temporary frame to achieve the same thing.
static void static void
@@ -1700,7 +1675,7 @@ DrawFilledRectangleTransparent (RECT *rect, BYTE alpha)
RECT absRect; RECT absRect;
FRAME orgRectFrame; FRAME orgRectFrame;
COLOR fillColor; Color fillColor;
// Create a rectangle from 'rect', but with (0, 0) as origin. // Create a rectangle from 'rect', but with (0, 0) as origin.
absRect.corner.x = 0; absRect.corner.x = 0;
@@ -1718,23 +1693,13 @@ DrawFilledRectangleTransparent (RECT *rect, BYTE alpha)
// Apply the transparency to the colour. // Apply the transparency to the colour.
fillColor = GetContextForeGroundColor (); fillColor = GetContextForeGroundColor ();
#if 0 /* 32 bits RGBA */ fillColor.r = (fillColor.r * alpha + 127) / 255;
fillColor = fillColor.g = (fillColor.g * alpha + 127) / 255;
(((((fillColor & 0xff000000) >> 24) * alpha + 127) / 255) << 24) | fillColor.b = (fillColor.b * alpha + 127) / 255;
(((((fillColor & 0x00ff0000) >> 16) * alpha + 127) / 255) << 16) |
(((((fillColor & 0x0000ff00) >> 8) * alpha + 127) / 255) << 8);
*/
#endif
/* 15 bits RGB + index: */
fillColor =
(((((fillColor & 0x007c0000) >> 18) * alpha + 15) / 31) << 18) |
(((((fillColor & 0x0003e000) >> 13) * alpha + 15) / 31) << 13) |
(((((fillColor & 0x00001f00) >> 8) * alpha + 15) / 31) << 8) |
(fillColor & 0x000000ff);
// Fill the frame with fillColor // Fill the frame with fillColor
{ {
COLOR oldFgColor = SetContextForeGroundColor (fillColor); Color oldFgColor = SetContextForeGroundColor (fillColor);
DrawFilledRectangle (rect); DrawFilledRectangle (rect);
SetContextForeGroundColor (oldFgColor); SetContextForeGroundColor (oldFgColor);
FlushGraphics (); FlushGraphics ();
@@ -1796,10 +1761,10 @@ drawContext (CONTEXT context, double hue /* no pun intended */)
FRAME drawFrame; FRAME drawFrame;
CONTEXT oldContext; CONTEXT oldContext;
FONT oldFont; FONT oldFont;
COLOR oldFgCol; Color oldFgCol;
COLOR rectCol; Color rectCol;
COLOR lineCol; Color lineCol;
COLOR textCol; Color textCol;
bool haveClippingRect; bool haveClippingRect;
RECT rect; RECT rect;
LINE line; LINE line;
@@ -1807,10 +1772,8 @@ drawContext (CONTEXT context, double hue /* no pun intended */)
POINT p1, p2, p3, p4; POINT p1, p2, p3, p4;
drawFrame = GetContextFGFrame (); drawFrame = GetContextFGFrame ();
rectCol = (COLOR) fixColorRgba (drawFrame, rectCol = hsvaToRgba (hue, 1.0, 0.5, 127);
hsvaToRgba (hue, 1.0, 0.5, 127)); lineCol = hsvaToRgba (hue, 1.0, 1.0, 0);
lineCol = (COLOR) fixColorRgba (drawFrame,
hsvaToRgba (hue, 1.0, 1.0, 0));
textCol = lineCol; textCol = lineCol;
// Save the original context. // Save the original context.
sc2/src/uqm/util.c
+2 -2
View File
@@ -28,8 +28,8 @@
void void
DrawStarConBox (RECT *pRect, SIZE BorderWidth, COLOR TopLeftColor, COLOR DrawStarConBox (RECT *pRect, SIZE BorderWidth, Color TopLeftColor,
BottomRightColor, BOOLEAN FillInterior, COLOR InteriorColor) Color BottomRightColor, BOOLEAN FillInterior, Color InteriorColor)
{ {
RECT locRect; RECT locRect;
sc2/src/uqm/util.h
+2 -2
View File
@@ -21,8 +21,8 @@
#include "libs/gfxlib.h" #include "libs/gfxlib.h"
extern void DrawStarConBox (RECT *pRect, SIZE BorderWidth, extern void DrawStarConBox (RECT *pRect, SIZE BorderWidth,
COLOR TopLeftColor, COLOR BottomRightColor, BOOLEAN FillInterior, Color TopLeftColor, Color BottomRightColor, BOOLEAN FillInterior,
COLOR InteriorColor); Color InteriorColor);
extern DWORD SeedRandomNumbers (void); extern DWORD SeedRandomNumbers (void);
// saveRect can be NULL to save the entire context frame // saveRect can be NULL to save the entire context frame
sc2/src/uqm/weapon.h
+1 -1
View File
@@ -29,7 +29,7 @@ typedef struct
SIZE sender; // player number SIZE sender; // player number
SIZE pixoffs; SIZE pixoffs;
COUNT face; COUNT face;
COLOR color; Color color;
} LASER_BLOCK; } LASER_BLOCK;
typedef struct typedef struct