zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 00:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename G_CheckPlayerInSector() to G_GetPlayerInSector()

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8560 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2020-01-29 11:37:20 +00:00 committed by Christoph Oelckers
parent 8543f476d7
commit 0fcdf3c1af
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/duke3d/src/actors.cpp
View file

@ -1780,7 +1780,7 @@ ACTOR_STATIC void G_MoveStandables(void)
pSprite->picnum++; pSprite->picnum++;
if (pSprite->picnum == CRANE+2) if (pSprite->picnum == CRANE+2)
{ {
int32_t p = G_CheckPlayerInSector(pData[1]); int32_t p = G_GetPlayerInSector(pData[1]);
if (p >= 0 && g_player[p].ps->on_ground) if (p >= 0 && g_player[p].ps->on_ground)
{ {
@ -2391,7 +2391,7 @@ DETONATE:
else else
{ {
sector[sectNum].floorz += sector[sectNum].extra; sector[sectNum].floorz += sector[sectNum].extra;
int const playerNum = G_CheckPlayerInSector(sectNum); int const playerNum = G_GetPlayerInSector(sectNum);
if (playerNum >= 0) if (playerNum >= 0)
g_player[playerNum].ps->pos.z += sector[sectNum].extra; g_player[playerNum].ps->pos.z += sector[sectNum].extra;
} }
@ -2407,7 +2407,7 @@ DETONATE:
{ {
int32_t p; int32_t p;
sector[sectNum].floorz -= sector[sectNum].extra; sector[sectNum].floorz -= sector[sectNum].extra;
p = G_CheckPlayerInSector(sectNum); p = G_GetPlayerInSector(sectNum);
if (p >= 0) if (p >= 0)
g_player[p].ps->pos.z -= sector[sectNum].extra; g_player[p].ps->pos.z -= sector[sectNum].extra;
} }
@ -2419,7 +2419,7 @@ DETONATE:
goto next_sprite; goto next_sprite;
{ {
int32_t p = G_CheckPlayerInSector(sectNum); int32_t p = G_GetPlayerInSector(sectNum);
if (p >= 0 && (g_player[p].ps->on_ground || pSprite->ang == 512)) if (p >= 0 && (g_player[p].ps->on_ground || pSprite->ang == 512))
{ {
@ -3752,8 +3752,8 @@ ACTOR_STATIC void G_MoveTransports(void)
if (onFloor) if (onFloor)
{ {
if (sprite[sectSprite].statnum == STAT_PROJECTILE if (sprite[sectSprite].statnum == STAT_PROJECTILE
|| (G_CheckPlayerInSector(sectNum) == -1 || (G_GetPlayerInSector(sectNum) == -1
&& G_CheckPlayerInSector(sprite[OW(spriteNum)].sectnum) == -1)) && G_GetPlayerInSector(sprite[OW(spriteNum)].sectnum) == -1))
{ {
sprite[sectSprite].x += (sprite[OW(spriteNum)].x - SX(spriteNum)); sprite[sectSprite].x += (sprite[OW(spriteNum)].x - SX(spriteNum));
sprite[sectSprite].y += (sprite[OW(spriteNum)].y - SY(spriteNum)); sprite[sectSprite].y += (sprite[OW(spriteNum)].y - SY(spriteNum));

4
source/duke3d/src/sector.h
View file

@ -166,11 +166,11 @@ static inline vec3_t G_GetCameraPosition(int32_t const i, int32_t const smoothra
ca->bpos.z + mulscale16(cs->z - ca->bpos.z, smoothratio) }; ca->bpos.z + mulscale16(cs->z - ca->bpos.z, smoothratio) };
} }
EXTERN_INLINE_HEADER int32_t G_CheckPlayerInSector(int32_t const sect); EXTERN_INLINE_HEADER int32_t G_GetPlayerInSector(int32_t const sect);
#if defined sector_c_ || !defined DISABLE_INLINING #if defined sector_c_ || !defined DISABLE_INLINING
EXTERN_INLINE int32_t G_CheckPlayerInSector(int32_t const sect) EXTERN_INLINE int32_t G_GetPlayerInSector(int32_t const sect)
{ {
for (int TRAVERSE_CONNECT(i)) for (int TRAVERSE_CONNECT(i))
if ((unsigned)g_player[i].ps->i < MAXSPRITES && sprite[g_player[i].ps->i].sectnum == sect) if ((unsigned)g_player[i].ps->i < MAXSPRITES && sprite[g_player[i].ps->i].sectnum == sect)