From 5c740551f3d844764f048d71c65e47a9d43c5a0b Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sun, 28 Jan 2018 19:41:26 +0100 Subject: [PATCH] Export sector effect pointers, fix missing pointer assignment on Lighting effect creation. --- src/p_lights.cpp | 1 + src/p_sectors.cpp | 6 +++--- wadsrc/static/zscript/mapdata.txt | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/p_lights.cpp b/src/p_lights.cpp index 2a52692b5..504095a40 100644 --- a/src/p_lights.cpp +++ b/src/p_lights.cpp @@ -191,6 +191,7 @@ DLighting::DLighting (sector_t *sector) : DSectorEffect (sector) { ChangeStatNum (STAT_LIGHT); + sector->lightingdata = this; } //----------------------------------------------------------------------------- diff --git a/src/p_sectors.cpp b/src/p_sectors.cpp index fb4789e17..1f65e952f 100644 --- a/src/p_sectors.cpp +++ b/src/p_sectors.cpp @@ -2490,9 +2490,9 @@ DEFINE_FIELD_X(Sector, sector_t, thinglist) DEFINE_FIELD_X(Sector, sector_t, friction) DEFINE_FIELD_X(Sector, sector_t, movefactor) DEFINE_FIELD_X(Sector, sector_t, terrainnum) -DEFINE_FIELD_X(Sector, sector_t, floordata) -DEFINE_FIELD_X(Sector, sector_t, ceilingdata) -DEFINE_FIELD_X(Sector, sector_t, lightingdata) +DEFINE_FIELD_UNSIZED(Sector, sector_t, floordata) +DEFINE_FIELD_UNSIZED(Sector, sector_t, ceilingdata) +DEFINE_FIELD_UNSIZED(Sector, sector_t, lightingdata) DEFINE_FIELD_X(Sector, sector_t, interpolations) DEFINE_FIELD_X(Sector, sector_t, soundtraversed) DEFINE_FIELD_X(Sector, sector_t, stairlock) diff --git a/wadsrc/static/zscript/mapdata.txt b/wadsrc/static/zscript/mapdata.txt index 99134a70a..12d4a8037 100644 --- a/wadsrc/static/zscript/mapdata.txt +++ b/wadsrc/static/zscript/mapdata.txt @@ -231,9 +231,9 @@ struct Sector native play native int terrainnum[2]; // thinker_t for reversable actions - //SectorEffect floordata; - //SectorEffect ceilingdata; - //SectorEffect lightingdata; + native SectorEffect floordata; + native SectorEffect ceilingdata; + native SectorEffect lightingdata; enum EPlane {