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

- fixed compilation.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-16 00:31:28 +02:00
parent 1839634d79
commit 3419d6a901
3 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/games/exhumed/src/aistuff.h
View file

@ -241,6 +241,8 @@ int MoveCreature(short nSprite);
int MoveCreatureWithCaution(int nSprite); int MoveCreatureWithCaution(int nSprite);
void WheresMyMouth(int nPlayer, int *x, int *y, int *z, short *sectnum); void WheresMyMouth(int nPlayer, int *x, int *y, int *z, short *sectnum);
int GetSpriteHeight(int nSprite); int GetSpriteHeight(int nSprite);
int GetActorHeight(DExhumedActor* nSprite);
DExhumedActor* insertActor(int, int);
DExhumedActor* GrabBody(); DExhumedActor* GrabBody();
DExhumedActor* GrabBodyGunSprite(); DExhumedActor* GrabBodyGunSprite();
void CreatePushBlock(int nSector); void CreatePushBlock(int nSector);

28
source/games/exhumed/src/move.cpp
View file

@ -521,6 +521,18 @@ int GetSpriteHeight(int nSprite)
return tileHeight(pSprite->picnum) * pSprite->yrepeat * 4; return tileHeight(pSprite->picnum) * pSprite->yrepeat * 4;
} }
int GetActorHeight(DExhumedActor* actor)
{
return tileHeight(actor->s().picnum) * actor->s().yrepeat * 4;
}
DExhumedActor* insertActor(int sect, int stat)
{
int ndx = insertsprite(sect, stat);
return ndx >= 0 ? &exhumedActors[ndx] : nullptr;
}
int movesprite(short nSprite, int dx, int dy, int dz, int, int flordist, unsigned int clipmask) int movesprite(short nSprite, int dx, int dy, int dz, int, int flordist, unsigned int clipmask)
{ {
spritetype *pSprite = &sprite[nSprite]; spritetype *pSprite = &sprite[nSprite];
@ -1308,7 +1320,7 @@ void WheresMyMouth(int nPlayer, int *x, int *y, int *z, short *sectnum)
*x = pSprite->x; *x = pSprite->x;
*y = pSprite->y; *y = pSprite->y;
int height = GetSpriteHeight(pActor) / 2; int height = GetActorHeight(pActor) / 2;
*z = pSprite->z - height; *z = pSprite->z - height;
*sectnum = pSprite->sectnum; *sectnum = pSprite->sectnum;
@ -1433,12 +1445,12 @@ int BuildCreatureChunk(int nVal, int nPic)
{ {
int var_14; int var_14;
int nSprite = GrabChunkSprite(); auto actor = GrabChunkSprite();
if (nSprite == -1) { if (actor == nullptr) {
return -1; return -1;
} }
auto pSprite = &sprite[nSprite]; auto pSprite = &actor->s();
if (nVal & 0x4000) if (nVal & 0x4000)
{ {
@ -1456,7 +1468,7 @@ int BuildCreatureChunk(int nVal, int nPic)
pSprite->y = sprite[nVal].y; pSprite->y = sprite[nVal].y;
pSprite->z = sprite[nVal].z; pSprite->z = sprite[nVal].z;
mychangespritesect(nSprite, sprite[nVal].sectnum); mychangespritesect(actor->GetSpriteIndex(), sprite[nVal].sectnum);
pSprite->cstat = 0x80; pSprite->cstat = 0x80;
pSprite->shade = -12; pSprite->shade = -12;
@ -1484,10 +1496,10 @@ int BuildCreatureChunk(int nVal, int nPic)
// GrabTimeSlot(3); // GrabTimeSlot(3);
pSprite->extra = -1; pSprite->extra = -1;
pSprite->owner = runlist_AddRunRec(pSprite->lotag - 1, nSprite, 0xD0000); pSprite->owner = runlist_AddRunRec(pSprite->lotag - 1, actor->GetSpriteIndex(), 0xD0000);
pSprite->hitag = runlist_AddRunRec(NewRun, nSprite, 0xD0000); pSprite->hitag = runlist_AddRunRec(NewRun, actor->GetSpriteIndex(), 0xD0000);
return nSprite | 0xD0000; return actor->GetSpriteIndex();
} }
void AICreatureChunk::Tick(RunListEvent* ev) void AICreatureChunk::Tick(RunListEvent* ev)

5
source/games/exhumed/src/player.cpp
View file

@ -279,8 +279,9 @@ void RestartPlayer(short nPlayer)
} }
} }
nSprite = GrabBody(); auto actor = GrabBody();
nSpr = &sprite[nSprite]; nSprite = actor->GetSpriteIndex();
nSpr = &actor->s();
mychangespritesect(nSprite, sPlayerSave[nPlayer].nSector); mychangespritesect(nSprite, sPlayerSave[nPlayer].nSector);
changespritestat(nSprite, 100); changespritestat(nSprite, 100);