diff --git a/engine/inc/C4Material.h b/engine/inc/C4Material.h index c7a093813..3a51e530c 100644 --- a/engine/inc/C4Material.h +++ b/engine/inc/C4Material.h @@ -147,7 +147,6 @@ class C4Material: public C4MaterialCore int32_t AboveTempConvertTo; // MatTex #ifdef C4ENGINE int32_t DefaultMatTex; // texture used for single pixel values - CPattern MatPattern; C4Facet PXSFace; // loose pixel facet void UpdateScriptPointers(); // set all material script pointers diff --git a/engine/src/C4Landscape.cpp b/engine/src/C4Landscape.cpp index 9888d592b..340e38835 100644 --- a/engine/src/C4Landscape.cpp +++ b/engine/src/C4Landscape.cpp @@ -2560,8 +2560,6 @@ DWORD C4Landscape::GetClrByTex(int32_t iX, int32_t iY) { // pattern color pTex->getPattern().PatternClr(iX, iY, pix, dwPix, Application.DDraw->Pal); - if(pTex->GetMaterial()) - pTex->GetMaterial()->MatPattern.PatternClr(iX, iY, pix, dwPix, Application.DDraw->Pal); } return dwPix; } diff --git a/engine/src/C4Material.cpp b/engine/src/C4Material.cpp index 26d413084..677211b11 100644 --- a/engine/src/C4Material.cpp +++ b/engine/src/C4Material.cpp @@ -406,14 +406,6 @@ void C4MaterialMap::CrossMapMaterials() // Called after load // search/create entry in texmap Map[cnt].DefaultMatTex = Game.TextureMap.GetIndex(Map[cnt].Name, szTextureOverlay, TRUE, FormatString("DefaultMatTex of mat %s", Map[cnt].Name).getData()); - const C4TexMapEntry *pTex = Game.TextureMap.GetEntry(Map[cnt].DefaultMatTex); - if (pTex) - { - // take pattern - Map[cnt].MatPattern = pTex->getPattern(); - // special zooming for overlay - Map[cnt].MatPattern.SetZoom((Map[cnt].OverlayType & C4MatOv_Exact) ? 1 : 2); - } // init PXS facet SURFACE sfcTexture; C4Texture * Texture; diff --git a/engine/src/C4ToolsDlg.cpp b/engine/src/C4ToolsDlg.cpp index 6c2db60eb..c35f48df6 100644 --- a/engine/src/C4ToolsDlg.cpp +++ b/engine/src/C4ToolsDlg.cpp @@ -655,13 +655,12 @@ void C4ToolsDlg::UpdatePreview() Application.DDraw->DrawBox(sfcPreview,0,0,iPrvWdt-1,iPrvHgt-1,CGray4); #endif BYTE bCol = 0; - CPattern Pattern1; - CPattern Pattern2; + CPattern Pattern; // Sky material: sky as pattern only if (SEqual(Material,C4TLS_MatSky)) { - Pattern1.SetColors(0, 0); - Pattern1.Set(Game.Landscape.Sky.Surface, 0, false); + Pattern.SetColors(0, 0); + Pattern.Set(Game.Landscape.Sky.Surface, 0, false); } // Material-Texture else @@ -677,13 +676,7 @@ void C4ToolsDlg::UpdatePreview() if(pTex) { // Set drawing pattern - Pattern2 = pTex->getPattern(); - // get and set extended texture of material - C4Material *pMat = pTex->GetMaterial(); - if (pMat && !(pMat->OverlayType & C4MatOv_None)) - { - Pattern1 = pMat->MatPattern; - } + Pattern = pTex->getPattern(); } } } @@ -697,7 +690,7 @@ void C4ToolsDlg::UpdatePreview() Application.DDraw->DrawPatternedCircle( sfcPreview, iPrvWdt/2,iPrvHgt/2, Grade, - bCol, Pattern1, Pattern2, *Game.Landscape.GetPal()); + bCol, Pattern, *Game.Landscape.GetPal()); Application.DDraw->AttachPrimaryPalette(sfcPreview); diff --git a/standard/inc/StdDDraw2.h b/standard/inc/StdDDraw2.h index 1c7959e3d..4ddc958bd 100644 --- a/standard/inc/StdDDraw2.h +++ b/standard/inc/StdDDraw2.h @@ -314,7 +314,7 @@ class CStdDDraw void DrawBox(SURFACE sfcDest, int iX1, int iY1, int iX2, int iY2, BYTE byCol); // calls DrawBoxDw void DrawBoxDw(SURFACE sfcDest, int iX1, int iY1, int iX2, int iY2, DWORD dwClr); // calls DrawBoxFade void DrawBoxFade(SURFACE sfcDest, float iX, float iY, float iWdt, float iHgt, DWORD dwClr1, DWORD dwClr2, DWORD dwClr3, DWORD dwClr4, int iBoxOffX, int iBoxOffY); // calls DrawQuadDw - void DrawPatternedCircle(SURFACE sfcDest, int x, int y, int r, BYTE col, CPattern & Pattern1, CPattern & Pattern2, CStdPalette &rPal); + void DrawPatternedCircle(SURFACE sfcDest, int x, int y, int r, BYTE col, CPattern & Pattern, CStdPalette &rPal); void DrawHorizontalLine(SURFACE sfcDest, int x1, int x2, int y, BYTE col); void DrawVerticalLine(SURFACE sfcDest, int x, int y1, int y2, BYTE col); void DrawFrame(SURFACE sfcDest, int x1, int y1, int x2, int y2, BYTE col); diff --git a/standard/src/StdDDraw2.cpp b/standard/src/StdDDraw2.cpp index 164ce650e..dd9cf0219 100644 --- a/standard/src/StdDDraw2.cpp +++ b/standard/src/StdDDraw2.cpp @@ -1544,7 +1544,7 @@ bool DLineSPixDw(int32_t x, int32_t y, int32_t dwClr) return true; } -void CStdDDraw::DrawPatternedCircle(SURFACE sfcDest, int x, int y, int r, BYTE col, CPattern & Pattern1, CPattern & Pattern2, CStdPalette &rPal) +void CStdDDraw::DrawPatternedCircle(SURFACE sfcDest, int x, int y, int r, BYTE col, CPattern & Pattern, CStdPalette &rPal) { if (!sfcDest->Lock()) return; for (int ycnt = -r; ycnt < r; ycnt++) @@ -1555,8 +1555,7 @@ void CStdDDraw::DrawPatternedCircle(SURFACE sfcDest, int x, int y, int r, BYTE c { // apply both patterns DWORD dwClr=rPal.GetClr(col); - Pattern1.PatternClr(xcnt, y + ycnt, col, dwClr, rPal); - Pattern2.PatternClr(xcnt, y + ycnt, col, dwClr, rPal); + Pattern.PatternClr(xcnt, y + ycnt, col, dwClr, rPal); sfcDest->SetPixDw(xcnt, y + ycnt, dwClr); } }