From db5ef0275f6a0ee47120191a5dc560610d6de42a Mon Sep 17 00:00:00 2001 From: Mike Swanson Date: Wed, 9 Oct 2019 12:20:47 -0700 Subject: [PATCH] flats: including dummy[123] in all IWAD targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xindage had a request to use dummy1 at least in Phase 1, and there doesn’t seem to be a good reason these were FreeDM-only. Fixes: #626 --- buildcfg.txt | 13 +++---------- flats/dummy1.png | Bin 262 -> 71 bytes flats/dummy2.png | Bin 292 -> 112 bytes flats/dummy3.png | Bin 1255 -> 1065 bytes 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/buildcfg.txt b/buildcfg.txt index 148ba909..7b355833 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -2612,16 +2612,6 @@ YSKUB0 6 17 [flats] -#ifdef FREEDM - -; These flats are only in the FreeDM wad. - -DUMMY1 -DUMMY2 -DUMMY3 - -#endif - BLOOD1 BLOOD2 BLOOD3 @@ -2638,6 +2628,9 @@ CEIL5_2 DEM1_3 DEM1_5 DEM1_6 +DUMMY1 +DUMMY2 +DUMMY3 FLAT17 FLAT1_1 FLAT1_2 diff --git a/flats/dummy1.png b/flats/dummy1.png index df05b5516cb5c95d1706eca545ac2806250ab087..adf84ef330b55f67f69a48fdba6ba0769072875d 100644 GIT binary patch delta 41 vcmZo;a-X20%;)Li7*fHQEWx_Cfr){E$$^1!l4Avs#lYa{>gTe~DWM4f!?g)_ literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^4j{}3Bp8~6e2Re-OS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>bP0l+XkKANfE- diff --git a/flats/dummy2.png b/flats/dummy2.png index 75c98f83fdfae4e37861fcec5e32e6690128c7d9..0a47f1093d177aca5fdf658accf7ce482801601e 100644 GIT binary patch delta 40 wcmZ3&R4_q>hdIC}#Fc@8VR@D9t%>=ftPCBjvK|xX$Z|4xy85}Sb4q9e0OiOFm;e9( delta 220 zcmXR|!Zbm}n!HI_N he}RS|H00)|WTsW(*0A%gKhP5l44$rjF6*2UngEfmK575} diff --git a/flats/dummy3.png b/flats/dummy3.png index 5838935e9d145cd79429cd0f1265a13ae322a191..445ed1ab1d904a348dd8cb3e7e17873bfcf89095 100644 GIT binary patch delta 23 fcmaFPxsqdo%EW}ojW-uFb250k`njxgN@xNAZx9H} delta 210 zcmZ3<@tkvliX}_Bqpu?a!^VE@KZ&di3=9g%9znhg3{`3j3=J&|48MRv4KElNN(~qo zUL`OvSj}Ky5HFasE6`@5VvHOEW0JSK3%gii$7`TE_7YEDSN4ZYqC$rHbx&{a-&nnr zIa{^FHKHUXu_V*AFnGH9xvX