zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Guards

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6804 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-04-04 20:48:15 +00:00
parent 3d0a4c37d4
commit 316db0ee5e
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8240,6 +8240,7 @@ void A_PlayAlertSound(int spriteNum)
if ((VM_OnEventWithReturn(EVENT_RECOGSOUND, spriteNum, screenpeek, 0)) != 0) if ((VM_OnEventWithReturn(EVENT_RECOGSOUND, spriteNum, screenpeek, 0)) != 0)
return; return;
#ifndef EDUKE32_STANDALONE
switch (DYNAMICTILEMAP(PN(spriteNum))) switch (DYNAMICTILEMAP(PN(spriteNum)))
{ {
case LIZTROOPONTOILET__STATIC: case LIZTROOPONTOILET__STATIC:
@ -8270,6 +8271,7 @@ void A_PlayAlertSound(int spriteNum)
case BOSS4STAYPUT__STATIC: S_PlaySound((sprite[spriteNum].pal != 0) ? BOS4_RECOG : BOSS4_FIRSTSEE); break; case BOSS4STAYPUT__STATIC: S_PlaySound((sprite[spriteNum].pal != 0) ? BOS4_RECOG : BOSS4_FIRSTSEE); break;
case GREENSLIME__STATIC: A_PlaySound(SLIM_RECOG, spriteNum); break; case GREENSLIME__STATIC: A_PlaySound(SLIM_RECOG, spriteNum); break;
} }
#endif
} }
} }

6
source/duke3d/src/player.cpp
View file

@ -1071,6 +1071,7 @@ static int A_ShootCustom(int const spriteNum, int const projecTile, int shootAng
} }
} }
#ifndef EDUKE32_STANDALONE
static int32_t A_ShootHardcoded(int spriteNum, int projecTile, int shootAng, vec3_t startPos, static int32_t A_ShootHardcoded(int spriteNum, int projecTile, int shootAng, vec3_t startPos,
spritetype *pSprite, int const playerNum, DukePlayer_t * const pPlayer) spritetype *pSprite, int const playerNum, DukePlayer_t * const pPlayer)
{ {
@ -1537,6 +1538,7 @@ static int32_t A_ShootHardcoded(int spriteNum, int projecTile, int shootAng, vec
return -1; return -1;
} }
#endif
int A_ShootWithZvel(int const spriteNum, int const projecTile, int const forceZvel) int A_ShootWithZvel(int const spriteNum, int const projecTile, int const forceZvel)
{ {
@ -1607,9 +1609,13 @@ int A_ShootWithZvel(int const spriteNum, int const projecTile, int const forceZv
#endif // POLYMER #endif // POLYMER
} }
#ifdef EDUKE32_STANDALONE
return A_ShootCustom(spriteNum, projecTile, shootAng, &startPos);
#else
return A_CheckSpriteTileFlags(projecTile, SFLAG_PROJECTILE) return A_CheckSpriteTileFlags(projecTile, SFLAG_PROJECTILE)
? A_ShootCustom(spriteNum, projecTile, shootAng, &startPos) ? A_ShootCustom(spriteNum, projecTile, shootAng, &startPos)
: A_ShootHardcoded(spriteNum, projecTile, shootAng, startPos, pSprite, playerNum, pPlayer); : A_ShootHardcoded(spriteNum, projecTile, shootAng, startPos, pSprite, playerNum, pPlayer);
#endif
} }

2
source/duke3d/src/screens.cpp
View file

@ -730,7 +730,7 @@ static void G_ShowCacheLocks(void)
if (k >= ydim-12) if (k >= ydim-12)
break; break;
Bsprintf(tempbuf, "Locked- %d: Leng:%d, Lock:%d", i, cac[i].leng, *cac[i].lock); Bsprintf(tempbuf, "Locked- %d: Leng:%zu, Lock:%d", i, cac[i].leng, *cac[i].lock);
printext256(0L, k, COLOR_WHITE, -1, tempbuf, 1); printext256(0L, k, COLOR_WHITE, -1, tempbuf, 1);
k += 6; k += 6;
} }