diff --git a/Packaging/resources/assets/Levels/L1Data/SklKngT.dun b/Packaging/resources/assets/Levels/L1Data/SklKngT.dun new file mode 100644 index 000000000..8e6166ab2 Binary files /dev/null and b/Packaging/resources/assets/Levels/L1Data/SklKngT.dun differ diff --git a/Packaging/resources/assets/Levels/L2Data/bonechaT.dun b/Packaging/resources/assets/Levels/L2Data/bonechaT.dun new file mode 100644 index 000000000..2645dc45c Binary files /dev/null and b/Packaging/resources/assets/Levels/L2Data/bonechaT.dun differ 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();