zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ifdef EDUKE32_STANDALONE something for hardcoded Duke projectiles 

git-svn-id: https://svn.eduke32.com/eduke32@7410 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-03-19 17:08:31 +00:00
parent da6b01bf8e
commit b819b298ee
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/duke3d/src/player.cpp
View File

@ -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;