teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-07 16:31:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Replace CraneDef x with pos.X calls.

Browse source
This commit is contained in:
Mitchell Richters 2021-12-30 22:27:34 +11:00
parent 788be33c1a
commit 8006d8e394
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

@ -757,9 +757,9 @@ void movecrane(DDukeActor *actor, int crane)
{ {
if (actor->spr.xvel < 192) if (actor->spr.xvel < 192)
actor->spr.xvel += 8; actor->spr.xvel += 8;
actor->spr.ang = getangle(cpt.x - actor->spr.pos.X, cpt.y - actor->spr.pos.Y); actor->spr.ang = getangle(cpt.pos.X - actor->spr.pos.X, cpt.y - actor->spr.pos.Y);
ssp(actor, CLIPMASK0); ssp(actor, CLIPMASK0);
if (((actor->spr.pos.X - cpt.x) * (actor->spr.pos.X - cpt.x) + (actor->spr.pos.Y - cpt.y) * (actor->spr.pos.Y - cpt.y)) < (128 * 128)) if (((actor->spr.pos.X - cpt.pos.X) * (actor->spr.pos.X - cpt.pos.X) + (actor->spr.pos.Y - cpt.y) * (actor->spr.pos.Y - cpt.y)) < (128 * 128))
actor->temp_data[0]++; actor->temp_data[0]++;
} }

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

@ -67,7 +67,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, CraneDef& w, Crane
{ {
if (arc.BeginObject(keyname)) if (arc.BeginObject(keyname))
{ {
arc("x", w.x) arc("x", w.pos.X)
("y", w.y) ("y", w.y)
("z", w.z) ("z", w.z)
("polex", w.polex) ("polex", w.polex)

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

@ -482,7 +482,7 @@ void initcrane(DDukeActor* actj, DDukeActor* act, int CRANEPOLE)
act->temp_data[4] = cranes.Reserve(1); act->temp_data[4] = cranes.Reserve(1);
auto& apt = cranes[act->temp_data[4]]; auto& apt = cranes[act->temp_data[4]];
apt.x = act->spr.pos.X; apt.pos.X = act->spr.pos.X;
apt.y = act->spr.pos.Y; apt.y = act->spr.pos.Y;
apt.z = act->spr.pos.Z; apt.z = act->spr.pos.Z;
apt.poleactor = nullptr; apt.poleactor = nullptr;

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

@ -163,7 +163,8 @@ struct player_orig
struct CraneDef struct CraneDef
{ {
int x, y, z; vec3_t pos;
int y, z;
int polex, poley; int polex, poley;
TObjPtr<DDukeActor*> poleactor; TObjPtr<DDukeActor*> poleactor;
}; };