From 5ec47d8b4f025942c5f36dd570a6483c208e5061 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 19 May 2018 08:25:26 +0200 Subject: [PATCH] - removed some leftover data in sector_t. --- src/r_defs.h | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/src/r_defs.h b/src/r_defs.h index 49a6d244d7..a9e7e57c75 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -979,6 +979,12 @@ public: double CenterFloor() const { return floorplane.ZatPoint(centerspot); } double CenterCeiling() const { return ceilingplane.ZatPoint(centerspot); } + void CopyColors(sector_t *other) + { + memcpy(SpecialColors, other->SpecialColors, sizeof(SpecialColors)); + Colormap = other->Colormap; + } + // [RH] store floor and ceiling planes instead of heights secplane_t floorplane, ceilingplane; @@ -986,26 +992,6 @@ public: PalEntry SpecialColors[5]; FColormap Colormap; -private: - FDynamicColormap *_ColorMap; // [RH] Per-sector colormap - -public: - // just a helper for refactoring - FDynamicColormap *GetColorMap() - { - return _ColorMap; - } - - void CopyColors(sector_t *other) - { - memcpy(SpecialColors, other->SpecialColors, sizeof(SpecialColors)); - Colormap = other->Colormap; - - _ColorMap = other->_ColorMap; - } - - - TObjPtr SoundTarget; short special;