diff --git a/buildcfg.txt b/buildcfg.txt index 6ca04f31..a9105309 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -2756,8 +2756,6 @@ BRBRICK BRBRICK2 CONCRETE CAMO1 -CAMO2 -CAMO3 CAMO4 CAMO5 MUD diff --git a/patches/camo2.gif b/patches/camo2.gif deleted file mode 120000 index b107bf87..00000000 --- a/patches/camo2.gif +++ /dev/null @@ -1 +0,0 @@ -catoptromancy/camo2.gif \ No newline at end of file diff --git a/patches/camo3.gif b/patches/camo3.gif deleted file mode 120000 index 0ace19fe..00000000 --- a/patches/camo3.gif +++ /dev/null @@ -1 +0,0 @@ -catoptromancy/camo3.gif \ No newline at end of file diff --git a/patches/catoptromancy/brick1.gif b/patches/catoptromancy/brick1.gif index d2f7f2fb..15f3cba4 100644 Binary files a/patches/catoptromancy/brick1.gif and b/patches/catoptromancy/brick1.gif differ diff --git a/patches/catoptromancy/brown2.gif b/patches/catoptromancy/brown2.gif index bd9520d7..b5ec8c83 100644 Binary files a/patches/catoptromancy/brown2.gif and b/patches/catoptromancy/brown2.gif differ diff --git a/patches/catoptromancy/camo1.gif b/patches/catoptromancy/camo1.gif index 678a528c..4df01692 100644 Binary files a/patches/catoptromancy/camo1.gif and b/patches/catoptromancy/camo1.gif differ diff --git a/patches/catoptromancy/camo2.gif b/patches/catoptromancy/camo2.gif deleted file mode 100644 index c2d1e4c0..00000000 Binary files a/patches/catoptromancy/camo2.gif and /dev/null differ diff --git a/patches/catoptromancy/camo3.gif b/patches/catoptromancy/camo3.gif deleted file mode 100644 index 3fc0d9e7..00000000 Binary files a/patches/catoptromancy/camo3.gif and /dev/null differ diff --git a/patches/catoptromancy/mosrok2.gif b/patches/catoptromancy/mosrok2.gif index fb4455b3..66c0d5d8 100644 Binary files a/patches/catoptromancy/mosrok2.gif and b/patches/catoptromancy/mosrok2.gif differ diff --git a/textures/combined.txt b/textures/combined.txt index 1833315e..9aed1c24 100644 --- a/textures/combined.txt +++ b/textures/combined.txt @@ -309,7 +309,6 @@ TEKWALL5 128 128 #ifdef DOOM2 ; these textures are in doom 2, but not doom 1: - ASHWALL3 64 128 * RW22_2 0 0 ASHWALL4 64 128 @@ -376,6 +375,16 @@ BSTONE1 64 128 * RW1_1 0 0 BSTONE3 64 128 * RW12_2 0 0 +A-CAMO1 128 128 +* CAMO1 0 0 +A-CAMO2 256 128 +* CAMO1 0 0 +* CAMO1 128 0 +* W107_1 0 0 +A-CAMO3 256 128 +* CAMO1 0 0 +* CAMO1 128 0 +* W106_1 0 0 CEMENT7 64 128 * RW7_1 0 0 CEMENT8 64 128 @@ -388,6 +397,25 @@ CRACKLE4 64 128 * RW44_4 0 0 DBRAIN1 64 32 * RWDM11A 0 0 +* MC1 0 0 +* MC2 0 0 +* MC3 0 0 +* MC4 0 0 +* MC5 0 0 +* MC6 0 0 +* MC7 0 0 +* MC8 0 0 +* MC10 0 0 +* MC11 0 0 +* MC12 0 0 +* MC13 0 0 +* MC14 0 0 +* MC15 0 0 +* MC16 0 0 +* MC17 0 0 +* MC18 0 0 +* MC19 0 0 +* MC20 0 0 DBRAIN2 64 32 * RWDM11B 0 0 DBRAIN3 64 32