diff --git a/polymer/eduke32/build/include/build.h b/polymer/eduke32/build/include/build.h index 06b36da07..5924fa110 100644 --- a/polymer/eduke32/build/include/build.h +++ b/polymer/eduke32/build/include/build.h @@ -324,7 +324,7 @@ typedef struct Tracker(Sector, int16_t) floorpicnum, floorheinum; Tracker(Sector, int8_t) floorshade; Tracker(Sector, uint8_t) floorpal, floorxpanning, floorypanning; - Tracker(Sector, uint8_t) /*CM_CEILINGZ:*/ visibility, filler; + Tracker(Sector, uint8_t) /*CM_CEILINGZ:*/ visibility, fogpal; Tracker(Sector, uint16_t) lotag, hitag; Tracker(Sector, int16_t) extra; } sectortypev7; @@ -425,7 +425,7 @@ typedef struct Tracker(Sector, int8_t) floorshade; Tracker(Sector, uint8_t) floorpal, floorxpanning, floorypanning; - Tracker(Sector, uint8_t) /*CM_CEILINGZ:*/ visibility, filler; + Tracker(Sector, uint8_t) /*CM_CEILINGZ:*/ visibility, fogpal; Tracker(Sector, uint16_t) lotag, hitag; Tracker(Sector, int16_t) extra; } sectortypevx; diff --git a/polymer/eduke32/build/include/polymost.h b/polymer/eduke32/build/include/polymost.h index e13f33a67..8d729d08b 100644 --- a/polymer/eduke32/build/include/polymost.h +++ b/polymer/eduke32/build/include/polymost.h @@ -77,15 +77,15 @@ static inline float getshadefactor(int32_t shade) return ((float)(numshades-clamped_shade))/(float)numshades; } -#define POLYMOST_CHOOSE_FOG_PAL(filler, pal) \ - ((filler) ? (filler) : (pal)) +#define POLYMOST_CHOOSE_FOG_PAL(fogpal, pal) \ + ((fogpal) ? (fogpal) : (pal)) static inline int32_t get_floor_fogpal(const sectortype *sec) { - return POLYMOST_CHOOSE_FOG_PAL(sec->filler, sec->floorpal); + return POLYMOST_CHOOSE_FOG_PAL(sec->fogpal, sec->floorpal); } static inline int32_t get_ceiling_fogpal(const sectortype *sec) { - return POLYMOST_CHOOSE_FOG_PAL(sec->filler, sec->ceilingpal); + return POLYMOST_CHOOSE_FOG_PAL(sec->fogpal, sec->ceilingpal); } typedef struct pthtyp_t diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index b064fc2d5..50e2a2681 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -1337,7 +1337,7 @@ static spritetype *loadsprite; #define CM_CSTAT hitag #define CM_ANG extra #define CM_FLOORZ(Sec) (*(int32_t *)§or[Sec].ceilingxpanning) // ceilingxpanning,ceilingypanning,floorpicnum -#define CM_CEILINGZ(Sec) (*(int32_t *)§or[Sec].visibility) // visibility,filler,lotag +#define CM_CEILINGZ(Sec) (*(int32_t *)§or[Sec].visibility) // visibility,fogpal,lotag // backup of original normalized coordinates #define CM_WALL_X(Wal) (*(int32_t *)&wall[Wal].picnum) // picnum, overpicnum diff --git a/polymer/eduke32/build/src/engine_oldmap.h b/polymer/eduke32/build/src/engine_oldmap.h index 415452bfe..02d521a7f 100644 --- a/polymer/eduke32/build/src/engine_oldmap.h +++ b/polymer/eduke32/build/src/engine_oldmap.h @@ -200,7 +200,7 @@ static void convertv6sectv7(struct sectortypev6 *from, sectortype *to) to->ceilingstat = from->ceilingstat; to->floorstat = from->floorstat; to->visibility = from->visibility; - to->filler = 0; + to->fogpal = 0; to->lotag = from->lotag; to->hitag = from->hitag; to->extra = from->extra; diff --git a/polymer/eduke32/build/src/polymost.c b/polymer/eduke32/build/src/polymost.c index adce00238..5880aff3b 100644 --- a/polymer/eduke32/build/src/polymost.c +++ b/polymer/eduke32/build/src/polymost.c @@ -2367,7 +2367,7 @@ static void polymost_drawalls(int32_t bunch) dapskyoff = getpsky(globalpicnum, NULL, &dapskybits); - global_cf_fogpal = sec->filler; + global_cf_fogpal = sec->fogpal; global_cf_shade = sec->floorshade, global_cf_pal = sec->floorpal; global_cf_z = sec->floorz; // REFACT global_cf_xpanning = sec->floorxpanning; global_cf_ypanning = sec->floorypanning, global_cf_heinum = sec->floorheinum; global_getzofslope_func = &getflorzofslope; @@ -2635,7 +2635,7 @@ static void polymost_drawalls(int32_t bunch) dapskyoff = getpsky(globalpicnum, NULL, &dapskybits); - global_cf_fogpal = sec->filler; + global_cf_fogpal = sec->fogpal; global_cf_shade = sec->ceilingshade, global_cf_pal = sec->ceilingpal; global_cf_z = sec->ceilingz; // REFACT global_cf_xpanning = sec->ceilingxpanning; global_cf_ypanning = sec->ceilingypanning, global_cf_heinum = sec->ceilingheinum; global_getzofslope_func = &getceilzofslope; diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index 529d91948..d2d0541d1 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -723,8 +723,8 @@ const memberlabel_t SectorLabels[]= { "floorxpanning", SECTOR_FLOORXPANNING, 0, 0 }, { "floorypanning", SECTOR_FLOORYPANNING, 0, 0 }, { "visibility", SECTOR_VISIBILITY, 0, 0 }, -// { "filler", SECTOR_ALIGNTO, 0, 0 }, - { "alignto", SECTOR_ALIGNTO, 0, 0 }, // aka filler, not used + { "fogpal", SECTOR_FOGPAL, 0, 0 }, // formerly filler + { "alignto", SECTOR_FOGPAL, 0, 0 }, // formerly filler { "lotag", SECTOR_LOTAG, 0, 0 }, { "hitag", SECTOR_HITAG, 0, 0 }, { "extra", SECTOR_EXTRA, 0, 0 }, diff --git a/polymer/eduke32/source/gamedef.h b/polymer/eduke32/source/gamedef.h index dfcc49b64..d92a72671 100644 --- a/polymer/eduke32/source/gamedef.h +++ b/polymer/eduke32/source/gamedef.h @@ -427,7 +427,7 @@ enum SectorLabel_t SECTOR_FLOORXPANNING, SECTOR_FLOORYPANNING, SECTOR_VISIBILITY, - SECTOR_ALIGNTO, + SECTOR_FOGPAL, SECTOR_LOTAG, SECTOR_HITAG, SECTOR_EXTRA, diff --git a/polymer/eduke32/source/gamestructures.c b/polymer/eduke32/source/gamestructures.c index a77b52e02..0478c192c 100644 --- a/polymer/eduke32/source/gamestructures.c +++ b/polymer/eduke32/source/gamestructures.c @@ -2362,13 +2362,13 @@ static void __fastcall VM_AccessSector(int32_t iSet, int32_t lVar1, int32_t lLab Gv_SetVarX(lVar2, sector[iSector].visibility); return; - case SECTOR_ALIGNTO: + case SECTOR_FOGPAL: if (iSet) { - sector[iSector].filler=lValue; + sector[iSector].fogpal=lValue; return; } - Gv_SetVarX(lVar2, sector[iSector].filler); + Gv_SetVarX(lVar2, sector[iSector].fogpal); return; case SECTOR_LOTAG: @@ -3581,7 +3581,7 @@ static int32_t __fastcall VM_AccessSectorX(int32_t iSector, int32_t lLabelID) case SECTOR_FLOORXPANNING: return sector[iSector].floorxpanning; case SECTOR_FLOORYPANNING: return sector[iSector].floorypanning; case SECTOR_VISIBILITY: return sector[iSector].visibility; - case SECTOR_ALIGNTO: return sector[iSector].filler; + case SECTOR_FOGPAL: return sector[iSector].fogpal; case SECTOR_LOTAG: return (int16_t)sector[iSector].lotag; case SECTOR_HITAG: return (int16_t)sector[iSector].hitag; case SECTOR_ULOTAG: return sector[iSector].lotag; diff --git a/polymer/eduke32/source/lunatic/con_lang.lua b/polymer/eduke32/source/lunatic/con_lang.lua index 79d9bd141..9c7a6b8ca 100644 --- a/polymer/eduke32/source/lunatic/con_lang.lua +++ b/polymer/eduke32/source/lunatic/con_lang.lua @@ -710,8 +710,8 @@ local SectorLabels = { floorypanning = SEC".floorypanning", visibility = SEC".visibility", - filler = SEC".filler", - alignto = SEC".filler", -- NAME + fogpal = SEC".fogpal", + alignto = SEC".fogpal", -- NAME lotag = SEC".lotag", hitag = SEC".hitag", diff --git a/polymer/eduke32/source/lunatic/defs_common.lua b/polymer/eduke32/source/lunatic/defs_common.lua index 78890165a..c02dbe2dc 100644 --- a/polymer/eduke32/source/lunatic/defs_common.lua +++ b/polymer/eduke32/source/lunatic/defs_common.lua @@ -205,7 +205,7 @@ string.format([[ }; ]], CF_MEMBERS:gsub("~","ceiling"), CF_MEMBERS:gsub("~","floor")) ..[[ - uint8_t visibility, filler; + uint8_t visibility, fogpal; int16_t lotag, hitag; // NOTE: signed for Lunatic int16_t extra; }]] diff --git a/polymer/eduke32/source/lunatic/engine_maptext.lua b/polymer/eduke32/source/lunatic/engine_maptext.lua index fa6dce2c2..b7c9142fc 100644 --- a/polymer/eduke32/source/lunatic/engine_maptext.lua +++ b/polymer/eduke32/source/lunatic/engine_maptext.lua @@ -43,7 +43,7 @@ local sector_members = { Y = "ceilingypanning", y = "floorypanning", v = "visibility", - _ = "filler", + _ = "fogpal", o = "lotag", i = "hitag", e = { "extra", -1 } } diff --git a/polymer/eduke32/source/lunatic/util/build.lua b/polymer/eduke32/source/lunatic/util/build.lua index aaf3cd835..1fe60b084 100644 --- a/polymer/eduke32/source/lunatic/util/build.lua +++ b/polymer/eduke32/source/lunatic/util/build.lua @@ -29,7 +29,7 @@ local STRUCTDEF = { int16_t floorpicnum, floorheinum; int8_t floorshade; uint8_t floorpal, floorxpanning, floorypanning; - uint8_t visibility, filler; + uint8_t visibility, fogpal; int16_t lotag, hitag, extra; ]], diff --git a/polymer/eduke32/source/lunatic/util/map2text.lua b/polymer/eduke32/source/lunatic/util/map2text.lua index 2fba2b132..67e90f4e4 100755 --- a/polymer/eduke32/source/lunatic/util/map2text.lua +++ b/polymer/eduke32/source/lunatic/util/map2text.lua @@ -58,7 +58,7 @@ local sector_members = { "floorpicnum", "floorheinum", "floorshade", "floorpal", "floorxpanning", "floorypanning", - "visibility", "filler", + "visibility", "fogpal", "lotag", "hitag", "extra", } diff --git a/polymer/eduke32/source/m32def.c b/polymer/eduke32/source/m32def.c index 5268469ba..a197309a4 100644 --- a/polymer/eduke32/source/m32def.c +++ b/polymer/eduke32/source/m32def.c @@ -441,12 +441,12 @@ const memberlabel_t SectorLabels[]= { "floorxpanning", SECTOR_FLOORXPANNING, 0, 0, 0 }, { "floorypanning", SECTOR_FLOORYPANNING, 0, 0, 0 }, { "visibility", SECTOR_VISIBILITY, 0, 0, 0 }, - { "alignto", SECTOR_ALIGNTO, 0, 0, 0 }, // aka filler, not used + { "fogpal", SECTOR_FOGPAL, 0, 0, 0 }, // formerly filler { "lotag", SECTOR_LOTAG, 0, 0, 0 }, { "hitag", SECTOR_HITAG, 0, 0, 0 }, { "extra", SECTOR_EXTRA, 0, 0, 0 }, // aliases - { "filler", SECTOR_ALIGNTO, 0, 0, 0 }, + { "alignto", SECTOR_FOGPAL, 0, 0, 0 }, // formerly filler { "ceilingheinum", SECTOR_CEILINGSLOPE, 0, 0, 0}, { "floorheinum", SECTOR_FLOORSLOPE, 0, 0, 0}, diff --git a/polymer/eduke32/source/m32def.h b/polymer/eduke32/source/m32def.h index a68ab4d3b..bafad822d 100644 --- a/polymer/eduke32/source/m32def.h +++ b/polymer/eduke32/source/m32def.h @@ -186,7 +186,7 @@ enum SectorLabel_t SECTOR_FLOORXPANNING, SECTOR_FLOORYPANNING, SECTOR_VISIBILITY, - SECTOR_ALIGNTO, + SECTOR_FOGPAL, SECTOR_LOTAG, SECTOR_HITAG, SECTOR_EXTRA, diff --git a/polymer/eduke32/source/m32structures.c b/polymer/eduke32/source/m32structures.c index cea1a916b..c3da422db 100644 --- a/polymer/eduke32/source/m32structures.c +++ b/polymer/eduke32/source/m32structures.c @@ -220,7 +220,7 @@ static int32_t __fastcall VM_AccessSector(int32_t how, int32_t lVar1, int32_t lL case SECTOR_FLOORXPANNING: sector[i].floorxpanning=lValue; break; case SECTOR_FLOORYPANNING: sector[i].floorypanning=lValue; break; case SECTOR_VISIBILITY: sector[i].visibility=lValue; break; - case SECTOR_ALIGNTO: sector[i].filler=lValue; break; + case SECTOR_FOGPAL: sector[i].fogpal=lValue; break; case SECTOR_LOTAG: sector[i].lotag=lValue; break; case SECTOR_HITAG: sector[i].hitag=lValue; break; case SECTOR_EXTRA: sector[i].extra=lValue; break; @@ -253,7 +253,7 @@ static int32_t __fastcall VM_AccessSector(int32_t how, int32_t lVar1, int32_t lL case SECTOR_FLOORXPANNING: lValue=sector[i].floorxpanning; break; case SECTOR_FLOORYPANNING: lValue=sector[i].floorypanning; break; case SECTOR_VISIBILITY: lValue=sector[i].visibility; break; - case SECTOR_ALIGNTO: lValue=sector[i].filler; break; + case SECTOR_FOGPAL: lValue=sector[i].fogpal; break; case SECTOR_LOTAG: lValue=sector[i].lotag; break; case SECTOR_HITAG: lValue=sector[i].hitag; break; case SECTOR_EXTRA: lValue=sector[i].extra; break;