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

- floatified SpawnExpZadjust

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-31 00:37:57 +02:00
parent 01bb7aa9f5
commit f656d8b1a3
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/games/sw/src/weapon.cpp
View file

@ -10356,44 +10356,46 @@ void SpawnGrenadeExp(DSWActor* actor)
SpawnVis(nullptr, expActor->sector(), expActor->spr.pos, 0);
}
void SpawnExpZadjust(DSWActor* actor, DSWActor* expActor, int upper_zsize, int lower_zsize)
void SpawnExpZadjust(DSWActor* actor, DSWActor* expActor, int upper_zsize_, int lower_zsize_)
{
int tos_z, bos_z;
double upper_zsize = upper_zsize_ * zinttoworld;
double lower_zsize = lower_zsize_ * zinttoworld;
double tos_z, bos_z;
ASSERT(expActor->hasU());
if (actor->hasU())
{
tos_z = expActor->int_pos().Z - upper_zsize;
bos_z = expActor->int_pos().Z + lower_zsize;
tos_z = expActor->spr.pos.Z - upper_zsize;
bos_z = expActor->spr.pos.Z + lower_zsize;
if (tos_z <= actor->user.int_hiz() + Z(4))
if (tos_z <= actor->user.hiz + 4)
{
expActor->set_int_z(actor->user.int_hiz() + upper_zsize);
expActor->spr.pos.Z = actor->user.hiz + upper_zsize;
expActor->spr.cstat |= (CSTAT_SPRITE_YFLIP);
}
else if (bos_z > actor->user.int_loz())
else if (bos_z > actor->user.loz)
{
expActor->set_int_z(actor->user.int_loz() - lower_zsize);
expActor->spr.pos.Z = actor->user.loz - lower_zsize;
}
}
else
{
int cz,fz;
double cz,fz;
getzsofslopeptr(expActor->sector(), expActor->int_pos().X, expActor->int_pos().Y, &cz, &fz);
getzsofslopeptr(expActor->sector(), expActor->spr.pos, &cz, &fz);
tos_z = expActor->int_pos().Z - upper_zsize;
bos_z = expActor->int_pos().Z + lower_zsize;
tos_z = expActor->spr.pos.Z - upper_zsize;
bos_z = expActor->spr.pos.Z + lower_zsize;
if (tos_z <= cz + Z(4))
if (tos_z <= cz + 4)
{
expActor->set_int_z(cz + upper_zsize);
expActor->spr.pos.Z = cz + upper_zsize;
expActor->spr.cstat |= (CSTAT_SPRITE_YFLIP);
}
else if (bos_z > fz)
{
expActor->set_int_z(fz - lower_zsize);
expActor->spr.pos.Z = fz - lower_zsize;
}
}