OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: Line type 49 was wrong for all games. Fixed by adding a new Ceiling_CrushAndRaiseDist special. (thanks to Gez for the patch)

Browse source 
SVN r3348 (trunk)
This commit is contained in:
Christoph Oelckers 2012-02-09 19:59:32 +00:00
commit 5d7ee4dbfd
7 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/actionspecials.h
View file

@ -146,6 +146,7 @@ DEFINE_SPECIAL(Sector_Set3DFloor, 160, -1, -1, 5)
DEFINE_SPECIAL(Sector_SetContents, 161, -1, -1, 3)
// [RH] Begin new specials for ZDoom
DEFINE_SPECIAL(Ceiling_CrushAndRaiseDist, 168, 3, 5, 5)
DEFINE_SPECIAL(Generic_Crusher2, 169, 5, 5, 5)
DEFINE_SPECIAL(Sector_SetCeilingScale2, 170, 3, 3, 3)
DEFINE_SPECIAL(Sector_SetFloorScale2, 171, 3, 3, 3)

8
src/p_ceiling.cpp
View file

@ -133,6 +133,7 @@ void DCeiling::Tick ()
switch (m_Type)
{
case ceilCrushAndRaise:
case ceilCrushAndRaiseDist:
m_Direction = -1;
m_Speed = m_Speed1;
if (!SN_IsMakingLoopingSound (m_Sector))
@ -164,6 +165,7 @@ void DCeiling::Tick ()
switch (m_Type)
{
case ceilCrushAndRaise:
case ceilCrushAndRaiseDist:
case ceilCrushRaiseAndStay:
m_Speed = m_Speed2;
m_Direction = 1;
@ -193,6 +195,7 @@ void DCeiling::Tick ()
switch (m_Type)
{
case ceilCrushAndRaise:
case ceilCrushAndRaiseDist:
case ceilLowerAndCrush:
case ceilLowerAndCrushDist:
if (m_Speed1 == FRACUNIT && m_Speed2 == FRACUNIT)
@ -254,6 +257,7 @@ DCeiling *DCeiling::Create(sector_t *sec, DCeiling::ECeiling type, line_t *line,
switch (type)
{
case ceilCrushAndRaise:
case ceilCrushAndRaiseDist:
case ceilCrushRaiseAndStay:
ceiling->m_TopHeight = sec->ceilingplane.d;
case ceilLowerAndCrush:
@ -263,7 +267,7 @@ DCeiling *DCeiling::Create(sector_t *sec, DCeiling::ECeiling type, line_t *line,
{
targheight += 8*FRACUNIT;
}
else if (type == ceilLowerAndCrushDist)
else if (type == ceilLowerAndCrushDist || type == ceilCrushAndRaiseDist)
{
targheight += height;
}
@ -505,7 +509,7 @@ bool EV_DoCeiling (DCeiling::ECeiling type, line_t *line,
// Reactivate in-stasis ceilings...for certain types.
// This restarts a crusher after it has been stopped
if (type == DCeiling::ceilCrushAndRaise)
if (type == DCeiling::ceilCrushAndRaise || type == DCeiling::ceilCrushAndRaiseDist)
{
P_ActivateInStasisCeiling (tag);
}

20
src/p_lnspec.cpp
View file

@ -616,6 +616,12 @@ FUNC(LS_Ceiling_CrushAndRaiseA)
return EV_DoCeiling (DCeiling::ceilCrushAndRaise, ln, arg0, SPEED(arg1), SPEED(arg2), 0, arg3, 0, 0, CRUSHTYPE(arg4));
}
FUNC(LS_Ceiling_CrushAndRaiseDist)
// Ceiling_CrushAndRaiseDist (tag, dist, speed, damage, crushtype)
{
return EV_DoCeiling (DCeiling::ceilCrushAndRaiseDist, ln, arg0, SPEED(arg2), SPEED(arg2), arg1*FRACUNIT, arg3, 0, 0, CRUSHTYPE(arg4));
}
FUNC(LS_Ceiling_CrushAndRaiseSilentA)
// Ceiling_CrushAndRaiseSilentA (tag, dnspeed, upspeed, damage, crushtype)
{
@ -3248,13 +3254,13 @@ lnSpecFunc LineSpecials[256] =
/* 159 */ LS_NOP, // Sector_SetPlaneReflection in GZDoom
/* 160 */ LS_NOP, // Sector_Set3DFloor in GZDoom and Vavoom
/* 161 */ LS_NOP, // Sector_SetContents in GZDoom and Vavoom
/* 162 */ LS_NOP,
/* 163 */ LS_NOP,
/* 164 */ LS_NOP,
/* 165 */ LS_NOP,
/* 166 */ LS_NOP,
/* 167 */ LS_NOP,
/* 168 */ LS_NOP,
/* 162 */ LS_NOP, // Reserved Doom64 branch
/* 163 */ LS_NOP, // Reserved Doom64 branch
/* 164 */ LS_NOP, // Reserved Doom64 branch
/* 165 */ LS_NOP, // Reserved Doom64 branch
/* 166 */ LS_NOP, // Reserved Doom64 branch
/* 167 */ LS_NOP, // Reserved Doom64 branch
/* 168 */ LS_Ceiling_CrushAndRaiseDist,
/* 169 */ LS_Generic_Crusher2,
/* 170 */ LS_Sector_SetCeilingScale2,
/* 171 */ LS_Sector_SetFloorScale2,

1
src/p_spec.h
View file

@ -603,6 +603,7 @@ public:
ceilLowerInstant,
ceilRaiseInstant,
ceilCrushAndRaise,
ceilCrushAndRaiseDist,
ceilLowerAndCrush,
ceilLowerAndCrushDist,
ceilCrushRaiseAndStay,