teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-20 08:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: fixed some pointer mixup in UpdatePlayerUnderSprite

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-30 23:39:54 +01:00
parent f679b61a30
commit 0cba0e19b5
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/games/sw/src/player.cpp
View file

@ -1712,10 +1712,10 @@ void UpdatePlayerUnderSprite(PLAYERp pp)
DSWActor* act_under = pp->PlayerUnderActor; DSWActor* act_under = pp->PlayerUnderActor;
act_under->spr.pos = act_under->spr.pos; act_under->spr.pos = act_over->spr.pos;
ChangeActorSect(pp->PlayerUnderActor, act_under->sector()); ChangeActorSect(act_under, act_over->sector());
SpriteWarpToUnderwater(pp->PlayerUnderActor); SpriteWarpToUnderwater(act_under);
// find z water level of the top sector // find z water level of the top sector
// diff between the bottom of the upper sprite and the water level // diff between the bottom of the upper sprite and the water level
@ -1727,8 +1727,7 @@ void UpdatePlayerUnderSprite(PLAYERp pp)
act_under->user.State = act_over->user.State; act_under->user.State = act_over->user.State;
act_under->user.Rot = act_over->user.Rot; act_under->user.Rot = act_over->user.Rot;
act_under->user.StateStart = act_over->user.StateStart; act_under->user.StateStart = act_over->user.StateStart;
act_under->spr.picnum = act_over->spr.picnum;
act_under->spr.picnum = act_under->spr.picnum;
} }