zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 20:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- getzrange wrappers.

Browse source 
# Conflicts:
#	source/games/sw/src/game.h
This commit is contained in:
Christoph Oelckers 2021-11-05 00:09:13 +01:00
parent 057de89b9b
commit 6a25b4a560
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/games/sw/src/game.h
View file

@ -1944,10 +1944,19 @@ void FAFgetzrange(vec3_t pos, int16_t sectnum,
int32_t* loz, int32_t* florhit,
int32_t clipdist, int32_t clipmask);
void FAFgetzrange(vec3_t pos, int16_t sectnum,
int32_t* hiz, Collision* ceilhit,
int32_t* loz, Collision* florhit,
int32_t clipdist, int32_t clipmask);
void FAFgetzrangepoint(int32_t x, int32_t y, int32_t z, int16_t sectnum,
int32_t* hiz, int32_t* ceilhit,
int32_t* loz, int32_t* florhit);
void FAFgetzrangepoint(int32_t x, int32_t y, int32_t z, int16_t sectnum,
int32_t* hiz, Collision* ceilhit,
int32_t* loz, Collision* florhit);
void short_setinterpolation(short *posptr);
void short_stopinterpolation(short *posptr);

16
source/games/sw/src/rooms.cpp
View file

@ -502,6 +502,14 @@ void WaterAdjust(short florhit, int32_t* loz)
}
}
void FAFgetzrange(vec3_t pos, int16_t sectnum, int32_t* hiz, Collision* ceilhit, int32_t* loz, Collision* florhit, int32_t clipdist, int32_t clipmask)
{
int f, c;
FAFgetzrange(pos, sectnum, hiz, &c, loz, &f, clipdist, clipmask);
ceilhit->setFromEngine(c);
florhit->setFromEngine(f);
}
void FAFgetzrange(vec3_t pos, int16_t sectnum,
int32_t* hiz, int32_t* ceilhit,
int32_t* loz, int32_t* florhit,
@ -577,6 +585,14 @@ void FAFgetzrange(vec3_t pos, int16_t sectnum,
}
}
void FAFgetzrangepoint(int32_t x, int32_t y, int32_t z, int16_t sectnum, int32_t* hiz, Collision* ceilhit, int32_t* loz, Collision* florhit)
{
int f, c;
FAFgetzrangepoint(x, y, z, sectnum, hiz, &c, loz, &f);
ceilhit->setFromEngine(c);
florhit->setFromEngine(f);
}
void FAFgetzrangepoint(int32_t x, int32_t y, int32_t z, int16_t sectnum,
int32_t* hiz, int32_t* ceilhit,
int32_t* loz, int32_t* florhit)