From 0fcdf3c1af089612222aadcd79e0a6c8589e36bd Mon Sep 17 00:00:00 2001 From: terminx Date: Wed, 29 Jan 2020 11:37:20 +0000 Subject: [PATCH] Rename G_CheckPlayerInSector() to G_GetPlayerInSector() git-svn-id: https://svn.eduke32.com/eduke32@8560 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/actors.cpp | 12 ++++++------ source/duke3d/src/sector.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/duke3d/src/actors.cpp b/source/duke3d/src/actors.cpp index aef27a9bf..379d8c425 100644 --- a/source/duke3d/src/actors.cpp +++ b/source/duke3d/src/actors.cpp @@ -1780,7 +1780,7 @@ ACTOR_STATIC void G_MoveStandables(void) pSprite->picnum++; 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) { @@ -2391,7 +2391,7 @@ DETONATE: else { sector[sectNum].floorz += sector[sectNum].extra; - int const playerNum = G_CheckPlayerInSector(sectNum); + int const playerNum = G_GetPlayerInSector(sectNum); if (playerNum >= 0) g_player[playerNum].ps->pos.z += sector[sectNum].extra; } @@ -2407,7 +2407,7 @@ DETONATE: { int32_t p; sector[sectNum].floorz -= sector[sectNum].extra; - p = G_CheckPlayerInSector(sectNum); + p = G_GetPlayerInSector(sectNum); if (p >= 0) g_player[p].ps->pos.z -= sector[sectNum].extra; } @@ -2419,7 +2419,7 @@ DETONATE: 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)) { @@ -3752,8 +3752,8 @@ ACTOR_STATIC void G_MoveTransports(void) if (onFloor) { if (sprite[sectSprite].statnum == STAT_PROJECTILE - || (G_CheckPlayerInSector(sectNum) == -1 - && G_CheckPlayerInSector(sprite[OW(spriteNum)].sectnum) == -1)) + || (G_GetPlayerInSector(sectNum) == -1 + && G_GetPlayerInSector(sprite[OW(spriteNum)].sectnum) == -1)) { sprite[sectSprite].x += (sprite[OW(spriteNum)].x - SX(spriteNum)); sprite[sectSprite].y += (sprite[OW(spriteNum)].y - SY(spriteNum)); diff --git a/source/duke3d/src/sector.h b/source/duke3d/src/sector.h index 4d1801ad3..c97a057ad 100644 --- a/source/duke3d/src/sector.h +++ b/source/duke3d/src/sector.h @@ -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) }; } -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 -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)) if ((unsigned)g_player[i].ps->i < MAXSPRITES && sprite[g_player[i].ps->i].sectnum == sect)