teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- actSpawnDude.

Browse source
This commit is contained in:
Christoph Oelckers 2020-12-05 18:32:49 +01:00
parent e8187b4a99
commit c5d7455317
8 changed files with 106 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6423,14 +6423,52 @@ DBloodActor* actSpawnSprite(int nSector, int x, int y, int z, int nStat, bool se
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
spritetype *actSpawnDude(spritetype *pSource, short nType, int a3, int a4) DBloodActor* actSpawnSprite(DBloodActor* source, int nStat)
{ {
XSPRITE* pXSource = &xsprite[pSource->extra]; auto pSource = &source->s();
spritetype *pSprite2 = actSpawnSprite(pSource, kStatDude); int nSprite = InsertSprite(pSource->sectnum, nStat);
if (!pSprite2) return NULL; if (nSprite < 0)
XSPRITE *pXSprite2 = &xsprite[pSprite2->extra]; {
StatIterator it(kStatPurge);
nSprite = it.NextIndex();
assert(nSprite >= 0);
assert(pSource->sectnum >= 0 && pSource->sectnum < kMaxSectors);
ChangeSpriteSect(nSprite, pSource->sectnum);
actPostSprite(nSprite, nStat);
}
auto actor = &bloodActors[nSprite];
spritetype* pSprite = &actor->s();
pSprite->x = pSource->x;
pSprite->y = pSource->y;
pSprite->z = pSource->z;
actor->xvel() = source->xvel();
actor->yvel() = source->yvel();
actor->zvel() = source->zvel();
pSprite->flags = 0;
actor->addX();
actor->hit().florhit = 0;
actor->hit().ceilhit = 0;
if (!VanillaMode()) actor->SetTarget(nullptr);
return actor;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
DBloodActor* actSpawnDude(DBloodActor* source, short nType, int a3, int a4)
{
auto pSource = &source->s();
XSPRITE* pXSource = &source->x();
auto spawned = actSpawnSprite(source, kStatDude);
if (!spawned) return NULL;
spritetype* pSprite2 = &spawned->s();
XSPRITE* pXSprite2 = &spawned->x();
int angle = pSource->ang; int angle = pSource->ang;
int nDude = nType-kDudeBase; int nDude = nType - kDudeBase;
int x, y, z; int x, y, z;
z = a4 + pSource->z; z = a4 + pSource->z;
if (a3 < 0) if (a3 < 0)
@ -6440,25 +6478,28 @@ spritetype *actSpawnDude(spritetype *pSource, short nType, int a3, int a4)
} }
else else
{ {
x = pSource->x+mulscale30r(Cos(angle), a3); x = pSource->x + mulscale30r(Cos(angle), a3);
y = pSource->y+mulscale30r(Sin(angle), a3); y = pSource->y + mulscale30r(Sin(angle), a3);
} }
pSprite2->type = nType; pSprite2->type = nType;
pSprite2->ang = angle; pSprite2->ang = angle;
vec3_t pos = { x, y, z }; vec3_t pos = { x, y, z };
setsprite(pSprite2->index, &pos); setsprite(pSprite2->index, &pos);
pSprite2->cstat |= 0x1101; pSprite2->cstat |= 0x1101;
pSprite2->clipdist = getDudeInfo(nDude+kDudeBase)->clipdist; pSprite2->clipdist = getDudeInfo(nDude + kDudeBase)->clipdist;
pXSprite2->health = getDudeInfo(nDude+kDudeBase)->startHealth<<4; pXSprite2->health = getDudeInfo(nDude + kDudeBase)->startHealth << 4;
pXSprite2->respawn = 1; pXSprite2->respawn = 1;
if (getSequence(getDudeInfo(nDude+kDudeBase)->seqStartID)) if (getSequence(getDudeInfo(nDude + kDudeBase)->seqStartID))
seqSpawn(getDudeInfo(nDude+kDudeBase)->seqStartID, 3, pSprite2->extra, -1); seqSpawn(getDudeInfo(nDude + kDudeBase)->seqStartID, spawned, -1);
#ifdef NOONE_EXTENSIONS #ifdef NOONE_EXTENSIONS
// add a way to inherit some values of spawner type 18 by dude. // add a way to inherit some values of spawner type 18 by dude.
// This way designer can count enemies via switches and do many other interesting things. // This way designer can count enemies via switches and do many other interesting things.
if (gModernMap && pSource->flags & kModernTypeFlag1) { if (gModernMap && pSource->flags & kModernTypeFlag1)
switch (pSource->type) { // allow inheriting only for selected source types {
// allow inheriting only for selected source types
switch (pSource->type)
{
case kMarkerDudeSpawn: case kMarkerDudeSpawn:
//inherit pal? //inherit pal?
if (pSprite2->pal <= 0) pSprite2->pal = pSource->pal; if (pSprite2->pal <= 0) pSprite2->pal = pSource->pal;
@ -6481,39 +6522,17 @@ spritetype *actSpawnDude(spritetype *pSource, short nType, int a3, int a4)
break; break;
} }
} }
#endif #endif
aiInitSprite(pSprite2); aiInitSprite(pSprite2);
return pSprite2; return spawned;
} }
spritetype * actSpawnSprite(spritetype *pSource, int nStat) //---------------------------------------------------------------------------
{ //
int nSprite = InsertSprite(pSource->sectnum, nStat); //
if (nSprite < 0) //
{ //---------------------------------------------------------------------------
StatIterator it(kStatPurge);
nSprite = it.NextIndex();
assert(nSprite >= 0);
assert(pSource->sectnum >= 0 && pSource->sectnum < kMaxSectors);
ChangeSpriteSect(nSprite, pSource->sectnum);
actPostSprite(nSprite, nStat);
}
spritetype *pSprite = &sprite[nSprite];
pSprite->x = pSource->x;
pSprite->y = pSource->y;
pSprite->z = pSource->z;
xvel[nSprite] = xvel[pSource->index];
yvel[nSprite] = yvel[pSource->index];
zvel[nSprite] = zvel[pSource->index];
pSprite->flags = 0;
int nXSprite = dbInsertXSprite(nSprite);
gSpriteHit[nXSprite].florhit = 0;
gSpriteHit[nXSprite].ceilhit = 0;
if (!VanillaMode())
xsprite[nXSprite].target = -1;
return pSprite;
}
spritetype * actSpawnThing(int nSector, int x, int y, int z, int nThingType) spritetype * actSpawnThing(int nSector, int x, int y, int z, int nThingType)
{ {

4
source/games/blood/src/actor.h
View file

@ -233,8 +233,8 @@ void actExplodeSprite(DBloodActor *pSprite);
void actActivateGibObject(DBloodActor *actor); void actActivateGibObject(DBloodActor *actor);
void actProcessSprites(void); void actProcessSprites(void);
DBloodActor* actSpawnSprite(int nSector, int x, int y, int z, int nStat, bool a6); DBloodActor* actSpawnSprite(int nSector, int x, int y, int z, int nStat, bool a6);
spritetype *actSpawnDude(spritetype *pSource, short nType, int a3, int a4); DBloodActor* actSpawnDude(DBloodActor* pSource, short nType, int a3, int a4);
spritetype * actSpawnSprite(spritetype *pSource, int nStat); DBloodActor * actSpawnSprite(DBloodActor *pSource, int nStat);
spritetype * actSpawnThing(int nSector, int x, int y, int z, int nThingType); spritetype * actSpawnThing(int nSector, int x, int y, int z, int nThingType);
spritetype * actFireThing_(spritetype *pSprite, int a2, int a3, int a4, int thingType, int a6); spritetype * actFireThing_(spritetype *pSprite, int a2, int a3, int a4, int thingType, int a6);
DBloodActor* actFireThing(DBloodActor* pSprite, int a2, int a3, int a4, int thingType, int a6); DBloodActor* actFireThing(DBloodActor* pSprite, int a2, int a3, int a4, int thingType, int a6);

17
source/games/blood/src/aispid.cpp
View file

@ -152,19 +152,20 @@ void SpidBirthSeqCallback(int, DBloodActor* actor)
int nAngle = getangle(dx, dy); int nAngle = getangle(dx, dy);
int nDist = approxDist(dx, dy); int nDist = approxDist(dx, dy);
spritetype *pSpawn = NULL; DBloodActor* spawned = nullptr;
if (IsPlayerSprite(pTarget) && pDudeExtraE->xval2 < 10) { if (IsPlayerSprite(pTarget) && pDudeExtraE->xval2 < 10)
{
if (nDist < 0x1a00 && nDist > 0x1400 && abs(pSprite->ang-nAngle) < pDudeInfo->periphery) if (nDist < 0x1a00 && nDist > 0x1400 && abs(pSprite->ang-nAngle) < pDudeInfo->periphery)
pSpawn = actSpawnDude(pSprite, kDudeSpiderRed, pSprite->clipdist, 0); spawned = actSpawnDude(actor, kDudeSpiderRed, pSprite->clipdist, 0);
else if (nDist < 0x1400 && nDist > 0xc00 && abs(pSprite->ang-nAngle) < pDudeInfo->periphery) else if (nDist < 0x1400 && nDist > 0xc00 && abs(pSprite->ang-nAngle) < pDudeInfo->periphery)
pSpawn = actSpawnDude(pSprite, kDudeSpiderBrown, pSprite->clipdist, 0); spawned = actSpawnDude(actor, kDudeSpiderBrown, pSprite->clipdist, 0);
else if (nDist < 0xc00 && abs(pSprite->ang - nAngle) < pDudeInfo->periphery) else if (nDist < 0xc00 && abs(pSprite->ang - nAngle) < pDudeInfo->periphery)
pSpawn = actSpawnDude(pSprite, kDudeSpiderBrown, pSprite->clipdist, 0); spawned = actSpawnDude(actor, kDudeSpiderBrown, pSprite->clipdist, 0);
if (pSpawn) { if (spawned)
{
pDudeExtraE->xval2++; pDudeExtraE->xval2++;
pSpawn->owner = pSprite->index; spawned->SetOwner(spawned);
gKillMgr.AddNewKill(1); gKillMgr.AddNewKill(1);
} }
} }

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

@ -232,9 +232,12 @@ void genDudeAttack1(int, DBloodActor* actor)
} else if (pExtra->weaponType == kGenDudeWeaponSummon) { } else if (pExtra->weaponType == kGenDudeWeaponSummon) {
spritetype* pSpawned = NULL; int dist = pSprite->clipdist << 4; DBloodActor* spawned = nullptr;
int dist = pSprite->clipdist << 4;
if (pExtra->slaveCount <= gGameOptions.nDifficulty) { if (pExtra->slaveCount <= gGameOptions.nDifficulty) {
if ((pSpawned = actSpawnDude(pSprite, pExtra->curWeapon, dist + Random(dist), 0)) != NULL) { if ((spawned = actSpawnDude(actor, pExtra->curWeapon, dist + Random(dist), 0)) != NULL)
{
spritetype* pSpawned = &spawned->s();
pSpawned->owner = pSprite->index; pSpawned->owner = pSprite->index;
if (xspriRangeIsFine(pSpawned->extra)) { if (xspriRangeIsFine(pSpawned->extra)) {
@ -1630,8 +1633,11 @@ bool doExplosion(spritetype* pSprite, int nType)
// so custom dude can have different weapons, hp and so on... // so custom dude can have different weapons, hp and so on...
spritetype* genDudeSpawn(XSPRITE* pXSource, spritetype* pSprite, int nDist) { spritetype* genDudeSpawn(XSPRITE* pXSource, spritetype* pSprite, int nDist) {
DBloodActor* actor = &bloodActors[pSprite->index];
spritetype* pSource = &sprite[pXSource->reference]; spritetype* pSource = &sprite[pXSource->reference];
spritetype* pDude = actSpawnSprite(pSprite, kStatDude); XSPRITE* pXDude = &xsprite[pDude->extra]; auto spawned = actSpawnSprite(actor, kStatDude);
spritetype* pDude = &spawned->s();
XSPRITE* pXDude = &spawned->x();
int x, y, z = pSprite->z, nAngle = pSprite->ang, nType = kDudeModernCustom; int x, y, z = pSprite->z, nAngle = pSprite->ang, nType = kDudeModernCustom;

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

@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "build.h" #include "build.h"
#include "blood.h" #include "blood.h"
#include "bloodactor.h"
BEGIN_BLD_NS BEGIN_BLD_NS
@ -70,12 +71,13 @@ void Remove(int nSprite) // 1
void FlareBurst(int nSprite) // 2 void FlareBurst(int nSprite) // 2
{ {
assert(nSprite >= 0 && nSprite < kMaxSprites); assert(nSprite >= 0 && nSprite < kMaxSprites);
auto actor = &bloodActors[nSprite];
spritetype *pSprite = &sprite[nSprite]; spritetype *pSprite = &sprite[nSprite];
int nAngle = getangle(xvel[nSprite], yvel[nSprite]); int nAngle = getangle(xvel[nSprite], yvel[nSprite]);
int nRadius = 0x55555; int nRadius = 0x55555;
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
{ {
spritetype *pSpawn = actSpawnSprite(pSprite, 5); spritetype *pSpawn = &actSpawnSprite(actor, 5)->s();
pSpawn->picnum = 2424; pSpawn->picnum = 2424;
pSpawn->shade = -128; pSpawn->shade = -128;
pSpawn->xrepeat = pSpawn->yrepeat = 32; pSpawn->xrepeat = pSpawn->yrepeat = 32;

22
source/games/blood/src/nnexts.cpp
View file

@ -271,12 +271,13 @@ void nnExResetPatrolBonkles() {
spritetype* nnExtSpawnDude(XSPRITE* pXSource, spritetype* pSprite, short nType, int a3, int a4) spritetype* nnExtSpawnDude(XSPRITE* pXSource, spritetype* pSprite, short nType, int a3, int a4)
{ {
spritetype* pDude = NULL; DBloodActor* pDudeActor = nullptr;
spritetype* pSource = &sprite[pXSource->reference]; spritetype* pSource = &sprite[pXSource->reference];
if (nType < kDudeBase || nType >= kDudeMax || (pDude = actSpawnSprite(pSprite, kStatDude)) == NULL) if (nType < kDudeBase || nType >= kDudeMax || (pDudeActor = actSpawnSprite(&bloodActors[pSprite->index], kStatDude)) == NULL)
return NULL; return NULL;
XSPRITE* pXDude = &xsprite[pDude->extra]; spritetype* pDude = &pDudeActor->s();
XSPRITE* pXDude = &pDudeActor->x();
int angle = pSprite->ang; int angle = pSprite->ang;
int x, y, z = a4 + pSprite->z; int x, y, z = a4 + pSprite->z;
@ -970,16 +971,12 @@ spritetype* randomDropPickupObject(spritetype* pSource, short prevItem) {
} }
// this function spawns random dude using dudeSpawn // this function spawns random dude using dudeSpawn
spritetype* randomSpawnDude(XSPRITE* pXSource, spritetype* pSprite, int a3, int a4) { spritetype* randomSpawnDude(XSPRITE* pXSource, spritetype* pSprite, int a3, int a4)
{
spritetype* pSprite2 = NULL; int selected = -1; spritetype* pSprite2 = NULL; int selected = -1;
spritetype* pSource = &sprite[pXSource->reference];
if (xspriRangeIsFine(pSource->extra)) { if ((selected = randomGetDataValue(pXSource, kRandomizeDude)) > 0)
XSPRITE* pXSource = &xsprite[pSource->extra]; pSprite2 = nnExtSpawnDude(pXSource, pSprite, selected, a3, 0);
if ((selected = randomGetDataValue(pXSource, kRandomizeDude)) > 0)
pSprite2 = nnExtSpawnDude(pXSource, pSprite, selected, a3, 0);
}
return pSprite2; return pSprite2;
} }
@ -7787,6 +7784,7 @@ void levelEndLevelCustom(int nLevel) {
void callbackUniMissileBurst(int nSprite) // 22 void callbackUniMissileBurst(int nSprite) // 22
{ {
auto actor = &bloodActors[nSprite];
assert(nSprite >= 0 && nSprite < kMaxSprites); assert(nSprite >= 0 && nSprite < kMaxSprites);
if (sprite[nSprite].statnum != kStatProjectile) return; if (sprite[nSprite].statnum != kStatProjectile) return;
spritetype* pSprite = &sprite[nSprite]; spritetype* pSprite = &sprite[nSprite];
@ -7795,7 +7793,7 @@ void callbackUniMissileBurst(int nSprite) // 22
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
{ {
spritetype* pBurst = actSpawnSprite(pSprite, 5); spritetype* pBurst = &actSpawnSprite(actor, 5)->s();
pBurst->type = pSprite->type; pBurst->type = pSprite->type;
pBurst->shade = pSprite->shade; pBurst->shade = pSprite->shade;

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

@ -1570,7 +1570,9 @@ void ProcessInput(PLAYER *pPlayer)
pPlayer->handTime = ClipLow(pPlayer->handTime-4*(6-gGameOptions.nDifficulty), 0); pPlayer->handTime = ClipLow(pPlayer->handTime-4*(6-gGameOptions.nDifficulty), 0);
if (pPlayer->handTime <= 0 && pPlayer->hand) if (pPlayer->handTime <= 0 && pPlayer->hand)
{ {
spritetype *pSprite2 = actSpawnDude(pPlayer->pSprite, kDudeHand, pPlayer->pSprite->clipdist<<1, 0); auto pactor = &bloodActors[pPlayer->pSprite->index];
auto spawned = actSpawnDude(pactor, kDudeHand, pPlayer->pSprite->clipdist<<1, 0);
spritetype* pSprite2 = &spawned->s();
pSprite2->ang = (pPlayer->pSprite->ang+1024)&2047; pSprite2->ang = (pPlayer->pSprite->ang+1024)&2047;
int nSprite = pPlayer->pSprite->index; int nSprite = pPlayer->pSprite->index;
int x = CosScale16(pPlayer->pSprite->ang); int x = CosScale16(pPlayer->pSprite->ang);

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

@ -456,8 +456,10 @@ void OperateSprite(int nSprite, XSPRITE *pXSprite, EVENT event)
break; break;
case kMarkerDudeSpawn: case kMarkerDudeSpawn:
if (gGameOptions.nMonsterSettings && pXSprite->data1 >= kDudeBase && pXSprite->data1 < kDudeMax) { if (gGameOptions.nMonsterSettings && pXSprite->data1 >= kDudeBase && pXSprite->data1 < kDudeMax)
spritetype* pSpawn = actSpawnDude(pSprite, pXSprite->data1, -1, 0); {
auto actor = &bloodActors[pSprite->index];
spritetype* pSpawn = &actSpawnDude(actor, pXSprite->data1, -1, 0)->s();
if (pSpawn) { if (pSpawn) {
XSPRITE *pXSpawn = &xsprite[pSpawn->extra]; XSPRITE *pXSpawn = &xsprite[pSpawn->extra];
gKillMgr.AddNewKill(1); gKillMgr.AddNewKill(1);