zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-29 07:22:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Magnus Norddahl 2018-10-25 12:41:08 +02:00
commit 952ffb289c
4 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_ceiling.cpp
View file

@ -428,7 +428,7 @@ bool P_CreateCeiling(sector_t *sec, DCeiling::ECeiling type, line_t *line, int t
switch (change & 3) switch (change & 3)
{ {
case 1: // type is zeroed case 1: // type is zeroed
ceiling->m_NewSpecial.Clear(); ceiling->m_NewSpecial = {};
ceiling->m_Type = DCeiling::genCeilingChg0; ceiling->m_Type = DCeiling::genCeilingChg0;
break; break;
case 2: // type is copied case 2: // type is copied
@ -447,7 +447,7 @@ bool P_CreateCeiling(sector_t *sec, DCeiling::ECeiling type, line_t *line, int t
switch (change & 3) switch (change & 3)
{ {
case 1: // type is zeroed case 1: // type is zeroed
ceiling->m_NewSpecial.Clear(); ceiling->m_NewSpecial = {};
ceiling->m_Type = DCeiling::genCeilingChg0; ceiling->m_Type = DCeiling::genCeilingChg0;
break; break;
case 2: // type is copied case 2: // type is copied

4
src/p_floor.cpp
View file

@ -229,7 +229,7 @@ void DFloor::SetFloorChangeType (sector_t *sec, int change)
switch (change & 3) switch (change & 3)
{ {
case 1: case 1:
m_NewSpecial.Clear(); m_NewSpecial = {};
m_Type = DFloor::genFloorChg0; m_Type = DFloor::genFloorChg0;
break; break;
case 2: case 2:
@ -828,7 +828,7 @@ bool EV_DoDonut (int tag, line_t *line, double pillarspeed, double slimespeed)
floor->m_Speed = slimespeed; floor->m_Speed = slimespeed;
floor->m_Instant = false; floor->m_Instant = false;
floor->m_Texture = s3->GetTexture(sector_t::floor); floor->m_Texture = s3->GetTexture(sector_t::floor);
floor->m_NewSpecial.Clear(); floor->m_NewSpecial = {};
height = s3->FindHighestFloorPoint (&spot); height = s3->FindHighestFloorPoint (&spot);
floor->m_FloorDestDist = s2->floorplane.PointToDist (spot, height); floor->m_FloorDestDist = s2->floorplane.PointToDist (spot, height);
floor->StartFloorSound (); floor->StartFloorSound ();

4
src/p_spec.h
View file

@ -439,7 +439,7 @@ protected:
// [RH] Need these for BOOM-ish transferring ceilings // [RH] Need these for BOOM-ish transferring ceilings
FTextureID m_Texture; FTextureID m_Texture;
secspecial_t m_NewSpecial; secspecial_t m_NewSpecial{};
// ID // ID
int m_Tag; int m_Tag;
@ -536,7 +536,7 @@ public:
bool m_Hexencrush; bool m_Hexencrush;
bool m_Instant; bool m_Instant;
int m_Direction; int m_Direction;
secspecial_t m_NewSpecial; secspecial_t m_NewSpecial{};
FTextureID m_Texture; FTextureID m_Texture;
double m_FloorDestDist; double m_FloorDestDist;
double m_Speed; double m_Speed;

10
src/r_defs.h
View file

@ -588,16 +588,6 @@ struct secspecial_t
short damageinterval; // Interval for damage application short damageinterval; // Interval for damage application
short leakydamage; // chance of leaking through radiation suit short leakydamage; // chance of leaking through radiation suit
int Flags; int Flags;
secspecial_t()
{
Clear();
}
void Clear()
{
memset(this, 0, sizeof(*this));
}
}; };
FSerializer &Serialize(FSerializer &arc, const char *key, secspecial_t &spec, secspecial_t *def); FSerializer &Serialize(FSerializer &arc, const char *key, secspecial_t &spec, secspecial_t *def);