diff --git a/source/blood/src/actor.cpp b/source/blood/src/actor.cpp index 897f5c671..4eaefe544 100644 --- a/source/blood/src/actor.cpp +++ b/source/blood/src/actor.cpp @@ -6456,7 +6456,7 @@ spritetype * actSpawnSprite(spritetype *pSource, int nStat); spritetype *actSpawnDude(spritetype *pSource, short nType, int a3, int a4) { XSPRITE* pXSource = &xsprite[pSource->extra]; - spritetype *pSprite2 = actSpawnSprite(pSource, 6); + spritetype *pSprite2 = actSpawnSprite(pSource, kStatDude); if (!pSprite2) return NULL; XSPRITE *pXSprite2 = &xsprite[pSprite2->extra]; int angle = pSource->ang; @@ -6480,6 +6480,7 @@ spritetype *actSpawnDude(spritetype *pSource, short nType, int a3, int a4) pSprite2->cstat |= 0x1101; pSprite2->clipdist = dudeInfo[nDude].clipdist; pXSprite2->health = dudeInfo[nDude].startHealth<<4; + pXSprite2->respawn = 1; if (gSysRes.Lookup(dudeInfo[nDude].seqStartID, "SEQ")) seqSpawn(dudeInfo[nDude].seqStartID, 3, pSprite2->extra, -1); diff --git a/source/blood/src/callback.cpp b/source/blood/src/callback.cpp index 134cdeedb..f09d81aa7 100644 --- a/source/blood/src/callback.cpp +++ b/source/blood/src/callback.cpp @@ -263,7 +263,6 @@ void Respawn(int nSprite) // 9 pXSprite->burnTime = 0; pXSprite->isTriggered = 0; if (IsDudeSprite(pSprite)) { - int nType = pSprite->type-kDudeBase; pSprite->x = baseSprite[nSprite].x; pSprite->y = baseSprite[nSprite].y; @@ -275,12 +274,9 @@ void Respawn(int nSprite) // 9 seqSpawn(dudeInfo[nType].seqStartID, 3, pSprite->extra, -1); aiInitSprite(pSprite); pXSprite->key = 0; - } else if (pSprite->type == kThingTNTBarrel) { - pSprite->cstat |= CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN; pSprite->cstat &= (unsigned short)~CSTAT_SPRITE_INVISIBLE; - } gFX.fxSpawn(FX_29, pSprite->sectnum, pSprite->x, pSprite->y, pSprite->z, 0); diff --git a/source/blood/src/player.cpp b/source/blood/src/player.cpp index dcb6fc91a..b9f01c1d2 100644 --- a/source/blood/src/player.cpp +++ b/source/blood/src/player.cpp @@ -688,11 +688,6 @@ int packItemToPowerup(int nPack) int powerupToPackItem(int nPowerUp) { - //const int jumpBoots = kPwUpJumpBoots; - //const int divingSuit = kPwUpDivingSuit; - //const int crystalBall = kPwUpCrystalBall; - //const int beastVision = 25; - switch (nPowerUp) { case kPwUpDivingSuit: return 1; @@ -868,11 +863,6 @@ void playerCorrectInertia(PLAYER* pPlayer, vec3_t const *oldpos) void playerResetPowerUps(PLAYER* pPlayer) { - //const int jumpBoots = kPwUpJumpBoots; - //const int divingSuit = kPwUpDivingSuit; - //const int crystalBall = kPwUpCrystalBall; - //const int beastVision = 25; - for (int i = 0; i < kMaxPowerUps; i++) { if (!VanillaMode() && (i == kPwUpJumpBoots || i == kPwUpDivingSuit || i == kPwUpCrystalBall || i == kPwUpBeastVision)) continue;