From b819b298ee79c4acc556fe0082cd5b555bb0bcce Mon Sep 17 00:00:00 2001 From: terminx Date: Tue, 19 Mar 2019 17:08:31 +0000 Subject: [PATCH] ifdef EDUKE32_STANDALONE something for hardcoded Duke projectiles git-svn-id: https://svn.eduke32.com/eduke32@7410 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/player.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/duke3d/src/player.cpp b/source/duke3d/src/player.cpp index 808183772..dce82a088 100644 --- a/source/duke3d/src/player.cpp +++ b/source/duke3d/src/player.cpp @@ -1598,6 +1598,7 @@ int A_ShootWithZvel(int const spriteNum, int const projecTile, int const forceZv } } +#ifndef EDUKE32_STANDALONE #ifdef POLYMER switch (DYNAMICTILEMAP(projecTile)) { @@ -1622,6 +1623,7 @@ int A_ShootWithZvel(int const spriteNum, int const projecTile, int const forceZv break; } #endif // POLYMER +#endif // !EDUKE32_STANDALONE } #ifdef EDUKE32_STANDALONE @@ -5278,13 +5280,13 @@ HORIZONLY:; updatesectorz(pPlayer->pos.x, pPlayer->pos.y, pPlayer->pos.z, &pPlayer->cursectnum); } #endif - int const spriteNum = IONMAIDEN ? clipmove((vec3_t *)pPlayer, &pPlayer->cursectnum, pPlayer->vel.x + (pPlayer->fric.x << 9), + int const touchObject = IONMAIDEN ? clipmove((vec3_t *)pPlayer, &pPlayer->cursectnum, pPlayer->vel.x + (pPlayer->fric.x << 9), pPlayer->vel.y + (pPlayer->fric.y << 9), pPlayer->clipdist, (4L << 8), stepHeight, CLIPMASK0) : clipmove((vec3_t *)pPlayer, &pPlayer->cursectnum, pPlayer->vel.x, pPlayer->vel.y, pPlayer->clipdist, (4L << 8), stepHeight, CLIPMASK0); - if (spriteNum) - P_CheckTouchDamage(pPlayer, spriteNum); + if (touchObject) + P_CheckTouchDamage(pPlayer, touchObject); if (IONMAIDEN) pPlayer->fric.x = pPlayer->fric.y = 0;