zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-07 08:22:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- movetripbomb and movecrack

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-13 20:11:45 +02:00
parent facedb6325
commit 3e511f33b8
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -901,7 +901,7 @@ static void movetripbomb(DDukeActor *actor)
{
SetActor(spawned, spawned->spr.pos);
spawned->spr.hitag = actor->spr.hitag;
spawned->temp_data[1] = spawned->int_pos().Z;
spawned->temp_pos.Z = spawned->spr.pos.Z; // doesn't look to be used anywhere...
if (x < 64)
{
@ -970,7 +970,7 @@ static void movecrack(DDukeActor* actor)
if (actor->spr.hitag > 0)
{
actor->temp_data[0] = actor->spr.cstat;
actor->temp_data[1] = actor->int_ang();
actor->temp_angle = actor->spr.angle;
int j = fi.ifhitbyweapon(actor);
if (gs.actorinfo[j].flags2 & SFLAG2_EXPLOSIVE)
{
@ -986,7 +986,7 @@ static void movecrack(DDukeActor* actor)
else
{
actor->spr.cstat = ESpriteFlags::FromInt(actor->temp_data[0]);
actor->set_int_ang(actor->temp_data[1]);
actor->spr.angle = actor->temp_angle;
actor->spr.extra = 0;
}
}

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

@ -723,7 +723,7 @@ static void movecrack(DDukeActor* actor)
if (actor->spr.hitag > 0)
{
actor->temp_data[0] = actor->spr.cstat;
actor->temp_data[1] = actor->int_ang();
actor->temp_angle = actor->spr.angle;
int j = fi.ifhitbyweapon(actor);
if (gs.actorinfo[j].flags2 & SFLAG2_EXPLOSIVE)
{
@ -739,7 +739,7 @@ static void movecrack(DDukeActor* actor)
else
{
actor->spr.cstat = ESpriteFlags::FromInt(actor->temp_data[0]);
actor->set_int_ang(actor->temp_data[1]);
actor->spr.angle = actor->temp_angle;
actor->spr.extra = 0;
}
}

2
source/games/duke/src/animatesprites_d.cpp
View file

@ -611,7 +611,7 @@ void animatesprites_d(tspriteArray& tsprites, int x, int y, int a, double interp
case LASERLINE:
if (!OwnerAc) break;
if (t->sectp->lotag == 2) t->pal = 8;
t->set_int_z(OwnerAc->int_pos().Z - (3 << 8));
t->pos.Z = OwnerAc->spr.pos.Z - 3;
if (gs.lasermode == 2 && ps[screenpeek].heat_on == 0)
t->yrepeat = 0;
t->shade = -127;