lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactor function and variable names; change defaults for fake floor fader line flags

Browse source
This commit is contained in:
mazmazz 2018-08-17 15:13:05 -04:00
parent 020b18b84b
commit 45ae6efbad
3 changed files with 50 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_saveg.c
View file

@ -1572,9 +1572,9 @@ static void SaveFadeThinker(const thinker_t *th, const UINT8 type)
WRITEINT16(save_p, ht->speed); WRITEINT16(save_p, ht->speed);
WRITEUINT8(save_p, ht->doexists); WRITEUINT8(save_p, ht->doexists);
WRITEUINT8(save_p, ht->dotranslucent); WRITEUINT8(save_p, ht->dotranslucent);
WRITEUINT8(save_p, ht->dosolid); WRITEUINT8(save_p, ht->docollision);
WRITEUINT8(save_p, ht->dospawnflags);
WRITEUINT8(save_p, ht->doghostfade); WRITEUINT8(save_p, ht->doghostfade);
WRITEUINT8(save_p, ht->exactalpha);
} }
// //
@ -2575,9 +2575,9 @@ static inline void LoadFadeThinker(actionf_p1 thinker)
ht->speed = READINT16(save_p); ht->speed = READINT16(save_p);
ht->doexists = READUINT8(save_p); ht->doexists = READUINT8(save_p);
ht->dotranslucent = READUINT8(save_p); ht->dotranslucent = READUINT8(save_p);
ht->dosolid = READUINT8(save_p); ht->docollision = READUINT8(save_p);
ht->dospawnflags = READUINT8(save_p);
ht->doghostfade = READUINT8(save_p); ht->doghostfade = READUINT8(save_p);
ht->exactalpha = READUINT8(save_p);
sector_t *ss = LoadSector(ht->sectornum); sector_t *ss = LoadSector(ht->sectornum);
if (ss) if (ss)

87
src/p_spec.c
View file

@ -103,15 +103,13 @@ static void P_SpawnFriction(void);
static void P_SpawnPushers(void); static void P_SpawnPushers(void);
static void Add_Pusher(pushertype_e type, fixed_t x_mag, fixed_t y_mag, mobj_t *source, INT32 affectee, INT32 referrer, INT32 exclusive, INT32 slider); //SoM: 3/9/2000 static void Add_Pusher(pushertype_e type, fixed_t x_mag, fixed_t y_mag, mobj_t *source, INT32 affectee, INT32 referrer, INT32 exclusive, INT32 slider); //SoM: 3/9/2000
static void Add_MasterDisappearer(tic_t appeartime, tic_t disappeartime, tic_t offset, INT32 line, INT32 sourceline); static void Add_MasterDisappearer(tic_t appeartime, tic_t disappeartime, tic_t offset, INT32 line, INT32 sourceline);
static void P_ResetFading(ffloor_t *rover, fade_t *data); static void P_ResetFakeFloorFader(ffloor_t *rover, fade_t *data);
#define P_RemoveFading(l) P_ResetFading(l, NULL); #define P_RemoveFakeFloorFader(l) P_ResetFakeFloorFader(l, NULL);
static boolean P_DoFakeFloorAlpha(ffloor_t *rover, INT16 destvalue, INT16 speed, static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed,
boolean doexists, boolean dotranslucent, boolean dosolid, boolean dospawnflags, boolean doexists, boolean dotranslucent, boolean docollision, boolean doghostfade, boolean exactalpha);
boolean doghostfade); static void P_AddFakeFloorFader(ffloor_t *rover, size_t sectornum, size_t ffloornum,
static void P_AddMasterFader(ffloor_t *rover, size_t sectornum, size_t ffloornum,
INT16 destvalue, INT16 speed, INT16 destvalue, INT16 speed,
boolean doexists, boolean dotranslucent, boolean dosolid, boolean dospawnflags, boolean doexists, boolean dotranslucent, boolean docollision, boolean doghostfade, boolean exactalpha);
boolean doghostfade);
static void P_AddBlockThinker(sector_t *sec, line_t *sourceline); static void P_AddBlockThinker(sector_t *sec, line_t *sourceline);
static void P_AddFloatThinker(sector_t *sec, INT32 tag, line_t *sourceline); static void P_AddFloatThinker(sector_t *sec, INT32 tag, line_t *sourceline);
//static void P_AddBridgeThinker(line_t *sourceline, sector_t *sec); //static void P_AddBridgeThinker(line_t *sourceline, sector_t *sec);
@ -3136,23 +3134,23 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
} }
if (speed > 0) if (speed > 0)
P_AddMasterFader(rover, secnum, j, P_AddFakeFloorFader(rover, secnum, j,
destvalue, speed, destvalue, speed,
(line->flags & ML_BLOCKMONSTERS), // handle FF_EXISTS !(line->flags & ML_BLOCKMONSTERS), // do not handle FF_EXISTS
!(line->flags & ML_NOCLIMB), // do not handle FF_TRANSLUCENT !(line->flags & ML_NOCLIMB), // do not handle FF_TRANSLUCENT
(line->flags & ML_BOUNCY), // handle FF_SOLID !(line->flags & ML_BOUNCY), // do not handle interactive flags
(line->flags & ML_EFFECT1), // handle spawnflags (line->flags & ML_EFFECT1), // do ghost fade (no interactive flags during fade)
(line->flags & ML_EFFECT2)); // enable flags on fade-in finish only (line->flags & ML_TFERLINE)); // use exact alpha values (for opengl)
else else
{ {
P_RemoveFading(rover); P_RemoveFakeFloorFader(rover);
P_DoFakeFloorAlpha(rover, P_FadeFakeFloor(rover,
destvalue, 0, // set alpha immediately destvalue, 0, // set alpha immediately
(line->flags & ML_BLOCKMONSTERS), // handle FF_EXISTS !(line->flags & ML_BLOCKMONSTERS), // do not handle FF_EXISTS
!(line->flags & ML_NOCLIMB), // do not handle FF_TRANSLUCENT !(line->flags & ML_NOCLIMB), // do not handle FF_TRANSLUCENT
(line->flags & ML_BOUNCY), // handle FF_SOLID !(line->flags & ML_BOUNCY), // do not handle interactive flags
(line->flags & ML_EFFECT1), // handle spawnflags (line->flags & ML_EFFECT1), // do ghost fade (no interactive flags during fade)
(line->flags & ML_EFFECT2)); // enable flags on fade-in finish only (line->flags & ML_TFERLINE)); // use exact alpha values (for opengl)
} }
} }
break; break;
@ -3187,7 +3185,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
return; return;
} }
P_RemoveFading(rover); P_RemoveFakeFloorFader(rover);
} }
break; break;
} }
@ -7198,7 +7196,7 @@ void T_Disappear(disappear_t *d)
* \param line line to search for target faders * \param line line to search for target faders
* \param data pointer to set new fadingdata to. Can be NULL to erase. * \param data pointer to set new fadingdata to. Can be NULL to erase.
*/ */
static void P_ResetFading(ffloor_t *rover, fade_t *data) static void P_ResetFakeFloorFader(ffloor_t *rover, fade_t *data)
{ {
// find any existing thinkers and remove them, then replace with new data // find any existing thinkers and remove them, then replace with new data
if(((fade_t *)rover->fadingdata) != data) if(((fade_t *)rover->fadingdata) != data)
@ -7210,9 +7208,8 @@ static void P_ResetFading(ffloor_t *rover, fade_t *data)
} }
} }
static boolean P_DoFakeFloorAlpha(ffloor_t *rover, INT16 destvalue, INT16 speed, static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed,
boolean doexists, boolean dotranslucent, boolean dosolid, boolean dospawnflags, boolean doexists, boolean dotranslucent, boolean docollision, boolean doghostfade, boolean exactalpha)
boolean doghostfade)
{ {
boolean stillfading = false; boolean stillfading = false;
@ -7226,7 +7223,7 @@ static boolean P_DoFakeFloorAlpha(ffloor_t *rover, INT16 destvalue, INT16 speed,
{ {
rover->alpha = destvalue; rover->alpha = destvalue;
if (dosolid) if (docollision)
{ {
if (rover->spawnflags & FF_SOLID) if (rover->spawnflags & FF_SOLID)
rover->flags &= ~FF_SOLID; rover->flags &= ~FF_SOLID;
@ -7251,7 +7248,7 @@ static boolean P_DoFakeFloorAlpha(ffloor_t *rover, INT16 destvalue, INT16 speed,
{ {
rover->alpha = destvalue; rover->alpha = destvalue;
if (dosolid) if (docollision)
{ {
if (rover->spawnflags & FF_SOLID) if (rover->spawnflags & FF_SOLID)
rover->flags |= FF_SOLID; rover->flags |= FF_SOLID;
@ -7316,7 +7313,7 @@ static boolean P_DoFakeFloorAlpha(ffloor_t *rover, INT16 destvalue, INT16 speed,
// rover->flags |= FF_CUTSPRITES; // rover->flags |= FF_CUTSPRITES;
} }
if (dosolid) if (docollision)
{ {
if (doghostfade) // remove interaction flags during fade if (doghostfade) // remove interaction flags during fade
{ {
@ -7346,21 +7343,19 @@ static boolean P_DoFakeFloorAlpha(ffloor_t *rover, INT16 destvalue, INT16 speed,
return stillfading; return stillfading;
} }
/** Adds master fader thinker. /** Adds fake floor fader thinker.
* *
* \param destvalue transparency value to fade to * \param destvalue transparency value to fade to
* \param speed speed to fade by * \param speed speed to fade by
* \param doexists handle FF_EXISTS * \param doexists handle FF_EXISTS
* \param dotranslucent handle FF_TRANSLUCENT * \param dotranslucent handle FF_TRANSLUCENT
* \param dosolid handle FF_SOLID * \param docollision handle interactive flags
* \param dospawnflags handle spawnflags * \param doghostfade no interactive flags during fading
* \param doghostfade enable flags when fade-in is finished; never on fade-out * \param exactalpha use exact alpha values (opengl)
* \param line line to target FOF
*/ */
static void P_AddMasterFader(ffloor_t *rover, size_t sectornum, size_t ffloornum, static void P_AddFakeFloorFader(ffloor_t *rover, size_t sectornum, size_t ffloornum,
INT16 destvalue, INT16 speed, INT16 destvalue, INT16 speed,
boolean doexists, boolean dotranslucent, boolean dosolid, boolean dospawnflags, boolean doexists, boolean dotranslucent, boolean docollision, boolean doghostfade, boolean exactalpha)
boolean doghostfade)
{ {
fade_t *d = Z_Malloc(sizeof *d, PU_LEVSPEC, NULL); fade_t *d = Z_Malloc(sizeof *d, PU_LEVSPEC, NULL);
@ -7372,12 +7367,12 @@ static void P_AddMasterFader(ffloor_t *rover, size_t sectornum, size_t ffloornum
d->speed = max(1, speed); // minimum speed 1/tic // if speed < 1, alpha is set immediately in thinker d->speed = max(1, speed); // minimum speed 1/tic // if speed < 1, alpha is set immediately in thinker
d->doexists = doexists; d->doexists = doexists;
d->dotranslucent = dotranslucent; d->dotranslucent = dotranslucent;
d->dosolid = dosolid; d->docollision = docollision;
d->dospawnflags = dospawnflags;
d->doghostfade = doghostfade; d->doghostfade = doghostfade;
d->exactalpha = exactalpha;
// find any existing thinkers and remove them, then replace with new data // find any existing thinkers and remove them, then replace with new data
P_ResetFading(rover, d); P_ResetFakeFloorFader(rover, d);
P_AddThinker(&d->thinker); P_AddThinker(&d->thinker);
} }
@ -7385,12 +7380,12 @@ static void P_AddMasterFader(ffloor_t *rover, size_t sectornum, size_t ffloornum
/** Makes a FOF fade /** Makes a FOF fade
* *
* \param d Fade thinker. * \param d Fade thinker.
* \sa P_AddMasterFader * \sa P_AddFakeFloorFader
*/ */
void T_Fade(fade_t *d) void T_Fade(fade_t *d)
{ {
if (d->rover && !P_DoFakeFloorAlpha(d->rover, d->destvalue, d->speed, d->doexists, d->dotranslucent, d->dosolid, d->dospawnflags, d->doghostfade)) if (d->rover && !P_FadeFakeFloor(d->rover, d->destvalue, d->speed, d->doexists, d->dotranslucent, d->docollision, d->doghostfade, d->exactalpha))
P_RemoveFading(d->rover); P_RemoveFakeFloorFader(d->rover);
} }
/* /*

10
src/p_spec.h
View file

@ -458,11 +458,11 @@ typedef struct
INT32 ffloornum; ///< Number of ffloor of target sector INT32 ffloornum; ///< Number of ffloor of target sector
INT16 destvalue; ///< Transparency value to fade to INT16 destvalue; ///< Transparency value to fade to
INT16 speed; ///< Speed to fade by INT16 speed; ///< Speed to fade by
boolean doexists; ///< Handle FF_EXISTS handling boolean doexists; ///< Handle FF_EXISTS
boolean dotranslucent; ///< Handle FF_TRANSLUCENT handling boolean dotranslucent; ///< Handle FF_TRANSLUCENT
boolean dosolid; ///< Handle FF_SOLID handling boolean docollision; ///< Handle interactive flags
boolean dospawnflags; ///< Enable spawnflags handling boolean doghostfade; ///< No interactive flags during fading
boolean doghostfade; ///< Set flags only when fade-in is finished; never during fade-out boolean exactalpha; ///< Use exact alpha values (opengl)
} fade_t; } fade_t;
void T_Fade(fade_t *d); void T_Fade(fade_t *d);