OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- replaced ceilingz with a floating point variable, also in FCheckPosition.

Browse source
This commit is contained in:
Christoph Oelckers 2016-03-20 13:32:53 +01:00
commit ec58e70078
25 changed files with 118 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/g_strife/a_sentinel.cpp
View file

@ -13,7 +13,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_SentinelBob)
{
PARAM_ACTION_PROLOGUE;
fixed_t minz, maxz;
double minz, maxz;
if (self->flags & MF_INFLOAT)
{
@ -23,13 +23,13 @@ DEFINE_ACTION_FUNCTION(AActor, A_SentinelBob)
if (self->threshold != 0)
return 0;
maxz = self->ceilingz - self->height - 16*FRACUNIT;
minz = self->floorz + 96*FRACUNIT;
maxz = self->ceilingz - self->_Height() - 16;
minz = FIXED2FLOAT(self->floorz) + 96;
if (minz > maxz)
{
minz = maxz;
}
if (minz < self->_f_Z())
if (minz < self->Z())
{
self->Vel.Z -= 1;
}
@ -37,7 +37,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_SentinelBob)
{
self->Vel.Z += 1;
}
self->reactiontime = (minz >= self->_f_Z()) ? 4 : 0;
self->reactiontime = (minz >= self->Z()) ? 4 : 0;
return 0;
}