zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-31 01:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

- low level move functions now return a Collision struct.

Browse source 
# Conflicts:
#	source/games/sw/src/sprite.cpp
This commit is contained in:
Christoph Oelckers 2021-11-05 21:37:49 +01:00
parent 606ce997ac
commit a073ef65e7
15 changed files with 105 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4621,7 +4621,7 @@ void DoPlayerDive(PLAYERp pp)
nx = MOVEx((128+64), NORM_ANGLE(bp->ang + 1024));
ny = MOVEy((128+64), NORM_ANGLE(bp->ang + 1024));
move_sprite(bubble->GetSpriteIndex(), nx, ny, 0L, u->ceiling_dist, u->floor_dist, 0, synctics);
move_sprite(bubble, nx, ny, 0L, u->ceiling_dist, u->floor_dist, 0, synctics);
}
}
}
@ -6013,7 +6013,7 @@ void DoPlayerDeathMoveHead(PLAYERp pp)
dax = MOVEx(u->slide_vel, u->slide_ang);
day = MOVEy(u->slide_vel, u->slide_ang);
SetCollision(u, move_sprite(pp->PlayerSprite, dax, day, 0, Z(16), Z(16), 1, synctics));
u->coll = move_sprite(pp->Actor(), dax, day, 0, Z(16), Z(16), 1, synctics);
{
switch (u->coll.type)
{