zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-07 09:01:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed unneeded dual call to SetOrigin.

Browse source
This commit is contained in:
MajorCooke 2015-08-25 20:18:06 -05:00
parent 87cc3f77f9
commit ebf515f8c7
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/p_things.cpp
View file

@ -718,19 +718,13 @@ int P_Thing_Warp(AActor *caller, AActor *reference, fixed_t xofs, fixed_t yofs,
if (flags & WARPF_TOFLOOR) if (flags & WARPF_TOFLOOR)
{ {
// set correct xy // set correct xy
caller->SetOrigin(
reference->x + xofs,
reference->y + yofs,
reference->z);
// now the caller's floorz should be appropriate for the assigned xy-position // now the caller's floorz should be appropriate for the assigned xy-position
// assigning position again with. // assigning position again with.
// extra unlink, link and environment calculation // extra unlink, link and environment calculation
caller->SetOrigin( caller->SetOrigin(
caller->x, reference->x + xofs,
caller->y, reference->y + yofs,
caller->floorz + zofs); reference->floorz + zofs);
} }
else else
{ {