zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-03 14:30:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Replace CraneDef polex with pole.X calls.

Browse source
This commit is contained in:
Mitchell Richters 2021-12-30 22:30:47 +11:00
parent 4b1fbf13df
commit 034727d902
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -648,8 +648,8 @@ void movecrane(DDukeActor *actor, int crane)
case STAT_ZOMBIEACTOR:
case STAT_STANDABLE:
case STAT_PLAYER:
actor->spr.ang = getangle(cpt.polex - actor->spr.pos.X, cpt.poley - actor->spr.pos.Y);
SetActor(a2, { cpt.polex, cpt.poley, a2->spr.pos.Z });
actor->spr.ang = getangle(cpt.pole.X - actor->spr.pos.X, cpt.poley - actor->spr.pos.Y);
SetActor(a2, { cpt.pole.X, cpt.poley, a2->spr.pos.Z });
actor->temp_data[0]++;
return;
}

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

@ -70,7 +70,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, CraneDef& w, Crane
arc("x", w.pos.X)
("y", w.pos.Y)
("z", w.pos.Z)
("polex", w.polex)
("polex", w.pole.X)
("poley", w.poley)
("pole", w.poleactor)
.EndObject();

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

@ -499,7 +499,7 @@ void initcrane(DDukeActor* actj, DDukeActor* act, int CRANEPOLE)
actk->spr.xrepeat = 48;
actk->spr.yrepeat = 128;
apt.polex = actk->spr.pos.X;
apt.pole.X = actk->spr.pos.X;
apt.poley = actk->spr.pos.Y;
actk->spr.pos = act->spr.pos;

3
source/games/duke/src/types.h
View file

@ -164,7 +164,8 @@ struct player_orig
struct CraneDef
{
vec3_t pos;
int polex, poley;
vec2_t pole;
int pole.X, poley;
TObjPtr<DDukeActor*> poleactor;
};