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

- elininated the actSpawnThing wrapper.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-26 22:51:36 +02:00
parent f7fe24b19e
commit 6c98a07a60
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -236,11 +236,6 @@ DBloodActor* actSpawnDude(DBloodActor* pSource, int nType, double dist);
DBloodActor * actSpawnSprite(DBloodActor *pSource, int nStat);
DBloodActor* actSpawnThing(sectortype* pSector, const DVector3& pos, int nThingType);
inline DBloodActor* actSpawnThing(sectortype* pSector, int x, int y, int z, int nThingType)
{
return actSpawnThing(pSector, DVector3(x * inttoworld, y * inttoworld, z * zinttoworld), nThingType);
}
inline DBloodActor* actFireThing(DBloodActor* actor, double xyoff, double zoff, double zvel, int thingType, double nSpeed);
inline DBloodActor* actFireThing(DBloodActor* actor, int xyoff_, int zoff_, int zvel_, int thingType, int nSpeed_)
{

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

@ -366,7 +366,7 @@ void GibThing(DBloodActor* actor, GIBTHING* pGThing, DVector3* pPos, DVector3* p
getzsofslopeptr(pSector, gPos, &ceilZ, &floorZ);
double dz1 = floorZ - gPos.Z;
double dz2 = gPos.Z - ceilZ;
auto gibactor = actSpawnThing(pSector, gPos.X * worldtoint, gPos.Y * worldtoint, gPos.Z * zworldtoint, pGThing->type);
auto gibactor = actSpawnThing(pSector, gPos, pGThing->type);
if (!gibactor) return;
if (pGThing->Kills > -1)

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

@ -2498,9 +2498,9 @@ void ActivateGenerator(DBloodActor* actor)
switch (actor->spr.type) {
case kGenDripWater:
case kGenDripBlood: {
int top, bottom;
double top, bottom;
GetActorExtents(actor, &top, &bottom);
actSpawnThing(actor->sector(), actor->int_pos().X, actor->int_pos().Y, bottom, (actor->spr.type == kGenDripWater) ? kThingDripWater : kThingDripBlood);
actSpawnThing(actor->sector(), DVector3(actor->spr.pos.XY(), bottom), (actor->spr.type == kGenDripWater) ? kThingDripWater : kThingDripBlood);
break;
}
case kGenSound: