diff --git a/sc2/content/base/nav/orbitbackground-022.png b/sc2/content/base/nav/orbitbackground-022.png new file mode 100644 index 000000000..3c320f466 Binary files /dev/null and b/sc2/content/base/nav/orbitbackground-022.png differ diff --git a/sc2/content/base/nav/orbitbackground.ani b/sc2/content/base/nav/orbitbackground.ani index 4f967cce1..67f2756ed 100644 --- a/sc2/content/base/nav/orbitbackground.ani +++ b/sc2/content/base/nav/orbitbackground.ani @@ -20,3 +20,4 @@ orbitbackground-018.png 0 57 0 0 orbitbackground-019.png 0 57 9 6 orbitbackground-020.png 0 57 2 -15 orbitbackground-021.png 0 57 0 0 +orbitbackground-022.png 0 57 11 10 diff --git a/sc2/src/uqm/planets/plangen.c b/sc2/src/uqm/planets/plangen.c index 005a968c9..1f6449325 100644 --- a/sc2/src/uqm/planets/plangen.c +++ b/sc2/src/uqm/planets/plangen.c @@ -565,7 +565,7 @@ CreateShieldMask (void) red = 0; } - *pix = BUILD_COLOR_RGBA (red, 0, 0, alpha); + *pix = BUILD_COLOR_RGBA (0, 0, red, alpha); } } @@ -653,7 +653,7 @@ ApplyShieldTint (void) SetContextClipRect (NULL); GetContextClipRect (&r); - tint = BUILD_COLOR_RGBA (0xff, 0x00, 0x00, 0xff); + tint = BUILD_COLOR_RGBA (0x00, 0x00, 0xff, 0xff); #ifdef USE_ALPHA_SHIELD mode = MAKE_DRAW_MODE (DRAW_ALPHA, 150); #else @@ -794,7 +794,7 @@ RenderPlanetSphere (FRAME MaskFrame, int offset, BOOLEAN doThrob) r += c.r; if (r > 255) r = 255; - c.r = r; + c.b = r; } else { diff --git a/sc2/src/uqm/planets/solarsys.c b/sc2/src/uqm/planets/solarsys.c index 11bd4c0bf..930492d74 100644 --- a/sc2/src/uqm/planets/solarsys.c +++ b/sc2/src/uqm/planets/solarsys.c @@ -1532,7 +1532,8 @@ DrawInnerPlanets (PLANET_DESC *planet) if (i < NUMBER_OF_PLANET_TYPES && (planet->data_index & PLANET_SHIELDED)) { // Shielded world looks "shielded" in inner view - s.frame = SetAbsFrameIndex (SpaceJunkFrame, 17); + //s.frame = SetAbsFrameIndex (SpaceJunkFrame, 17); + s.frame = SetAbsFrameIndex (SpaceJunkFrame, 22); } DrawStamp (&s);