mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-02-21 19:31:26 +00:00
Add fadingdata to sector_t
This commit is contained in:
parent
c1c6b4746f
commit
3e8d264a2d
3 changed files with 8 additions and 1 deletions
|
@ -2564,6 +2564,11 @@ static inline void LoadFadeThinker(actionf_p1 thinker)
|
||||||
ht->destvalue = READINT32(save_p);
|
ht->destvalue = READINT32(save_p);
|
||||||
ht->speed = READINT32(save_p);
|
ht->speed = READINT32(save_p);
|
||||||
ht->handleflags = READUINT32(save_p);
|
ht->handleflags = READUINT32(save_p);
|
||||||
|
|
||||||
|
sector_t *ffloorsector = LoadSector(ht->affectee);
|
||||||
|
if (ffloorsector)
|
||||||
|
ffloorsector->fadingdata = ht;
|
||||||
|
|
||||||
P_AddThinker(&ht->thinker);
|
P_AddThinker(&ht->thinker);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2753,7 +2758,7 @@ static void P_NetUnArchiveThinkers(void)
|
||||||
// clear sector thinker pointers so they don't point to non-existant thinkers for all of eternity
|
// clear sector thinker pointers so they don't point to non-existant thinkers for all of eternity
|
||||||
for (i = 0; i < numsectors; i++)
|
for (i = 0; i < numsectors; i++)
|
||||||
{
|
{
|
||||||
sectors[i].floordata = sectors[i].ceilingdata = sectors[i].lightingdata = NULL;
|
sectors[i].floordata = sectors[i].ceilingdata = sectors[i].lightingdata = sectors[i].fadingdata = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// read in saved thinkers
|
// read in saved thinkers
|
||||||
|
|
|
@ -693,6 +693,7 @@ static void P_LoadRawSectors(UINT8 *data, size_t i)
|
||||||
ss->floordata = NULL;
|
ss->floordata = NULL;
|
||||||
ss->ceilingdata = NULL;
|
ss->ceilingdata = NULL;
|
||||||
ss->lightingdata = NULL;
|
ss->lightingdata = NULL;
|
||||||
|
ss->fadingdata = NULL;
|
||||||
|
|
||||||
ss->linecount = 0;
|
ss->linecount = 0;
|
||||||
ss->lines = NULL;
|
ss->lines = NULL;
|
||||||
|
|
|
@ -308,6 +308,7 @@ typedef struct sector_s
|
||||||
void *floordata; // floor move thinker
|
void *floordata; // floor move thinker
|
||||||
void *ceilingdata; // ceiling move thinker
|
void *ceilingdata; // ceiling move thinker
|
||||||
void *lightingdata; // lighting change thinker
|
void *lightingdata; // lighting change thinker
|
||||||
|
void *fadingdata; // fading FOF thinker
|
||||||
|
|
||||||
// floor and ceiling texture offsets
|
// floor and ceiling texture offsets
|
||||||
fixed_t floor_xoffs, floor_yoffs;
|
fixed_t floor_xoffs, floor_yoffs;
|
||||||
|
|
Loading…
Reference in a new issue