From e4281454ceebb8714020e6bf1a2c0274d72e5723 Mon Sep 17 00:00:00 2001
From: Marisa Heit <rheit@users.noreply.github.com>
Date: Sat, 15 Oct 2016 21:40:24 -0500
Subject: [PATCH] Split ANIMATED into three parts, filtered by game that uses
 them

- ANIMATED contained definitions for Doom, Heretic, and Strife, all
  crammed into a single file. This meant that animations from one game
  could erroneously make their way into maps for another game that
  provided custom textures with names that matched textures that animated
  in the other game. There are now three separate ANIMATED lumps with only
  the animations defined for the original game and no others. The one
  that gets loaded depends on the game being played.
- Added documentation for the ANIMATED file format to the comment for
  FTextureManager::InitAnimated(), since I had to figure it out from the
  code.
---
 src/textures/animations.cpp                     |  10 ++++++++++
 wadsrc/static/animated.lmp                      | Bin 1450 -> 0 bytes
 wadsrc/static/filter/game-doomchex/animated.lmp | Bin 0 -> 507 bytes
 wadsrc/static/filter/game-heretic/animated.lmp  | Bin 0 -> 185 bytes
 wadsrc/static/filter/game-strife/animated.lmp   | Bin 0 -> 760 bytes
 5 files changed, 10 insertions(+)
 delete mode 100644 wadsrc/static/animated.lmp
 create mode 100644 wadsrc/static/filter/game-doomchex/animated.lmp
 create mode 100644 wadsrc/static/filter/game-heretic/animated.lmp
 create mode 100644 wadsrc/static/filter/game-strife/animated.lmp

diff --git a/src/textures/animations.cpp b/src/textures/animations.cpp
index 74f9b1f55..f46289f07 100644
--- a/src/textures/animations.cpp
+++ b/src/textures/animations.cpp
@@ -161,6 +161,16 @@ FAnimDef *FTextureManager::AddComplexAnim (FTextureID picnum, const TArray<FAnim
 // [RH] Rewritten to support BOOM ANIMATED lump but also make absolutely
 //		no assumptions about how the compiler packs the animdefs array.
 //
+// Since animdef_t no longer exists in ZDoom, here is some documentation
+// of the format:
+//
+//   This is an array of <n> entries, terminated by a 0xFF byte. Each entry
+//   is 23 bytes long and consists of the following fields:
+//     Byte      0: Bit 1 set for wall texture, clear for flat texture.
+//     Bytes   1-9: '\0'-terminated name of first texture.
+//     Bytes 10-18: '\0'-terminated name of last texture.
+//     Bytes 19-22: Tics per frame (stored in little endian order).
+//
 //==========================================================================
 
 CVAR(Bool, debuganimated, false, 0)
diff --git a/wadsrc/static/animated.lmp b/wadsrc/static/animated.lmp
deleted file mode 100644
index 100c804c8a8aa4148ed05df34bccf8de671248b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1450
zcmY+E%Z{Tk5Jio8G@939J|zbFwKN2iC=Nu11oevl|B9J=t89|A6zTYM<+^N&nBjVI
zeODQyV2$}<@aGpdcd^cp^^~<j*1_EzYK<X4rjRC#;~vpQfL^j=9NW|G!x)9vq^EE^
zcRR!=<ZNA`TH&eMmRWyl$P0Gb_v~9Cg}h9`?c?!MAw<ARCsGYvOEo}s;g7LfTnHwC
z)9QYj{W#2(N$^n3b4xX#l4=P#yS@?)c&Ki|wG<6Vo$yLxhs#QksvD0sc(Vfe28$_c
zflV)23v7DdM0XsJqLA*y_%JVSacEFMx8!OHS9Fr#uIDavH8sJS?`VrFAC^U`3D*2f
zT4w_P*O}0%3T{4J4-64Vr(}f>7!(CG$m{~M7V#J=lfas9lD$r?8{&uY3a?qSY==%(
zf!z0c;gVXwn%@s0=tM&_yI?XW(+FVJB)gcFIi7oDCwQ#p(~)Z4HybS4@qFPN8-Zud
zY|+e?Q*y;QR*gB91|`J4C2jc<{lQ0cxy$<fN#`v~Zh5cHTbA5%(^cNG<d%2MNVZfx
zZCNu?G}E@~n%||anf42xqKT(IexdUORo27Q4!D&j3Ru<cIJ9xb@fCKT`S8?eSan&d
z#xPuPwIv2Zz?#3@605m8*>`HfTY3S<*vjvT7r+VR>F5f_P{5_A#)Ib}j0f<vqA?yf
z9iNNBHiL&eRRWvltAQB5>N}D{5Xx}B0vMhK8OOVQ;iq5~*h1po1-!3*6;S=}KTg2=
AssI20

diff --git a/wadsrc/static/filter/game-doomchex/animated.lmp b/wadsrc/static/filter/game-doomchex/animated.lmp
new file mode 100644
index 0000000000000000000000000000000000000000..016ce1fa3ff2b51f2f3f9b30f7919609cfdae182
GIT binary patch
literal 507
zcmY+AOAdlS5Ja1}@i@R>qRU1GLKwizfZYEi+S4DRtR63wqA6JR2?y^01S)_l(9<8d
z`PdkkPNoG+2Ye%C0Wy%(k~XYsN7cZPJ$J{rKBw{yAaGNi!Z`bqY6PrX-Y6~bm#%8l
z4=K6Om%1U}EubZr6tIiq%TWnK#g}lJbi-)^(M3N-e_#lpfRY~4*00OvK;b8y|C`eU
zj?-K+<KS2m{G{8k*Q^Qjk~~TDG?s#<+n&zI%QD!4MKaBB>ccd{sk=7fxKN9LZu0p8
Dh$dJa

literal 0
HcmV?d00001

diff --git a/wadsrc/static/filter/game-heretic/animated.lmp b/wadsrc/static/filter/game-heretic/animated.lmp
new file mode 100644
index 0000000000000000000000000000000000000000..80102c88e203ad1ccffd5f13a6e480f81111b5b1
GIT binary patch
literal 185
zcmYL>K@NZ*3<Q_N7=2EIA7~=PLr)6!|1VKmh;kaHlSP)ItQ;|bu%Ny6yQJ=}4Srpc
yq|NRIgn86iRJ}GJtV0Xm?6tu+!sV!kX@{<Z6<H$Cf#BOgxtz+)4<Jl!`*{JT)g=x9

literal 0
HcmV?d00001

diff --git a/wadsrc/static/filter/game-strife/animated.lmp b/wadsrc/static/filter/game-strife/animated.lmp
new file mode 100644
index 0000000000000000000000000000000000000000..ca656cfc303623bbd697cf3e3e2fbaa1b5544eda
GIT binary patch
literal 760
zcmY+C%Wi`(5JintRaM(XKLs1|S`rGWl!PFIg0kZOzoNZ&#zRUZq~oK>9gl6-&O=>w
zaqkjr+>67nou_Jyd12t)o9dpPTEM#x)e=%#h?kIzGT);>U;|)wHcVr@o{*j3e|2fq
z-m2@{wa=*q)|%O(nf;0{<H`rq2LLyydYiN_0H3BqZhE)U)-tf=v)Wn)wp?^!EdyIV
zH6yvDV%4%_q-drs)g}K+T{7(*Uv`Y=Q+)WXOHi2ZhPuP49HW3&UEjJoju>AdKiKfp
z*s$slR8Q5V$I%9tz`HND#A<BLen(B%%FSo(E!GY1K>-uUUFr&BDBw_3<Kj7lYXO{A
zG@i#@pHHu#HxK<|uS#IiV{>T`)6Rs{5-Wr<T!7)}#bUhsBR~r*A@RGqbbOius(=3g
DKTUvt

literal 0
HcmV?d00001