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

- spawn coordinate in guts

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-13 01:02:13 +02:00
parent 6bd97e312d
commit dafc1ff2d2
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/games/duke/src/actors_d.cpp
View file

@ -537,7 +537,6 @@ void lotsofpaper_d(DDukeActor *actor, int n)
void guts_d(DDukeActor* actor, int gtype, int n, int p) void guts_d(DDukeActor* actor, int gtype, int n, int p)
{ {
int gutz, floorz;
int j; int j;
int sx, sy; int sx, sy;
uint8_t pal; uint8_t pal;
@ -546,13 +545,13 @@ void guts_d(DDukeActor* actor, int gtype, int n, int p)
sx = sy = 8; sx = sy = 8;
else sx = sy = 32; else sx = sy = 32;
gutz = actor->int_pos().Z - (8 << 8); double gutz = actor->spr.pos.Z - 8;
floorz = getflorzofslopeptr(actor->sector(), actor->spr.pos); double floorz = getflorzofslopeptrf(actor->sector(), actor->spr.pos);
if (gutz > (floorz - (8 << 8))) if (gutz > floorz - 8)
gutz = floorz - (8 << 8); gutz = floorz - 8;
gutz += gs.actorinfo[actor->spr.picnum].gutsoffset * 256; gutz += gs.actorinfo[actor->spr.picnum].gutsoffset;
if (badguy(actor) && actor->spr.pal == 6) if (badguy(actor) && actor->spr.pal == 6)
pal = 6; pal = 6;
@ -567,11 +566,12 @@ void guts_d(DDukeActor* actor, int gtype, int n, int p)
int a = krand() & 2047; int a = krand() & 2047;
int r1 = krand(); int r1 = krand();
int r2 = krand(); int r2 = krand();
int r3 = krand(); DVector3 offs;
int r4 = krand(); offs.Z = gutz - krandf(16);
int r5 = krand(); offs.Y = krandf(16) - 8;
offs.X = krandf(16) - 8;
// TRANSITIONAL: owned by a player??? // TRANSITIONAL: owned by a player???
auto spawned = EGS(actor->sector(), actor->int_pos().X + (r5 & 255) - 128, actor->int_pos().Y + (r4 & 255) - 128, gutz - (r3 & 8191), gtype, -32, sx, sy, a, 48 + (r2 & 31), -512 - (r1 & 2047), ps[p].GetActor(), 5); auto spawned = CreateActor(actor->sector(), offs + actor->spr.pos.XY(), gtype, -32, sx, sy, a, 48 + (r2 & 31), -512 - (r1 & 2047), ps[p].GetActor(), 5);
if (spawned) if (spawned)
{ {
if (spawned->spr.picnum == JIBS2) if (spawned->spr.picnum == JIBS2)

24
source/games/duke/src/actors_r.cpp
View file

@ -444,22 +444,21 @@ void lotsoffeathers_r(DDukeActor *actor, int n)
void guts_r(DDukeActor* actor, int gtype, int n, int p) void guts_r(DDukeActor* actor, int gtype, int n, int p)
{ {
int gutz, floorz;
int j; int j;
int sx, sy; int sx, sy;
uint8_t pal; uint8_t pal;
if (badguy(actor) && actor->spr.xrepeat < 16) if (badguy(actor) && actor->spr.xrepeat < 16)
sx = sy = 8; sx = sy = 4;
else sx = sy = 32; else sx = sy = 16;
gutz = actor->int_pos().Z - (8 << 8); double gutz = actor->spr.pos.Z - 8;
floorz = getflorzofslopeptr(actor->sector(), actor->spr.pos); double floorz = getflorzofslopeptrf(actor->sector(), actor->spr.pos);
if (gutz > (floorz - (8 << 8))) if (gutz > floorz - 8)
gutz = floorz - (8 << 8); gutz = floorz - 8;
gutz += gs.actorinfo[actor->spr.picnum].gutsoffset * 256; gutz += gs.actorinfo[actor->spr.picnum].gutsoffset;
if (badguy(actor) && actor->spr.pal == 6) if (badguy(actor) && actor->spr.pal == 6)
pal = 6; pal = 6;
@ -478,11 +477,12 @@ void guts_r(DDukeActor* actor, int gtype, int n, int p)
int a = krand() & 2047; int a = krand() & 2047;
int r1 = krand(); int r1 = krand();
int r2 = krand(); int r2 = krand();
int r3 = krand(); DVector3 offs;
int r4 = krand(); offs.Z = gutz - krandf(16);
int r5 = krand(); offs.Y = krandf(16) - 8;
offs.X = krandf(16) - 8;
// TRANSITIONAL: owned by a player??? // TRANSITIONAL: owned by a player???
auto spawned = EGS(actor->sector(), actor->int_pos().X + (r5 & 255) - 128, actor->int_pos().Y + (r4 & 255) - 128, gutz - (r3 & 8191), gtype, -32, sx >> 1, sy >> 1, a, 48 + (r2 & 31), -512 - (r1 & 2047), ps[p].GetActor(), 5); auto spawned = CreateActor(actor->sector(), offs + actor->spr.pos.XY(), gtype, -32, sx, sy, a, 48 + (r2 & 31), -512 - (r1 & 2047), ps[p].GetActor(), 5);
if (spawned && pal != 0) if (spawned && pal != 0)
spawned->spr.pal = pal; spawned->spr.pal = pal;
} }