From 0205320a1d2aa2e06b8e54085df3ac65a6e22f6a Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Mon, 13 Jun 2022 09:18:29 +0200
Subject: [PATCH] Export static transparancy data to .dun files

---
 .../assets/Levels/L1Data/SklKngT.dun          | Bin 0 -> 31454 bytes
 .../assets/Levels/L2Data/bonechaT.dun         | Bin 0 -> 19588 bytes
 Source/gendung.cpp                            |  24 -------
 Source/gendung.h                              |   2 -
 Source/setmaps.cpp                            |  63 +-----------------
 5 files changed, 2 insertions(+), 87 deletions(-)
 create mode 100644 Packaging/resources/assets/Levels/L1Data/SklKngT.dun
 create mode 100644 Packaging/resources/assets/Levels/L2Data/bonechaT.dun

diff --git a/Packaging/resources/assets/Levels/L1Data/SklKngT.dun b/Packaging/resources/assets/Levels/L1Data/SklKngT.dun
new file mode 100644
index 0000000000000000000000000000000000000000..8e6166ab27d1baef00af9bc32a87afef20b68f96
GIT binary patch
literal 31454
zcmeI#ZEk}=3`J2lX}(v`1$6&gtPma9*v5fLN~H8=elVB`ejEr=zU52!Ab<b@2q1s}
z0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
zAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_0
z00IagfIt-3Nj2j7Eh<%_-4+3o9%M>Tk`hh{N>aipK}kwDB`8U$Iqk)cR!zRJVaX=i
zZ`ikLwKUUFbezPF>g;{T$h6Gu)lQ!>9YboLX}V(A8$bFq9VbuI>Gyc=#`hb}L#C+t
zh?6~=eG@$U-uaCAzD+aE$&^W{(^;ya>(<P&j`wTYp-ObtWnHuTIqV8;u{6_7vZ3e6
zX13$}Jbv@lnGO<1mFX%vGNoI*#7Sk|Mvufqhw=&6MA!7rwM-u}9W9u4o}c~aOigWG
zM~`gfL?-|18=vOp;<tK-s#*I*=(c(n*!Q?kGw$b^ss!`L-XoJ<MV$5BGcTs+ZTIdX
zcC@OlTQl?BmhHz5Hqj*>UR7C^!LN!f{x(zW=M%O6Qg$Vo#QiHB)Z*veo#GYuRi5e8
Pmmq$NOwlB(^f~<ifLb5*

literal 0
HcmV?d00001

diff --git a/Packaging/resources/assets/Levels/L2Data/bonechaT.dun b/Packaging/resources/assets/Levels/L2Data/bonechaT.dun
new file mode 100644
index 0000000000000000000000000000000000000000..2645dc45c984a7242c1f2af1fce4391997fa9a9e
GIT binary patch
literal 19588
zcmeIxSqj2H5QO1!-wk*I?|({>I3YFDiIPQ7e(NO)rkHQK@4AT(0tg_000IagfB*sr
zAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_0
z00IagfB*sr{JOwGo~824dqQtt6z$7->$B6-pWi<I^A6y*=YJ*7TJ3C9X4><6`^wta
zLHlOf`t0=o*S}SNhWZ~==cqX8n)=(fgZ=5B#y`KGojiNRN&Y9r`SkwjcLCSmb?EP3
z+jr>DKPCP*+wa}aZ}huBJpKRUf05^^b}E&rM=S0BS#i<;mJ{Z`c>BfLuR(kDdNKXA
mK&*dG{BQSvsDD#1@_~LAXm4NN{EuXB{_gFc?_cwR&W8shPbaeg

literal 0
HcmV?d00001

diff --git a/Source/gendung.cpp b/Source/gendung.cpp
index 21bbfec4a..7567442ef 100644
--- a/Source/gendung.cpp
+++ b/Source/gendung.cpp
@@ -502,30 +502,6 @@ void DRLG_CopyTrans(int sx, int sy, int dx, int dy)
 	dTransVal[dx][dy] = dTransVal[sx][sy];
 }
 
-void DRLG_ListTrans(int num, BYTE *list)
-{
-	for (int i = 0; i < num; i++) {
-		uint8_t x1 = *list++;
-		uint8_t y1 = *list++;
-		uint8_t x2 = *list++;
-		uint8_t y2 = *list++;
-		DRLG_RectTrans(x1, y1, x2, y2);
-	}
-}
-
-void DRLG_AreaTrans(int num, BYTE *list)
-{
-	for (int i = 0; i < num; i++) {
-		uint8_t x1 = *list++;
-		uint8_t y1 = *list++;
-		uint8_t x2 = *list++;
-		uint8_t y2 = *list++;
-		DRLG_RectTrans(x1, y1, x2, y2);
-		TransVal--;
-	}
-	TransVal++;
-}
-
 void DRLG_InitSetPC()
 {
 	SetPiecesRoom = { { -1, -1 }, { -1, -1 } };
diff --git a/Source/gendung.h b/Source/gendung.h
index b74c2fa3e..114fa9b2b 100644
--- a/Source/gendung.h
+++ b/Source/gendung.h
@@ -333,8 +333,6 @@ void DRLG_InitTrans();
 void DRLG_MRectTrans(int x1, int y1, int x2, int y2);
 void DRLG_RectTrans(int x1, int y1, int x2, int y2);
 void DRLG_CopyTrans(int sx, int sy, int dx, int dy);
-void DRLG_ListTrans(int num, BYTE *List);
-void DRLG_AreaTrans(int num, BYTE *List);
 void DRLG_InitSetPC();
 void DRLG_SetPC();
 void Make_SetPC(int x, int y, int w, int h);
diff --git a/Source/setmaps.cpp b/Source/setmaps.cpp
index 21f388d66..1a1cdefb9 100644
--- a/Source/setmaps.cpp
+++ b/Source/setmaps.cpp
@@ -34,60 +34,6 @@ const char *const QuestLevelNames[] = {
 
 namespace {
 
-// BUGFIX: constant data should be const
-BYTE SkelKingTrans1[] = {
-	19, 47, 26, 55,
-	26, 49, 30, 53
-};
-
-BYTE SkelKingTrans2[] = {
-	33, 19, 47, 29,
-	37, 29, 43, 39
-};
-
-BYTE SkelKingTrans3[] = {
-	27, 53, 35, 61,
-	27, 35, 34, 42,
-	45, 35, 53, 43,
-	45, 53, 53, 61,
-	31, 39, 49, 57
-};
-
-BYTE SkelKingTrans4[] = {
-	49, 45, 58, 51,
-	57, 31, 62, 37,
-	63, 31, 69, 40,
-	59, 41, 73, 55,
-	63, 55, 69, 65,
-	73, 45, 78, 51,
-	79, 43, 89, 53
-};
-
-BYTE SkelChamTrans1[] = {
-	43, 19, 50, 26,
-	51, 19, 59, 26,
-	35, 27, 42, 34,
-	43, 27, 49, 34,
-	50, 27, 59, 34
-};
-
-BYTE SkelChamTrans2[] = {
-	19, 31, 34, 47,
-	34, 35, 42, 42
-};
-
-BYTE SkelChamTrans3[] = {
-	43, 35, 50, 42,
-	51, 35, 62, 42,
-	63, 31, 66, 46,
-	67, 31, 78, 34,
-	67, 35, 78, 42,
-	67, 43, 78, 46,
-	35, 43, 42, 51,
-	43, 43, 49, 51,
-	50, 43, 59, 51
-};
-
 void AddSKingObjs()
 {
 	constexpr Rectangle SmallSecretRoom { { 20, 7 }, { 3, 3 } };
@@ -152,10 +98,7 @@ void LoadSetMap()
 		LoadPreL1Dungeon("Levels\\L1Data\\SklKng1.DUN");
 		LoadL1Dungeon("Levels\\L1Data\\SklKng2.DUN", 83, 45);
 		LoadPalette("Levels\\L1Data\\L1_2.pal");
-		DRLG_AreaTrans(sizeof(SkelKingTrans1) / 4, &SkelKingTrans1[0]);
-		DRLG_ListTrans(sizeof(SkelKingTrans2) / 4, &SkelKingTrans2[0]);
-		DRLG_AreaTrans(sizeof(SkelKingTrans3) / 4, &SkelKingTrans3[0]);
-		DRLG_ListTrans(sizeof(SkelKingTrans4) / 4, &SkelKingTrans4[0]);
+		SetMapTransparency("Levels\\L1Data\\SklKngT.dun");
 		AddL1Objs(0, 0, MAXDUNX, MAXDUNY);
 		AddSKingObjs();
 		InitSKingTriggers();
@@ -164,9 +107,7 @@ void LoadSetMap()
 		LoadPreL2Dungeon("Levels\\L2Data\\Bonecha2.DUN");
 		LoadL2Dungeon("Levels\\L2Data\\Bonecha1.DUN", 69, 39);
 		LoadPalette("Levels\\L2Data\\L2_2.pal");
-		DRLG_ListTrans(sizeof(SkelChamTrans1) / 4, &SkelChamTrans1[0]);
-		DRLG_AreaTrans(sizeof(SkelChamTrans2) / 4, &SkelChamTrans2[0]);
-		DRLG_ListTrans(sizeof(SkelChamTrans3) / 4, &SkelChamTrans3[0]);
+		SetMapTransparency("Levels\\L2Data\\BonechaT.dun");
 		AddL2Objs(0, 0, MAXDUNX, MAXDUNY);
 		AddSChamObjs();
 		InitSChambTriggers();