teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- int_change is gone

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-31 00:49:16 +02:00
parent 4b25400e40
commit 9717082759
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/games/sw/src/game.h
View file

@ -943,7 +943,6 @@ struct USER
memset(&WallP, 0, sizeof(USER) - myoffsetof(USER, WallP));
}
vec3_t int_change() const { return { int(change.X * worldtoint), int(change.Y * worldtoint), int(change.Z * zworldtoint) }; }
void set_int_change_x(int x) { change.X = x * inttoworld; }
void set_int_change_y(int x) { change.Y = x * inttoworld; }
void set_int_change_z(int x) { change.Z = x * zinttoworld; }

8
source/games/sw/src/weapon.cpp
View file

@ -8400,9 +8400,9 @@ int DoVulcanBoulder(DSWActor* actor)
actor->user.coll = move_missile(actor, actor->user.change, actor->user.ceiling_dist, actor->user.floor_dist, CLIPMASK_MISSILE, MISSILEMOVETICS);
int32_t const vel = ksqrt(SQ(actor->user.int_change().X) + SQ(actor->user.int_change().Y));
auto velsq = actor->user.change.XY().LengthSquared();
if (vel < 30)
if (velsq < 1.875 * 1.875)
{
SpawnLittleExp(actor);
KillActor(actor);
@ -12548,10 +12548,8 @@ int InitStar(PLAYER* pp)
}
// move the same as middle star
zvel = actorNew->user.int_change().Z;
actorNew2->user.change.Z = actorNew->user.change.Z;
UpdateChangeXY(actorNew2);
actorNew2->user.set_int_change_z(zvel);
actorNew2->backuppos();
}