zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-07 07:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

- binaryangle.h: Change binangle bitshift operators to operate on signed value to properly handle angles > 1024.

Browse source
This commit is contained in:
Mitch Richters 2021-11-01 22:13:39 +11:00
parent a1570c185f
commit eb8b075727
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/core/binaryangle.h
View file

@ -183,24 +183,24 @@ public:
constexpr binangle &operator<<= (const uint8_t shift) constexpr binangle &operator<<= (const uint8_t shift)
{ {
value <<= shift; value = tosigned() << shift;
return *this; return *this;
} }
constexpr binangle &operator>>= (const uint8_t shift) constexpr binangle &operator>>= (const uint8_t shift)
{ {
value >>= shift; value = tosigned() >> shift;
return *this; return *this;
} }
constexpr binangle operator<< (const uint8_t shift) const constexpr binangle operator<< (const uint8_t shift) const
{ {
return binangle(value << shift); return binangle(tosigned() << shift);
} }
constexpr binangle operator>> (const uint8_t shift) const constexpr binangle operator>> (const uint8_t shift) const
{ {
return binangle(value >> shift); return binangle(tosigned() >> shift);
} }
}; };

4
source/core/gameinput.cpp
View file

@ -331,7 +331,7 @@ void PlayerAngle::applyinput(float const avel, ESyncBits* actions, double const
if (*actions & SB_LOOK_LEFT) if (*actions & SB_LOOK_LEFT)
{ {
// start looking left // start looking left
look_ang += buildfang(scaleAdjust * -(4560. / GameTicRate)); look_ang -= buildfang(scaleAdjust * (4560. / GameTicRate));
rotscrnang += buildfang(scaleAdjust * (720. / GameTicRate)); rotscrnang += buildfang(scaleAdjust * (720. / GameTicRate));
} }
@ -339,7 +339,7 @@ void PlayerAngle::applyinput(float const avel, ESyncBits* actions, double const
{ {
// start looking right // start looking right
look_ang += buildfang(scaleAdjust * (4560. / GameTicRate)); look_ang += buildfang(scaleAdjust * (4560. / GameTicRate));
rotscrnang += buildfang(scaleAdjust * -(720. / GameTicRate)); rotscrnang -= buildfang(scaleAdjust * (720. / GameTicRate));
} }
if (!movementlocked()) if (!movementlocked())

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

@ -459,7 +459,7 @@ void moveplayers(void)
if (p->actorsqu != nullptr) if (p->actorsqu != nullptr)
{ {
p->angle.addadjustment(getincanglebam(p->angle.ang, bvectangbam(p->actorsqu->s->x - p->pos.x, p->actorsqu->s->y - p->pos.y)).signedbuild() >> 2); p->angle.addadjustment(getincanglebam(p->angle.ang, bvectangbam(p->actorsqu->s->x - p->pos.x, p->actorsqu->s->y - p->pos.y)) >> 2);
} }
if (spri->extra > 0) if (spri->extra > 0)
@ -482,7 +482,7 @@ void moveplayers(void)
if (p->wackedbyactor != nullptr && p->wackedbyactor->s->statnum < MAXSTATUS) if (p->wackedbyactor != nullptr && p->wackedbyactor->s->statnum < MAXSTATUS)
{ {
p->angle.addadjustment(getincanglebam(p->angle.ang, bvectangbam(p->wackedbyactor->s->x - p->pos.x, p->wackedbyactor->s->y - p->pos.y)).signedbuild() >> 1); p->angle.addadjustment(getincanglebam(p->angle.ang, bvectangbam(p->wackedbyactor->s->x - p->pos.x, p->wackedbyactor->s->y - p->pos.y)) >> 1);
} }
} }
spri->ang = p->angle.ang.asbuild(); spri->ang = p->angle.ang.asbuild();

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

@ -6142,7 +6142,7 @@ void DoPlayerDeathFollowKiller(PLAYERp pp)
if (FAFcansee(kp->x, kp->y, SPRITEp_TOS(kp), kp->sectnum, pp->posx, pp->posy, pp->posz, pp->cursectnum)) if (FAFcansee(kp->x, kp->y, SPRITEp_TOS(kp), kp->sectnum, pp->posx, pp->posy, pp->posz, pp->cursectnum))
{ {
pp->angle.addadjustment(getincanglebam(pp->angle.ang, bvectangbam(kp->x - pp->posx, kp->y - pp->posy)).signedbuild() >> 4); pp->angle.addadjustment(getincanglebam(pp->angle.ang, bvectangbam(kp->x - pp->posx, kp->y - pp->posy)) >> 4);
} }
} }
} }