SET_PLAYER_COLOR keeps Heart flames and Guard flags for white (#3840)

dkfans · Jan 21, 2025 · 5295b8d · 5295b8d
1 parent 4faba21
commit 5295b8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/config/fxdata/spritecolors.toml b/config/fxdata/spritecolors.toml
@@ -58,6 +58,6 @@ animationIds = [
 
 # Stuff in objects.cfg
 objects = [
-    [115, 115, 116, 117, 118, 119, 161, 164, 166, 168],#guardflag
-    [111, 111, 120, 121, 122,   0, 162, 165, 167, 169],#heartflame
+    [115, 115, 116, 117, 118, 161, 119, 164, 166, 168],#guardflag
+    [111, 111, 120, 121, 122, 162,   0, 165, 167, 169],#heartflame
 ]
diff --git a/src/thing_objects.c b/src/thing_objects.c
@@ -492,6 +492,7 @@ TbBool object_is_guard_flag(const struct Thing *thing)
       case ObjMdl_GuardFlagBlue:
       case ObjMdl_GuardFlagGreen:
       case ObjMdl_GuardFlagYellow:
+      case ObjMdl_GuardFlagWhite:
       case ObjMdl_GuardFlagPurple:
       case ObjMdl_GuardFlagBlack:
       case ObjMdl_GuardFlagOrange: