Further tweaks to Ancient Aliens compatibility

bradharding · Aug 24, 2024 · b942403 · b942403
1 parent b885639
commit b942403
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/res/DRCOMPAT.lmp b/res/DRCOMPAT.lmp
@@ -1,6 +1,7 @@
 ANYBOSSDEATH UAC_DEAD.WAD
 FIXSPRITEOFFSETS AALIENS.WAD
 FIXSPRITEOFFSETS AALIENS_V1_2.WAD
+FIXSPRITEOFFSETS AALIENS_V1_3_UMAPINFO.WAD
 FIXSPRITEOFFSETS BTSX_E1A.WAD
 FIXSPRITEOFFSETS BTSX_E2A.WAD
 FIXSPRITEOFFSETS BTSXE3PR.WAD
@@ -11,22 +12,17 @@ FIXSPRITEOFFSETS SUNLUST.WAD
 FIXSPRITEOFFSETS VALIANT.WAD
 INCOMPATIBLEPALETTE AALIENS.WAD
 INCOMPATIBLEPALETTE AALIENS_V1_2.WAD
+INCOMPATIBLEPALETTE AALIENS_V1_3_UMAPINFO.WAD
 INCOMPATIBLEPALETTE KDIKDI_A.WAD
 INCOMPATIBLEPALETTE KDIKDI_B.WAD
 LIQUID ALQ01 ALQ04 AVACTOR.WAD
 LIQUID BLQ01 BLQ04 AVACTOR.WAD
 LIQUID DLQ01 DLQ04 AVACTOR.WAD
 LIQUID OLQ01 OLQ04 AVACTOR.WAD
-LIQUID PLOOD1 PLOOD3 AALIENS.WAD
-LIQUID PLOOD1 PLOOD3 AALIENS_V1_2.WAD
-LIQUID PURPW1 PURPW4 AALIENS.WAD
-LIQUID PURPW1 PURPW4 AALIENS_V1_2.WAD
 LIQUID QASLN01 QASLN24 DOTB_RC3.WAD
 LIQUID QAWTS01 QAWTS24 DOTB_RC3.WAD
 LIQUID QAWTT01 QAWTT24 DOTB_RC3.WAD
 LIQUID RLQ01 RLQ04 AVACTOR.WAD
-LIQUID ZO1_01 ZO1_99 AALIENS.WAD
-LIQUID ZO1_01 ZO1_99 AALIENS_V1_2.WAD
 NOBLUEGREENBLOOD AVACTOR.WAD
 NOBLUEGREENBLOOD DBP65.WAD
 NOBRIGHTMAP COMPSTA1 SCYTHEX.WAD

diff --git a/res/doomretro.wad b/res/doomretro.wad
diff --git a/src/p_spec.c b/src/p_spec.c
@@ -139,6 +139,7 @@ static struct
     terraintype_t   terraintype;
 } texturepacks[] = {
     { "GRAYSLM1", "GRAYSLM4", GRAYSLIME },
+    { "MLAVA1",   "MLAVA4",   LAVA      },
     { "OBLODA01", "OBLODA08", BLOOD     },
     { "OGOOPY01", "OGOOPY08", GOOP      },
     { "OICYWA01", "OICYWA08", ICYWATER  },
@@ -148,6 +149,10 @@ static struct
     { "OSLUDG01", "OSLUDG08", SLUDGE    },
     { "OTAR__01", "OTAR__08", TAR       },
     { "OWATER01", "OWATER08", SLUDGE    },
+    { "PLOOD1",   "PLOOD3",   LIQUID    },
+    { "PURPW1",   "PURPW4",   WATER     },
+    { "TEALW1",   "TEALW4",   WATER     },
+    { "ZO1_01",   "ZO1_99",   LAVA      },
     { "",         "",         0         }
 };
 
@@ -234,7 +239,8 @@ void P_InitPicAnims(void)
                 SetTerrainType(lastanim, NUKAGE);
                 isliquid = true;
             }
-            else if ((basepic >= FWATER1 && basepic <= FWATER4) || (basepic >= SWATER1 && basepic <= SWATER4))
+            else if ((basepic >= FWATER1 && basepic <= FWATER4)
+                || (basepic >= SWATER1 && basepic <= SWATER4))
             {
                 SetTerrainType(lastanim, WATER);
                 isliquid = true;
@@ -258,12 +264,14 @@ void P_InitPicAnims(void)
             // Check if name of flat indicates it is liquid
             if (!isliquid)
             {
-                if (M_StrCaseStr(animdefs[i].startname, "NUK") && !M_StrCaseStr(animdefs[i].startname, "WALK"))
+                if (M_StrCaseStr(animdefs[i].startname, "NUK")
+                    && !M_StrCaseStr(animdefs[i].startname, "WALK"))
                 {
                     SetTerrainType(lastanim, NUKAGE);
                     isliquid = true;
                 }
-                else if (M_StrCaseStr(animdefs[i].startname, "WAT") || M_StrCaseStr(animdefs[i].startname, "WTR")
+                else if (M_StrCaseStr(animdefs[i].startname, "WAT")
+                    || M_StrCaseStr(animdefs[i].startname, "WTR")
                     || M_StrCaseStr(animdefs[i].startname, "WAV"))
                 {
                     SetTerrainType(lastanim, WATER);
@@ -279,8 +287,10 @@ void P_InitPicAnims(void)
                     SetTerrainType(lastanim, BLOOD);
                     isliquid = true;
                 }
-                else if ((M_StrCaseStr(animdefs[i].startname, "SLI") && (basepic < SLIME09 || basepic > SLIME12))
-                    || M_StrCaseStr(animdefs[i].startname, "SLM") || M_StrCaseStr(animdefs[i].startname, "POOP"))
+                else if ((M_StrCaseStr(animdefs[i].startname, "SLI")
+                    && (basepic < SLIME09 || basepic > SLIME12))
+                    || M_StrCaseStr(animdefs[i].startname, "SLM")
+                    || M_StrCaseStr(animdefs[i].startname, "POOP"))
                 {
                     SetTerrainType(lastanim, SLIME);
                     isliquid = true;