zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-13 07:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Item respawning needs to use the same buggy PointOnSide function as P_SpawnMapThing does.

Browse source 
SVN r3484 (trunk)
This commit is contained in:
Randy Heit 2012-03-25 03:25:59 +00:00
parent 510838c3c1
commit c2b320d408
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/g_shared/a_pickups.cpp
View file

@ -340,10 +340,17 @@ DEFINE_ACTION_FUNCTION(AActor, A_RestoreSpecialPosition)
_x = self->SpawnPoint[0]; _x = self->SpawnPoint[0];
_y = self->SpawnPoint[1]; _y = self->SpawnPoint[1];
sec = P_PointInSector (_x, _y);
self->SetOrigin (_x, _y, sec->floorplane.ZatPoint (_x, _y)); self->UnlinkFromWorld();
P_CheckPosition (self, _x, _y); self->x = _x;
self->y = _y;
self->LinkToWorld(true);
sec = self->Sector;
self->z =
self->dropoffz =
self->floorz = sec->floorplane.ZatPoint(_x, _y);
self->ceilingz = sec->ceilingplane.ZatPoint(_x, _y);
P_FindFloorCeiling(self, true);
if (self->flags & MF_SPAWNCEILING) if (self->flags & MF_SPAWNCEILING)
{ {
@ -370,7 +377,6 @@ DEFINE_ACTION_FUNCTION(AActor, A_RestoreSpecialPosition)
self->z += FloatBobOffsets[(self->FloatBobPhase + level.maptime) & 63]; self->z += FloatBobOffsets[(self->FloatBobPhase + level.maptime) & 63];
} }
} }
self->SetOrigin (self->x, self->y, self->z);
} }
int AInventory::StaticLastMessageTic; int AInventory::StaticLastMessageTic;