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

wrapped all remaining spr.type not related to kStatFX

Browse source
This commit is contained in:
Christoph Oelckers 2023-09-30 11:46:44 +02:00
parent e5d8b097fc
commit eb043f7fab
9 changed files with 47 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
source/games/blood/src/actor.cpp
View file

@ -2562,13 +2562,13 @@ static void ConcussSprite(DBloodActor* source, DBloodActor* actor, const DVector
} }
#endif #endif
} }
else if (actor->spr.type >= kThingBase && actor->spr.type < kThingMax) else if (actor->GetType() >= kThingBase && actor->GetType() < kThingMax)
{ {
mass = thingInfo[actor->GetType() - kThingBase].mass; mass = thingInfo[actor->GetType() - kThingBase].mass;
} }
else else
{ {
Printf(PRINT_HIGH, "Unexpected type in ConcussSprite(): Sprite: %d Type: %d Stat: %d", actor->GetIndex(), (int)actor->spr.type, (int)actor->spr.statnum); Printf(PRINT_HIGH, "Unexpected type in ConcussSprite(): Sprite: %d Type: %d Stat: %d", actor->GetIndex(), (int)actor->GetType(), (int)actor->spr.statnum);
return; return;
} }
@ -3384,7 +3384,7 @@ void actKillDude(DBloodActor* killerActor, DBloodActor* actor, DAMAGE_TYPE damag
if (gPlayer[p].fragger == actor && gPlayer[p].deathTime > 0) if (gPlayer[p].fragger == actor && gPlayer[p].deathTime > 0)
gPlayer[p].fragger = nullptr; gPlayer[p].fragger = nullptr;
} }
if (actor->spr.type != kDudeCultistBeast) if (actor->GetType() != kDudeCultistBeast)
trTriggerSprite(actor, kCmdOff, killerActor); trTriggerSprite(actor, kCmdOff, killerActor);
actor->spr.flags |= 7; actor->spr.flags |= 7;
@ -3592,9 +3592,8 @@ static int actDamageDude(DBloodActor* source, DBloodActor* actor, int damage, DA
{ {
if (!actor->IsDudeActor()) if (!actor->IsDudeActor())
{ {
Printf(PRINT_HIGH, "Bad Dude Failed: initial=%d type=%d %s\n", (int)actor->spr.inittype, (int)actor->spr.type, (int)(actor->spr.flags & kHitagRespawn) ? "RESPAWN" : "NORMAL"); Printf(PRINT_HIGH, "Bad Dude Failed: initial=%d type=%d %s\n", (int)actor->spr.inittype, (int)actor->GetType(), (int)(actor->spr.flags & kHitagRespawn) ? "RESPAWN" : "NORMAL");
return damage >> 4; return damage >> 4;
//I_Error("Bad Dude Failed: initial=%d type=%d %s\n", (int)actor->spr.inittype, (int)actor->spr.type, (int)(actor->spr.flags & 16) ? "RESPAWN" : "NORMAL");
} }
auto pDudeInfo = getDudeInfo(actor); auto pDudeInfo = getDudeInfo(actor);
@ -3810,11 +3809,11 @@ static void actImpactMissile(DBloodActor* missileActor, int hitCode)
pThingInfo = &thingInfo[actorHit->GetType() - kThingBase]; pThingInfo = &thingInfo[actorHit->GetType() - kThingBase];
break; break;
case kStatDude: case kStatDude:
pDudeInfo = getDudeInfo(actorHit->spr.type); pDudeInfo = getDudeInfo(actorHit);
break; break;
} }
} }
switch (missileActor->spr.type) switch (missileActor->GetType())
{ {
case kMissileLifeLeechRegular: case kMissileLifeLeechRegular:
if (hitCode == 3 && actorHit && (pThingInfo || pDudeInfo)) if (hitCode == 3 && actorHit && (pThingInfo || pDudeInfo))
@ -4493,7 +4492,7 @@ void actAirDrag(DBloodActor* actor, fixed_t drag)
static Collision MoveThing(DBloodActor* actor) static Collision MoveThing(DBloodActor* actor)
{ {
assert(actor->hasX()); assert(actor->hasX());
assert(actor->spr.type >= kThingBase && actor->spr.type < kThingMax); assert(actor->GetType() >= kThingBase && actor->GetType() < kThingMax);
const THINGINFO* pThingInfo = &thingInfo[actor->GetType() - kThingBase]; const THINGINFO* pThingInfo = &thingInfo[actor->GetType() - kThingBase];
auto pSector = actor->sector(); auto pSector = actor->sector();
assert(pSector); assert(pSector);
@ -4695,7 +4694,7 @@ void MoveDude(DBloodActor* actor)
if (actor->IsPlayerActor()) pPlayer = getPlayer(actor); if (actor->IsPlayerActor()) pPlayer = getPlayer(actor);
if (!(actor->IsDudeActor())) if (!(actor->IsDudeActor()))
{ {
Printf(PRINT_HIGH, "%d: actor->IsDudeActor()", actor->spr.type); Printf(PRINT_HIGH, "%d: actor->IsDudeActor()", actor->GetType());
return; return;
} }
@ -4970,7 +4969,7 @@ void MoveDude(DBloodActor* actor)
break; break;
case kDudeBurningCultist: case kDudeBurningCultist:
{ {
const bool fixRandomCultist = !cl_bloodvanillaenemies && (actor->spr.inittype >= kDudeBase) && (actor->spr.inittype < kDudeMax) && (actor->spr.inittype != actor->spr.type) && !VanillaMode(); // fix burning cultists randomly switching types underwater const bool fixRandomCultist = !cl_bloodvanillaenemies && (actor->spr.inittype >= kDudeBase) && (actor->spr.inittype < kDudeMax) && (actor->spr.inittype != actor->GetType()) && !VanillaMode(); // fix burning cultists randomly switching types underwater
if (Chance(chance)) if (Chance(chance))
actor->ChangeType(kDudeCultistTommy); actor->ChangeType(kDudeCultistTommy);
else else
@ -5533,7 +5532,7 @@ static void actCheckProximity()
int proxyDist = 96; int proxyDist = 96;
#ifdef NOONE_EXTENSIONS #ifdef NOONE_EXTENSIONS
// allow dudeLockout for proximity flag // allow dudeLockout for proximity flag
if (gModernMap && actor->spr.type != kThingDroppedLifeLeech && actor->xspr.DudeLockout && !dudeactor->IsPlayerActor()) if (gModernMap && actor->GetType() != kThingDroppedLifeLeech && actor->xspr.DudeLockout && !dudeactor->IsPlayerActor())
continue; continue;
if (actor->GetType() == kModernThingEnemyLifeLeech) proxyDist = 512; if (actor->GetType() == kModernThingEnemyLifeLeech) proxyDist = 512;
@ -5726,7 +5725,7 @@ static void actCheckExplosion()
if (!actor->hasX()) continue; if (!actor->hasX()) continue;
auto Owner = actor->GetOwner(); auto Owner = actor->GetOwner();
int nType = actor->spr.type; int nType = actor->GetType();
assert(nType >= 0 && nType < kExplodeMax); assert(nType >= 0 && nType < kExplodeMax);
const EXPLOSION* pExplodeInfo = &explodeInfo[nType]; const EXPLOSION* pExplodeInfo = &explodeInfo[nType];
const auto apos = actor->spr.pos; const auto apos = actor->spr.pos;
@ -6205,7 +6204,7 @@ DBloodActor* actSpawnDude(DBloodActor* source, int nType, double dist)
if (gModernMap && source->spr.flags & kModernTypeFlag1) if (gModernMap && source->spr.flags & kModernTypeFlag1)
{ {
// allow inheriting only for selected source types // allow inheriting only for selected source types
switch (source->spr.type) switch (source->GetType())
{ {
case kMarkerDudeSpawn: case kMarkerDudeSpawn:
//inherit pal? //inherit pal?
@ -6358,7 +6357,7 @@ DBloodActor* actFireThing(DBloodActor* actor, double xyoff, double zoff, double
void actBuildMissile(DBloodActor* spawned, DBloodActor* actor) void actBuildMissile(DBloodActor* spawned, DBloodActor* actor)
{ {
switch (spawned->spr.type) switch (spawned->GetType())
{ {
case kMissileLifeLeechRegular: case kMissileLifeLeechRegular:
evPostActor(spawned, 0, kCallbackFXFlameLick); evPostActor(spawned, 0, kCallbackFXFlameLick);
@ -6557,7 +6556,7 @@ bool actCheckRespawn(DBloodActor* actor)
if (nRespawnTime < 0) return 0; if (nRespawnTime < 0) return 0;
actor->xspr.respawnPending = 1; actor->xspr.respawnPending = 1;
if (actor->spr.type >= kThingBase && actor->spr.type < kThingMax) if (actor->GetType() >= kThingBase && actor->GetType() < kThingMax)
{ {
actor->xspr.respawnPending = 3; actor->xspr.respawnPending = 3;
if (actor->GetType() == kThingTNTBarrel) actor->spr.cstat |= CSTAT_SPRITE_INVISIBLE; if (actor->GetType() == kThingTNTBarrel) actor->spr.cstat |= CSTAT_SPRITE_INVISIBLE;
@ -6796,7 +6795,7 @@ void actFireVector(DBloodActor* shooter, double offset, double zoffset, DVector3
actBurnSprite(shooter->GetOwner(), actor, pVectorData->burnTime); actBurnSprite(shooter->GetOwner(), actor, pVectorData->burnTime);
} }
if (actor->spr.type >= kThingBase && actor->spr.type < kThingMax) { if (actor->GetType() >= kThingBase && actor->GetType() < kThingMax) {
actor->spr.statnum = kStatThing; // temporary change statnum property actor->spr.statnum = kStatThing; // temporary change statnum property
actDamageSprite(shooter, actor, pVectorData->dmgType, pVectorData->dmg << 4); actDamageSprite(shooter, actor, pVectorData->dmgType, pVectorData->dmg << 4);
actor->spr.statnum = kStatDecoration; // return statnum property back actor->spr.statnum = kStatDecoration; // return statnum property back

10
source/games/blood/src/ai.cpp
View file

@ -109,7 +109,7 @@ static bool isImmune(DBloodActor* actor, int dmgType, int minScale)
if (dmgType >= kDmgFall && dmgType < kDmgMax && actor->hasX() && actor->xspr.locked != 1) if (dmgType >= kDmgFall && dmgType < kDmgMax && actor->hasX() && actor->xspr.locked != 1)
{ {
int type = actor->spr.type; int type = actor->GetType();
if (type >= kThingBase && type < kThingMax) if (type >= kThingBase && type < kThingMax)
return (thingInfo[type - kThingBase].dmgControl[dmgType] <= minScale); return (thingInfo[type - kThingBase].dmgControl[dmgType] <= minScale);
else if (actor->IsDudeActor()) else if (actor->IsDudeActor())
@ -952,7 +952,7 @@ int aiDamageSprite(DBloodActor* source, DBloodActor* actor, DAMAGE_TYPE nDmgType
else if (source != actor->GetTarget()) // if found a new target, retarget else if (source != actor->GetTarget()) // if found a new target, retarget
{ {
int nThresh = nDamage; int nThresh = nDamage;
if (actor->spr.type == source->spr.type) if (actor->GetType() == source->GetType())
nThresh *= pDudeInfo->changeTargetKin; nThresh *= pDudeInfo->changeTargetKin;
else else
nThresh *= pDudeInfo->changeTarget; nThresh *= pDudeInfo->changeTarget;
@ -971,7 +971,7 @@ int aiDamageSprite(DBloodActor* source, DBloodActor* actor, DAMAGE_TYPE nDmgType
{ {
aiPatrolStop(actor, source, actor->xspr.dudeAmbush); aiPatrolStop(actor, source, actor->xspr.dudeAmbush);
PLAYER* pPlayer = getPlayerById(source->spr.type); PLAYER* pPlayer = getPlayerById(source->GetType());
if (!pPlayer) return nDamage; if (!pPlayer) return nDamage;
//if (powerupCheck(pPlayer, kPwUpShadowCloak)) pPlayer->pwUpTime[kPwUpShadowCloak] = 0; //if (powerupCheck(pPlayer, kPwUpShadowCloak)) pPlayer->pwUpTime[kPwUpShadowCloak] = 0;
if (readyForCrit(source, actor)) if (readyForCrit(source, actor))
@ -1097,7 +1097,7 @@ int aiDamageSprite(DBloodActor* source, DBloodActor* actor, DAMAGE_TYPE nDmgType
DUDEEXTRA* pDudeExtra = &actor->dudeExtra; DUDEEXTRA* pDudeExtra = &actor->dudeExtra;
pDudeExtra->teslaHit = 0; pDudeExtra->teslaHit = 0;
} }
const bool fixRandomCultist = !cl_bloodvanillaenemies && (actor->spr.inittype >= kDudeBase) && (actor->spr.inittype < kDudeMax) && (actor->spr.inittype != actor->spr.type) && !VanillaMode(); // fix burning cultists randomly switching types underwater const bool fixRandomCultist = !cl_bloodvanillaenemies && (actor->spr.inittype >= kDudeBase) && (actor->spr.inittype < kDudeMax) && (actor->spr.inittype != actor->GetType()) && !VanillaMode(); // fix burning cultists randomly switching types underwater
switch (actor->GetType()) switch (actor->GetType())
{ {
case kDudeCultistTommy: case kDudeCultistTommy:
@ -1915,7 +1915,7 @@ void aiInitSprite(DBloodActor* actor)
// make dude follow the markers // make dude follow the markers
bool uwater = spriteIsUnderwater(actor); bool uwater = spriteIsUnderwater(actor);
if (actor->GetTarget() == nullptr || actor->GetTarget()->spr.type != kMarkerPath) if (actor->GetTarget() == nullptr || actor->GetTarget()->GetType() != kMarkerPath)
{ {
actor->SetTarget(nullptr); actor->SetTarget(nullptr);
aiPatrolSetMarker(actor); aiPatrolSetMarker(actor);

2
source/games/blood/src/aibat.cpp
View file

@ -261,7 +261,7 @@ static void batThinkChase(DBloodActor* actor)
{ {
DAngle nDeltaAngle = absangle(actor->spr.Angles.Yaw, dvec.Angle()); DAngle nDeltaAngle = absangle(actor->spr.Angles.Yaw, dvec.Angle());
double height = pDudeInfo->eyeHeight * actor->spr.scale.Y; double height = pDudeInfo->eyeHeight * actor->spr.scale.Y;
// Should be dudeInfo[pTarget->spr.type-kDudeBase] // Should be dudeInfo[pTarget]
double height2 = pDudeInfo->eyeHeight * pTarget->spr.scale.Y; double height2 = pDudeInfo->eyeHeight * pTarget->spr.scale.Y;
double top, bottom; double top, bottom;
GetActorExtents(actor, &top, &bottom); GetActorExtents(actor, &top, &bottom);

8
source/games/blood/src/bloodactor.h
View file

@ -105,22 +105,22 @@ public:
bool IsThingActor() bool IsThingActor()
{ {
return spr.type >= kThingBase && spr.type < kThingMax; return GetType() >= kThingBase && GetType() < kThingMax;
} }
bool IsItemActor() bool IsItemActor()
{ {
return spr.type >= kItemBase && spr.type < kItemMax; return GetType() >= kItemBase && GetType() < kItemMax;
} }
bool IsWeaponActor() bool IsWeaponActor()
{ {
return spr.type >= kItemWeaponBase && spr.type < kItemWeaponMax; return GetType() >= kItemWeaponBase && GetType() < kItemWeaponMax;
} }
bool IsAmmoActor() bool IsAmmoActor()
{ {
return spr.type >= kItemAmmoBase && spr.type < kItemAmmoMax; return GetType() >= kItemAmmoBase && GetType() < kItemAmmoMax;
} }
bool isActive() bool isActive()

12
source/games/blood/src/callback.cpp
View file

@ -289,7 +289,7 @@ void Respawn(DBloodActor* actor, sectortype*) // 9
if (!gModernMap || actor->xspr.sysData2 <= 0) actor->xspr.health = dudeInfo[actor->GetType() - kDudeBase].startHealth << 4; if (!gModernMap || actor->xspr.sysData2 <= 0) actor->xspr.health = dudeInfo[actor->GetType() - kDudeBase].startHealth << 4;
else actor->xspr.health = ClipRange(actor->xspr.sysData2 << 4, 1, 65535); else actor->xspr.health = ClipRange(actor->xspr.sysData2 << 4, 1, 65535);
switch (actor->spr.type) { switch (actor->GetType()) {
default: default:
actor->clipdist = getDudeInfo(nType + kDudeBase)->fClipdist(); actor->clipdist = getDudeInfo(nType + kDudeBase)->fClipdist();
if (getSequence(getDudeInfo(nType + kDudeBase)->seqStartID)) if (getSequence(getDudeInfo(nType + kDudeBase)->seqStartID))
@ -582,7 +582,7 @@ void returnFlagToBase(DBloodActor* actor, sectortype*) // 17
auto aOwner = actor->GetOwner(); auto aOwner = actor->GetOwner();
if (aOwner) if (aOwner)
{ {
switch (actor->spr.type) switch (actor->GetType())
{ {
case kItemFlagA: case kItemFlagA:
trTriggerSprite(aOwner, kCmdOn, aOwner); trTriggerSprite(aOwner, kCmdOn, aOwner);
@ -611,7 +611,7 @@ void fxPodBloodSpray(DBloodActor* actor, sectortype*) // 18
{ {
if (!actor) return; if (!actor) return;
DBloodActor* pFX; DBloodActor* pFX;
if (actor->spr.type == 53) if (actor->spr.type == FX_53)
pFX = gFX.fxSpawnActor(FX_53, actor->sector(), actor->spr.pos); pFX = gFX.fxSpawnActor(FX_53, actor->sector(), actor->spr.pos);
else else
pFX = gFX.fxSpawnActor(FX_54, actor->sector(), actor->spr.pos); pFX = gFX.fxSpawnActor(FX_54, actor->sector(), actor->spr.pos);
@ -643,7 +643,7 @@ void fxPodBloodSplat(DBloodActor* actor, sectortype*) // 19
int nDist = Random(16); int nDist = Random(16);
auto pos = actor->spr.pos.XY() + nAngle.ToVector() * nDist * 4; auto pos = actor->spr.pos.XY() + nAngle.ToVector() * nDist * 4;
if (actor->spr.Angles.Yaw == DAngle180 && actor->spr.type == 53) if (actor->spr.Angles.Yaw == DAngle180 && actor->spr.type == FX_53)
{ {
int nChannel = 28 + (actor->GetIndex() & 2); int nChannel = 28 + (actor->GetIndex() & 2);
assert(nChannel < 32); assert(nChannel < 32);
@ -677,7 +677,7 @@ void LeechStateTimer(DBloodActor* actor, sectortype*) // 20
{ {
if (!actor) return; if (!actor) return;
if (actor->spr.statnum == kStatThing && !(actor->spr.flags & 32)) { if (actor->spr.statnum == kStatThing && !(actor->spr.flags & 32)) {
switch (actor->spr.type) { switch (actor->GetType()) {
case kThingDroppedLifeLeech: case kThingDroppedLifeLeech:
#ifdef NOONE_EXTENSIONS #ifdef NOONE_EXTENSIONS
case kModernThingEnemyLifeLeech: case kModernThingEnemyLifeLeech:
@ -782,7 +782,7 @@ void DropVoodooCb(DBloodActor* actor, sectortype*) // unused
else else
{ {
int vd = 0x2666; int vd = 0x2666;
switch (actor2->spr.type) switch (actor2->GetType())
{ {
case kDudeBoneEel: case kDudeBoneEel:
case kDudeBat: case kDudeBat:

12
source/games/blood/src/player.cpp
View file

@ -1030,7 +1030,7 @@ bool PickupItem(PLAYER* pPlayer, DBloodActor* itemactor)
int nType = itemactor->GetType() - kItemBase; int nType = itemactor->GetType() - kItemBase;
auto plActor = pPlayer->actor; auto plActor = pPlayer->actor;
switch (itemactor->spr.type) { switch (itemactor->GetType()) {
case kItemShadowCloak: case kItemShadowCloak:
#ifdef NOONE_EXTENSIONS #ifdef NOONE_EXTENSIONS
if (isGrown(pPlayer->actor) || !powerupActivate(pPlayer, nType)) return false; if (isGrown(pPlayer->actor) || !powerupActivate(pPlayer, nType)) return false;
@ -1043,7 +1043,7 @@ bool PickupItem(PLAYER* pPlayer, DBloodActor* itemactor)
case kItemShroomGrow: case kItemShroomGrow:
if (gModernMap) { if (gModernMap) {
switch (itemactor->spr.type) { switch (itemactor->GetType()) {
case kItemShroomShrink: case kItemShroomShrink:
if (isShrinked(pPlayer->actor)) return false; if (isShrinked(pPlayer->actor)) return false;
break; break;
@ -1217,8 +1217,8 @@ bool PickupItem(PLAYER* pPlayer, DBloodActor* itemactor)
case kItemKeySpider: case kItemKeySpider:
case kItemKeyMoon: case kItemKeyMoon:
case kItemKeyKey7: case kItemKeyKey7:
if (pPlayer->hasKey[itemactor->spr.type - 99]) return 0; if (pPlayer->hasKey[itemactor->GetType() - 99]) return 0;
pPlayer->hasKey[itemactor->spr.type - 99] = 1; pPlayer->hasKey[itemactor->GetType() - 99] = 1;
pickupSnd = 781; pickupSnd = 781;
break; break;
case kItemHealthMedPouch: case kItemHealthMedPouch:
@ -1328,7 +1328,7 @@ bool PickupWeapon(PLAYER* pPlayer, DBloodActor* weaponactor)
void PickUp(PLAYER* pPlayer, DBloodActor* actor) void PickUp(PLAYER* pPlayer, DBloodActor* actor)
{ {
const char* msg = nullptr; const char* msg = nullptr;
int nType = actor->spr.type; int nType = actor->GetType();
bool pickedUp = 0; bool pickedUp = 0;
int customMsg = -1; int customMsg = -1;
#ifdef NOONE_EXTENSIONS #ifdef NOONE_EXTENSIONS
@ -2075,7 +2075,7 @@ int playerDamageSprite(DBloodActor* source, PLAYER* pPlayer, DAMAGE_TYPE nDamage
pPlayer->painEffect = ClipHigh(pPlayer->painEffect + (nDamage >> 3), 600); pPlayer->painEffect = ClipHigh(pPlayer->painEffect + (nDamage >> 3), 600);
DBloodActor* pActor = pPlayer->actor; DBloodActor* pActor = pPlayer->actor;
DUDEINFO* pDudeInfo = getDudeInfo(pActor->spr.type); DUDEINFO* pDudeInfo = getDudeInfo(pActor->GetType());
int nDeathSeqID = -1; int nDeathSeqID = -1;
int nKneelingPlayer = -1; int nKneelingPlayer = -1;
bool va = playerSeqPlaying(pPlayer, 16); bool va = playerSeqPlaying(pPlayer, 16);

4
source/games/blood/src/preload.cpp
View file

@ -83,7 +83,7 @@ void PrecacheDude(DBloodActor* actor)
seqPrecacheId(pDudeInfo->seqStartID + 5, palette); seqPrecacheId(pDudeInfo->seqStartID + 5, palette);
seqPrecacheId(pDudeInfo->seqStartID + 1, palette); seqPrecacheId(pDudeInfo->seqStartID + 1, palette);
seqPrecacheId(pDudeInfo->seqStartID + 2, palette); seqPrecacheId(pDudeInfo->seqStartID + 2, palette);
switch (actor->spr.type) switch (actor->GetType())
{ {
case kDudeCultistTommy: case kDudeCultistTommy:
case kDudeCultistShotgun: case kDudeCultistShotgun:
@ -170,7 +170,7 @@ void PrecacheDude(DBloodActor* actor)
void PrecacheThing(DBloodActor* actor) void PrecacheThing(DBloodActor* actor)
{ {
int palette = actor->spr.pal; int palette = actor->spr.pal;
switch (actor->spr.type) { switch (actor->GetType()) {
case kThingGlassWindow: // worthless... case kThingGlassWindow: // worthless...
case kThingFluorescent: case kThingFluorescent:
seqPrecacheId(12, palette); seqPrecacheId(12, palette);

14
source/games/blood/src/triggers.cpp
View file

@ -345,7 +345,7 @@ void OperateSprite(DBloodActor* actor, EVENT event)
} }
switch (actor->spr.type) { switch (actor->GetType()) {
case kTrapMachinegun: case kTrapMachinegun:
if (actor->xspr.health <= 0) break; if (actor->xspr.health <= 0) break;
switch (event.cmd) { switch (event.cmd) {
@ -580,7 +580,7 @@ void OperateSprite(DBloodActor* actor, EVENT event)
SetSpriteState(actor, 0, initiator); SetSpriteState(actor, 0, initiator);
break; break;
case kCmdRepeat: case kCmdRepeat:
if (actor->spr.type != kGenTrigger) ActivateGenerator(actor); if (actor->GetType() != kGenTrigger) ActivateGenerator(actor);
if (actor->xspr.txID) evSendActor(actor, actor->xspr.txID, (COMMAND_ID)actor->xspr.command, initiator); if (actor->xspr.txID) evSendActor(actor, actor->xspr.txID, (COMMAND_ID)actor->xspr.command, initiator);
if (actor->xspr.busyTime > 0) { if (actor->xspr.busyTime > 0) {
int nRand = Random2(actor->xspr.data1); int nRand = Random2(actor->xspr.data1);
@ -1863,7 +1863,7 @@ void LinkSprite(DBloodActor* actor, EVENT event)
DBloodActor* initiator = event.initiator; DBloodActor* initiator = event.initiator;
int nBusy = GetSourceBusy(event); int nBusy = GetSourceBusy(event);
switch (actor->spr.type) { switch (actor->GetType()) {
case kSwitchCombo: case kSwitchCombo:
{ {
if (event.isActor()) if (event.isActor())
@ -2280,7 +2280,7 @@ void trInit(TArray<DBloodActor*>& actors)
for (auto actor : actors) for (auto actor : actors)
{ {
if (!actor->exists()) continue; if (!actor->exists()) continue;
actor->spr.inittype = actor->spr.type; actor->spr.inittype = actor->GetType();
actor->basePoint = actor->spr.pos; actor->basePoint = actor->spr.pos;
} }
for (auto& wal : wall) for (auto& wal : wall)
@ -2356,7 +2356,7 @@ void trInit(TArray<DBloodActor*>& actors)
{ {
if (actor->xspr.state) if (actor->xspr.state)
actor->xspr.busy = 65536; actor->xspr.busy = 65536;
switch (actor->spr.type) { switch (actor->GetType()) {
case kSwitchPadlock: case kSwitchPadlock:
actor->xspr.triggerOnce = 1; actor->xspr.triggerOnce = 1;
break; break;
@ -2449,7 +2449,7 @@ void trTextOver(int nId)
void InitGenerator(DBloodActor* actor) void InitGenerator(DBloodActor* actor)
{ {
assert(actor->hasX()); assert(actor->hasX());
switch (actor->spr.type) { switch (actor->GetType()) {
case kGenTrigger: case kGenTrigger:
actor->spr.cstat &= ~CSTAT_SPRITE_BLOCK; actor->spr.cstat &= ~CSTAT_SPRITE_BLOCK;
actor->spr.cstat |= CSTAT_SPRITE_INVISIBLE; actor->spr.cstat |= CSTAT_SPRITE_INVISIBLE;
@ -2468,7 +2468,7 @@ void InitGenerator(DBloodActor* actor)
void ActivateGenerator(DBloodActor* actor) void ActivateGenerator(DBloodActor* actor)
{ {
assert(actor->hasX()); assert(actor->hasX());
switch (actor->spr.type) { switch (actor->GetType()) {
case kGenDripWater: case kGenDripWater:
case kGenDripBlood: { case kGenDripBlood: {
double top, bottom; double top, bottom;

2
source/games/blood/src/view.cpp
View file

@ -644,7 +644,7 @@ void viewDrawScreen(bool sceneonly)
it.Reset(kStatProjectile); it.Reset(kStatProjectile);
while (auto actor = it.Next()) while (auto actor = it.Next())
{ {
switch (actor->spr.type) { switch (actor->GetType()) {
case kMissileFlareRegular: case kMissileFlareRegular:
case kMissileTeslaAlt: case kMissileTeslaAlt:
case kMissileFlareAlt: case kMissileFlareAlt: