From 750bdd9d607f1a078d16b88a87d59b12bf0992a7 Mon Sep 17 00:00:00 2001
From: lachablock <lachsrb2@gmail.com>
Date: Sat, 22 May 2021 23:25:36 +1000
Subject: [PATCH] Respect mobj->color while enemies & bosses flash, but in
OpenGL
---
src/hardware/hw_main.c | 2 +-
src/hardware/hw_md2.c | 28 ++++++++++------------------
2 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index dd633d6fc..cec55e601 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -5327,7 +5327,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
else if (vis->mobj->type == MT_METALSONIC_BATTLE)
vis->colormap = R_GetTranslationColormap(TC_METALSONIC, 0, GTC_CACHE);
else
- vis->colormap = R_GetTranslationColormap(TC_BOSS, 0, GTC_CACHE);
+ vis->colormap = R_GetTranslationColormap(TC_BOSS, vis->mobj->color, GTC_CACHE);
}
else if (thing->color)
{
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 9c3aa9e58..fd7b67aad 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -777,24 +777,7 @@ static void HWR_CreateBlendedTexture(patch_t *gpatch, patch_t *blendgpatch, GLMi
while (size--)
{
- if (skinnum == TC_BOSS)
- {
- // Turn everything below a certain threshold white
- if ((image->s.red == image->s.green) && (image->s.green == image->s.blue) && image->s.blue < 127)
- {
- // Lactozilla: Invert the colors
- cur->s.red = cur->s.green = cur->s.blue = (255 - image->s.blue);
- }
- else
- {
- cur->s.red = image->s.red;
- cur->s.green = image->s.green;
- cur->s.blue = image->s.blue;
- }
-
- cur->s.alpha = image->s.alpha;
- }
- else if (skinnum == TC_ALLWHITE)
+ if (skinnum == TC_ALLWHITE)
{
// Turn everything white
cur->s.red = cur->s.green = cur->s.blue = 255;
@@ -1065,6 +1048,15 @@ skippixel:
cur->s.alpha = image->s.alpha;
}
+ else if (skinnum == TC_BOSS)
+ {
+ // Turn everything below a certain threshold white
+ if ((image->s.red == image->s.green) && (image->s.green == image->s.blue) && image->s.blue < 127)
+ {
+ // Lactozilla: Invert the colors
+ cur->s.red = cur->s.green = cur->s.blue = (255 - image->s.blue);
+ }
+ }
}
}
--
GitLab