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

- a bit more lightening on change

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-31 00:42:08 +02:00
parent 10e08556c1
commit 420636f7ee
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -940,6 +940,7 @@ struct USER
int int_ceiling_dist() const { return ceiling_dist * zworldtoint; } int int_ceiling_dist() const { return ceiling_dist * zworldtoint; }
int int_floor_dist() const { return floor_dist * zworldtoint; } int int_floor_dist() const { return floor_dist * zworldtoint; }
vec3_t int_change() const { return change; }
// frequently repeated patterns // frequently repeated patterns
void clearChange() { change.X = change.Y = change.Z = 0; } void clearChange() { change.X = change.Y = change.Z = 0; }

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

@ -7778,6 +7778,11 @@ int ComboMissileSeek(DSWActor* actor, int16_t delay_tics, int16_t aware_range/*,
return 0; return 0;
} }
void SetAngleFromChange(DSWActor* actor)
{
actor->spr.angle = VecToAngle(actor->user.change.X, actor->user.change.Y);
}
// completely vector manipulation // completely vector manipulation
int VectorMissileSeek(DSWActor* actor, int16_t delay_tics, int16_t turn_speed, int16_t aware_range1, int16_t aware_range2) int VectorMissileSeek(DSWActor* actor, int16_t delay_tics, int16_t turn_speed, int16_t aware_range1, int16_t aware_range2)
{ {
@ -7849,7 +7854,7 @@ int VectorMissileSeek(DSWActor* actor, int16_t delay_tics, int16_t turn_speed, i
actor->user.change.Y = (actor->user.change.Y + oy*(turn_speed-1))/turn_speed; actor->user.change.Y = (actor->user.change.Y + oy*(turn_speed-1))/turn_speed;
actor->user.change.Z = (actor->user.change.Z + oz*(turn_speed-1))/turn_speed; actor->user.change.Z = (actor->user.change.Z + oz*(turn_speed-1))/turn_speed;
actor->spr.angle = VecToAngle(actor->user.change.X, actor->user.change.Y); SetAngleFromChange(actor);
} }
return 0; return 0;
@ -7905,7 +7910,7 @@ int VectorWormSeek(DSWActor* actor, int16_t delay_tics, int16_t aware_range1, in
actor->user.change.Y = (actor->user.change.Y + oy*7)/8; actor->user.change.Y = (actor->user.change.Y + oy*7)/8;
actor->user.change.Z = (actor->user.change.Z + oz*7)/8; actor->user.change.Z = (actor->user.change.Z + oz*7)/8;
actor->spr.angle = VecToAngle(actor->user.change.X, actor->user.change.Y); SetAngleFromChange(actor);
} }
return 0; return 0;
@ -8117,7 +8122,7 @@ void WallBounce(DSWActor* actor, short ang)
actor->user.change.Y = DMulScale(dax, k, -day, l, 14); actor->user.change.Y = DMulScale(dax, k, -day, l, 14);
old_ang = actor->int_ang(); old_ang = actor->int_ang();
actor->spr.angle = VecToAngle(actor->user.change.X, actor->user.change.Y); SetAngleFromChange(actor);
// hack to prevent missile from sticking to a wall // hack to prevent missile from sticking to a wall
// //
@ -8125,7 +8130,7 @@ void WallBounce(DSWActor* actor, short ang)
{ {
actor->user.change.X = -actor->user.change.X; actor->user.change.X = -actor->user.change.X;
actor->user.change.Y = -actor->user.change.Y; actor->user.change.Y = -actor->user.change.Y;
actor->spr.angle = VecToAngle(actor->user.change.X, actor->user.change.Y); SetAngleFromChange(actor);
} }
} }
@ -8190,7 +8195,7 @@ bool SlopeBounce(DSWActor* actor, bool *hit_wall)
actor->user.change.Y -= MulScale(day, k, 16); actor->user.change.Y -= MulScale(day, k, 16);
actor->user.change.Z -= MulScale(daz, k, 12); actor->user.change.Z -= MulScale(daz, k, 12);
actor->spr.angle = VecToAngle(actor->user.change.X, actor->user.change.Y); SetAngleFromChange(actor);
} }
return true; return true;