OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- made sector_t::damageamount an int so that it can hold TELEFRAG_DAMAGE.

Browse source 
- marked all places where sector_t::special needs to be addressed for the damage overhaul.

NOTE: This commit will not compile!
This commit is contained in:
Christoph Oelckers 2016-01-06 12:56:35 +01:00
commit bd8513c063
13 changed files with 44 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/p_floor.cpp
View file

@ -161,7 +161,7 @@ void DFloor::Tick ()
case donutRaise:
case genFloorChgT:
case genFloorChg0:
m_Sector->special = m_Sector->special | m_NewSpecial;
m_Sector->xspecial = m_Sector->xspecial | m_NewSpecial;
//fall thru
case genFloorChg:
m_Sector->SetTexture(sector_t::floor, m_Texture);
@ -177,7 +177,7 @@ void DFloor::Tick ()
case floorLowerAndChange:
case genFloorChgT:
case genFloorChg0:
m_Sector->special = m_Sector->special | m_NewSpecial;
m_Sector->xspecial = m_Sector->xspecial | m_NewSpecial;
//fall thru
case genFloorChg:
m_Sector->SetTexture(sector_t::floor, m_Texture);
@ -242,7 +242,7 @@ void DFloor::SetFloorChangeType (sector_t *sec, int change)
m_Type = DFloor::genFloorChg;
break;
case 3:
m_NewSpecial = sec->special;
m_NewSpecial = sec->xspecial;
m_Type = DFloor::genFloorChgT;
break;
}
@ -440,11 +440,11 @@ bool EV_DoFloor (DFloor::EFloor floortype, line_t *line, int tag,
{
FTextureID oldpic = sec->GetTexture(sector_t::floor);
sec->SetTexture(sector_t::floor, line->frontsector->GetTexture(sector_t::floor));
sec->special = line->frontsector->special;
sec->xspecial = line->frontsector->xspecial;
}
else
{
sec->special = 0;
sec->xspecial = 0;
}
break;
@ -456,7 +456,7 @@ bool EV_DoFloor (DFloor::EFloor floortype, line_t *line, int tag,
// jff 1/24/98 make sure floor->m_NewSpecial gets initialized
// in case no surrounding sector is at floordestheight
// --> should not affect compatibility <--
floor->m_NewSpecial = sec->special;
floor->m_NewSpecial = sec->xspecial;
//jff 5/23/98 use model subroutine to unify fixes and handling
sector_t *modelsec;
@ -464,7 +464,7 @@ bool EV_DoFloor (DFloor::EFloor floortype, line_t *line, int tag,
if (modelsec != NULL)
{
floor->m_Texture = modelsec->GetTexture(sector_t::floor);
floor->m_NewSpecial = modelsec->special;
floor->m_NewSpecial = modelsec->xspecial;
}
break;
@ -637,7 +637,7 @@ bool EV_BuildStairs (int tag, DFloor::EStair type, line_t *line,
{
// [RH] Find the next sector by scanning for Stairs_Special?
tsec = sec->NextSpecialSector (
(sec->special & 0xff) == Stairs_Special1 ?
sec->special == Stairs_Special1 ?
Stairs_Special2 : Stairs_Special1, prev);
if ( (ok = (tsec != NULL)) )
@ -1093,7 +1093,7 @@ bool EV_DoChange (line_t *line, EChange changetype, int tag)
if (line)
{ // [RH] if no line, no change
sec->SetTexture(sector_t::floor, line->frontsector->GetTexture(sector_t::floor));
sec->special = line->frontsector->special;
sec->xspecial = line->frontsector->xspecial;
}
break;
case numChangeOnly:
@ -1101,7 +1101,7 @@ bool EV_DoChange (line_t *line, EChange changetype, int tag)
if (secm)
{ // if no model, no change
sec->SetTexture(sector_t::floor, secm->GetTexture(sector_t::floor));
sec->special = secm->special;
sec->xspecial = secm->xspecial;
}
break;
default: