Merge branch '404-not-found' into 'master'

Repair Linedef types 403 and 404 (Resolves #429)

Closes #429

See merge request KartKrew/Kart!920
This commit is contained in:
Sal 2023-02-13 17:41:50 +00:00
commit 95434e91b2
2 changed files with 3 additions and 3 deletions

View file

@ -4999,7 +4999,7 @@ static void P_ConvertBinaryLinedefTypes(void)
case 404: //Copy-move tagged sector's ceiling height/texture case 404: //Copy-move tagged sector's ceiling height/texture
lines[i].args[0] = 0; lines[i].args[0] = 0;
lines[i].args[1] = tag; lines[i].args[1] = tag;
lines[i].args[2] = lines[i].special - 403; lines[i].args[2] = (lines[i].special == 403) ? TMP_FLOOR : TMP_CEILING;
lines[i].args[3] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; lines[i].args[3] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS;
lines[i].args[4] = (lines[i].flags & ML_BLOCKPLAYERS) ? sides[lines[i].sidenum[0]].textureoffset >> FRACBITS : 0; lines[i].args[4] = (lines[i].flags & ML_BLOCKPLAYERS) ? sides[lines[i].sidenum[0]].textureoffset >> FRACBITS : 0;
lines[i].args[5] = !!(lines[i].flags & ML_NOCLIMB); lines[i].args[5] = !!(lines[i].flags & ML_NOCLIMB);

View file

@ -2627,10 +2627,10 @@ boolean P_ProcessSpecial(activator_t *activator, INT16 special, INT32 *args, cha
{ {
EV_DoMoveCeilingByHeight( EV_DoMoveCeilingByHeight(
args[1], args[1],
copySector->floorheight, copySector->ceilingheight,
args[3] << (FRACBITS - 3), args[3] << (FRACBITS - 3),
args[4], args[4],
args[5] ? copySector->floorpic : -1 args[5] ? copySector->ceilingpic : -1
); );
} }
} }