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

ifdef EDUKE32_STANDALONE something for hardcoded Duke projectiles

Browse source 
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 #ifdef POLYMER
switch (DYNAMICTILEMAP(projecTile)) switch (DYNAMICTILEMAP(projecTile))
{ {
@ -1622,6 +1623,7 @@ int A_ShootWithZvel(int const spriteNum, int const projecTile, int const forceZv
break; break;
} }
#endif // POLYMER #endif // POLYMER
#endif // !EDUKE32_STANDALONE
} }
#ifdef EDUKE32_STANDALONE #ifdef EDUKE32_STANDALONE
@ -5278,13 +5280,13 @@ HORIZONLY:;
updatesectorz(pPlayer->pos.x, pPlayer->pos.y, pPlayer->pos.z, &pPlayer->cursectnum); updatesectorz(pPlayer->pos.x, pPlayer->pos.y, pPlayer->pos.z, &pPlayer->cursectnum);
} }
#endif #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) 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, : clipmove((vec3_t *)pPlayer, &pPlayer->cursectnum, pPlayer->vel.x, pPlayer->vel.y, pPlayer->clipdist,
(4L << 8), stepHeight, CLIPMASK0); (4L << 8), stepHeight, CLIPMASK0);
if (spriteNum) if (touchObject)
P_CheckTouchDamage(pPlayer, spriteNum); P_CheckTouchDamage(pPlayer, touchObject);
if (IONMAIDEN) if (IONMAIDEN)
pPlayer->fric.x = pPlayer->fric.y = 0; pPlayer->fric.x = pPlayer->fric.y = 0;