zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed: The line ID arg of Plane_Align was not handled in the wrong place. It was also missing from actionspecials.h and the UDMF spec. 

SVN r2138 (trunk)
This commit is contained in:
Christoph Oelckers 2010-01-28 23:46:38 +00:00
parent 5125e11d25
commit 3f140c0549
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
specs/udmf_zdoom.txt
View File

@ -192,6 +192,7 @@ Note: All <bool> fields default to false unless mentioned otherwise.
208: TranslucentLine, arg0 (arg0 must be preserved) 208: TranslucentLine, arg0 (arg0 must be preserved)
1: Polyobj_StartLine, arg3 1: Polyobj_StartLine, arg3
5: Polyobj_ExplicitLine, arg4 5: Polyobj_ExplicitLine, arg4
181: Plane_Align, arg2
215: Teleport_Line, arg0 215: Teleport_Line, arg0
222: Scroll_Texture_Model, arg0 (arg0 must be preserved) 222: Scroll_Texture_Model, arg0 (arg0 must be preserved)

2
src/actionspecials.h
View File

@ -150,7 +150,7 @@ DEFINE_SPECIAL(Thing_Hate, 177, 2, 3, 3)
DEFINE_SPECIAL(Thing_ProjectileAimed, 178, 4, 5, 5) DEFINE_SPECIAL(Thing_ProjectileAimed, 178, 4, 5, 5)
DEFINE_SPECIAL(ChangeSkill, 179, 1, 1, 1) DEFINE_SPECIAL(ChangeSkill, 179, 1, 1, 1)
DEFINE_SPECIAL(Thing_SetTranslation, 180, 2, 2, 2) DEFINE_SPECIAL(Thing_SetTranslation, 180, 2, 2, 2)
DEFINE_SPECIAL(Plane_Align, 181, -1, -1, 2) DEFINE_SPECIAL(Plane_Align, 181, -1, -1, 3)
DEFINE_SPECIAL(Line_Mirror, 182, -1, 0, 0) DEFINE_SPECIAL(Line_Mirror, 182, -1, 0, 0)
DEFINE_SPECIAL(Line_AlignCeiling, 183, 2, 2, 2) DEFINE_SPECIAL(Line_AlignCeiling, 183, 2, 2, 2)
DEFINE_SPECIAL(Line_AlignFloor, 184, 2, 2, 2) DEFINE_SPECIAL(Line_AlignFloor, 184, 2, 2, 2)

4
src/p_setup.cpp
View File

@ -1703,6 +1703,10 @@ void P_SetLineID (line_t *ld)
ld->id = ld->args[4]; ld->id = ld->args[4];
break; break;
case Plane_Align:
ld->id = ld->args[2];
break;
case Static_Init: case Static_Init:
if (ld->args[1] == Init_SectorLink) ld->id = ld->args[0]; if (ld->args[1] == Init_SectorLink) ld->id = ld->args[0];
break; break;

1
src/p_slopes.cpp
View File

@ -548,7 +548,6 @@ void P_SetSlopes ()
if (lines[i].special == Plane_Align) if (lines[i].special == Plane_Align)
{ {
lines[i].special = 0; lines[i].special = 0;
lines[i].id = lines[i].args[2];
if (lines[i].backsector != NULL) if (lines[i].backsector != NULL)
{ {
// args[0] is for floor, args[1] is for ceiling // args[0] is for floor, args[1] is for ceiling