teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 21:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use float_zvel in a few places.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-01 00:53:38 +02:00
parent 999cd16b24
commit bd520e63dd
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4235,7 +4235,7 @@ void handle_se22(DDukeActor* actor)
void handle_se26(DDukeActor* actor) void handle_se26(DDukeActor* actor)
{ {
auto sc = actor->sector(); auto sc = actor->sector();
double zvel = actor->int_zvel() * zinttoworld; double zvel = actor->float_zvel();
actor->spr.xvel = 32; actor->spr.xvel = 32;
DVector2 vect = 2 * actor->spr.angle.ToVector(); // was: (32 * bsin) >> 14 DVector2 vect = 2 * actor->spr.angle.ToVector(); // was: (32 * bsin) >> 14

2
source/games/sw/src/skull.cpp
View file

@ -253,7 +253,7 @@ int SetupSkull(DSWActor* actor)
int DoSkullMove(DSWActor* actor) int DoSkullMove(DSWActor* actor)
{ {
auto vect = MOVExy(actor->spr.xvel, actor->spr.angle); auto vect = MOVExy(actor->spr.xvel, actor->spr.angle);
double daz = actor->int_zvel() * zinttoworld; double daz = actor->float_zvel();
actor->user.coll = move_missile(actor, DVector3(vect, daz), 16, 16, CLIPMASK_MISSILE, ACTORMOVETICS); actor->user.coll = move_missile(actor, DVector3(vect, daz), 16, 16, CLIPMASK_MISSILE, ACTORMOVETICS);

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

@ -7921,7 +7921,7 @@ int DoPlasma(DSWActor* actor)
DoBlurExtend(actor, 0, 4); DoBlurExtend(actor, 0, 4);
auto vec = MOVExy(actor->spr.xvel, actor->spr.angle); auto vec = MOVExy(actor->spr.xvel, actor->spr.angle);
double daz = actor->int_zvel() * zinttoworld; double daz = actor->float_zvel();
actor->user.coll = move_missile(actor, DVector3(vec, daz), 16, 16, CLIPMASK_MISSILE, MISSILEMOVETICS); actor->user.coll = move_missile(actor, DVector3(vec, daz), 16, 16, CLIPMASK_MISSILE, MISSILEMOVETICS);
@ -8850,7 +8850,7 @@ int DoBoltThinMan(DSWActor* actor)
DoBlurExtend(actor, 0, 4); DoBlurExtend(actor, 0, 4);
auto vec = MOVExy(actor->spr.xvel, actor->spr.angle); auto vec = MOVExy(actor->spr.xvel, actor->spr.angle);
double daz = actor->int_zvel() * zinttoworld; double daz = actor->float_zvel();
actor->user.coll = move_missile(actor, DVector3(vec, daz), CEILING_DIST, FLOOR_DIST, CLIPMASK_MISSILE, MISSILEMOVETICS); actor->user.coll = move_missile(actor, DVector3(vec, daz), CEILING_DIST, FLOOR_DIST, CLIPMASK_MISSILE, MISSILEMOVETICS);
@ -9422,7 +9422,7 @@ int DoBoltSeeker(DSWActor* actor)
DoBlurExtend(actor, 0, 4); DoBlurExtend(actor, 0, 4);
auto vec = MOVExy(actor->spr.xvel, actor->spr.angle); auto vec = MOVExy(actor->spr.xvel, actor->spr.angle);
double daz = actor->int_zvel() * zinttoworld; double daz = actor->float_zvel();
actor->user.coll = move_missile(actor, DVector3(vec, daz), CEILING_DIST, FLOOR_DIST, CLIPMASK_MISSILE, MISSILEMOVETICS); actor->user.coll = move_missile(actor, DVector3(vec, daz), CEILING_DIST, FLOOR_DIST, CLIPMASK_MISSILE, MISSILEMOVETICS);
@ -9461,7 +9461,7 @@ int DoElectro(DSWActor* actor)
MissileSeek(actor, 30, 512/*, 3, 52, 2*/); MissileSeek(actor, 30, 512/*, 3, 52, 2*/);
auto vec = MOVExy(actor->spr.xvel, actor->spr.angle); auto vec = MOVExy(actor->spr.xvel, actor->spr.angle);
double daz = actor->int_zvel() * zinttoworld; double daz = actor->float_zvel();
actor->user.coll = move_missile(actor, DVector3(vec, daz), CEILING_DIST, FLOOR_DIST, CLIPMASK_MISSILE, MISSILEMOVETICS); actor->user.coll = move_missile(actor, DVector3(vec, daz), CEILING_DIST, FLOOR_DIST, CLIPMASK_MISSILE, MISSILEMOVETICS);
@ -11103,7 +11103,7 @@ int DoSerpRing(DSWActor* actor)
return 0; return 0;
} }
double zz = actor->int_pos().Z + actor->int_zvel() * zinttoworld; double zz = actor->int_pos().Z + actor->float_zvel();
if (zz > own->spr.pos.Z - actor->user.pos.Z) if (zz > own->spr.pos.Z - actor->user.pos.Z)
zz = own->spr.pos.Z - actor->user.pos.Z; zz = own->spr.pos.Z - actor->user.pos.Z;