mirror of
https://github.com/ZDoom/Raze.git
synced 2025-02-22 03:21:07 +00:00
- Duke: Replace CraneDef
poley
with pole.Y
calls.
This commit is contained in:
parent
034727d902
commit
19a9fc462f
4 changed files with 4 additions and 5 deletions
|
@ -648,8 +648,8 @@ void movecrane(DDukeActor *actor, int crane)
|
||||||
case STAT_ZOMBIEACTOR:
|
case STAT_ZOMBIEACTOR:
|
||||||
case STAT_STANDABLE:
|
case STAT_STANDABLE:
|
||||||
case STAT_PLAYER:
|
case STAT_PLAYER:
|
||||||
actor->spr.ang = getangle(cpt.pole.X - actor->spr.pos.X, cpt.poley - actor->spr.pos.Y);
|
actor->spr.ang = getangle(cpt.pole.X - actor->spr.pos.X, cpt.pole.Y - actor->spr.pos.Y);
|
||||||
SetActor(a2, { cpt.pole.X, cpt.poley, a2->spr.pos.Z });
|
SetActor(a2, { cpt.pole.X, cpt.pole.Y, a2->spr.pos.Z });
|
||||||
actor->temp_data[0]++;
|
actor->temp_data[0]++;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,7 +71,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, CraneDef& w, Crane
|
||||||
("y", w.pos.Y)
|
("y", w.pos.Y)
|
||||||
("z", w.pos.Z)
|
("z", w.pos.Z)
|
||||||
("polex", w.pole.X)
|
("polex", w.pole.X)
|
||||||
("poley", w.poley)
|
("poley", w.pole.Y)
|
||||||
("pole", w.poleactor)
|
("pole", w.poleactor)
|
||||||
.EndObject();
|
.EndObject();
|
||||||
}
|
}
|
||||||
|
|
|
@ -500,7 +500,7 @@ void initcrane(DDukeActor* actj, DDukeActor* act, int CRANEPOLE)
|
||||||
actk->spr.yrepeat = 128;
|
actk->spr.yrepeat = 128;
|
||||||
|
|
||||||
apt.pole.X = actk->spr.pos.X;
|
apt.pole.X = actk->spr.pos.X;
|
||||||
apt.poley = actk->spr.pos.Y;
|
apt.pole.Y = actk->spr.pos.Y;
|
||||||
|
|
||||||
actk->spr.pos = act->spr.pos;
|
actk->spr.pos = act->spr.pos;
|
||||||
actk->spr.shade = act->spr.shade;
|
actk->spr.shade = act->spr.shade;
|
||||||
|
|
|
@ -165,7 +165,6 @@ struct CraneDef
|
||||||
{
|
{
|
||||||
vec3_t pos;
|
vec3_t pos;
|
||||||
vec2_t pole;
|
vec2_t pole;
|
||||||
int pole.X, poley;
|
|
||||||
TObjPtr<DDukeActor*> poleactor;
|
TObjPtr<DDukeActor*> poleactor;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue