zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified parts of useSeqSpawnerGen.

Browse source 
Also fixing a sprite size bug in here.
This commit is contained in:
Christoph Oelckers 2022-08-30 21:00:30 +02:00
parent 5fba68ffe1
commit decaff78dc
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3348,7 +3348,7 @@ void useEffectGen(DBloodActor* sourceactor, DBloodActor* actor)
pos = bottom;
break;
case 2: // middle
pos = actor->spr.pos.Z + (tileHeight(actor->spr.picnum) / 2 + tileTopOffset(actor->spr.picnum));
pos = actor->spr.pos.Z + (tileHeight(actor->spr.picnum) / 2 + tileTopOffset(actor->spr.picnum)) * actor->spr.yrepeat * REPEAT_SCALE;
break;
case 3:
case 4:
@ -3774,14 +3774,12 @@ void useSeqSpawnerGen(DBloodActor* sourceactor, int objType, sectortype* pSector
auto spawned = InsertSprite(iactor->sector(), kStatDecoration);
if (spawned != nullptr)
{
int top, bottom; GetActorExtents(spawned, &top, &bottom);
vec3_t pos;
pos.X = iactor->int_pos().X;
pos.Y = iactor->int_pos().Y;
double top, bottom;
GetActorExtents(spawned, &top, &bottom);
DVector3 pos = iactor->spr.pos;
switch (sourceactor->xspr.data3)
{
default:
pos.Z = iactor->int_pos().Z;
break;
case 2:
pos.Z = bottom;
@ -3790,7 +3788,8 @@ void useSeqSpawnerGen(DBloodActor* sourceactor, int objType, sectortype* pSector
pos.Z = top;
break;
case 4:
pos.Z = iactor->int_pos().Z + tileHeight(iactor->spr.picnum) / 2 + tileTopOffset(iactor->spr.picnum);
// this had no value shift and no yrepeat handling, which looks like a bug.
pos.Z += (tileHeight(iactor->spr.picnum) / 2 + tileTopOffset(iactor->spr.picnum)) * iactor->spr.yrepeat * REPEAT_SCALE;
break;
case 5:
case 6:
@ -3801,7 +3800,7 @@ void useSeqSpawnerGen(DBloodActor* sourceactor, int objType, sectortype* pSector
break;
}
spawned->set_int_pos(pos);
spawned->spr.pos = pos;
spawned->addX();
seqSpawn(sourceactor->xspr.data2, spawned, -1);