zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-15 20:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- calcviewpitch(): Set scaleAdjust to default to 1 in prototype like other functions in gameinput.cpp.

Browse source
This commit is contained in:
Mitchell Richters 2021-01-02 09:32:19 +11:00
parent dac08a2cb9
commit 3a801cbf5c
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/core/gameinput.h
View file

@ -272,4 +272,4 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerHorizon& w,
void processMovement(InputPacket* currInput, InputPacket* inputBuffer, ControlInfo* const hidInput, double const scaleAdjust, int const drink_amt = 0, bool const allowstrafe = true, double const turnscale = 1); void processMovement(InputPacket* currInput, InputPacket* inputBuffer, ControlInfo* const hidInput, double const scaleAdjust, int const drink_amt = 0, bool const allowstrafe = true, double const turnscale = 1);
void sethorizon(fixedhoriz* horiz, float const horz, ESyncBits* actions, double const scaleAdjust = 1); void sethorizon(fixedhoriz* horiz, float const horz, ESyncBits* actions, double const scaleAdjust = 1);
void applylook(PlayerAngle* angle, float const avel, ESyncBits* actions, double const scaleAdjust = 1); void applylook(PlayerAngle* angle, float const avel, ESyncBits* actions, double const scaleAdjust = 1);
void calcviewpitch(vec2_t const pos, fixedhoriz* horizoff, binangle const ang, bool const aimmode, bool const canslopetilt, int const cursectnum, double const scaleAdjust, bool const climbing = false); void calcviewpitch(vec2_t const pos, fixedhoriz* horizoff, binangle const ang, bool const aimmode, bool const canslopetilt, int const cursectnum, double const scaleAdjust = 1, bool const climbing = false);

2
source/games/duke/src/inlines.h
View file

@ -193,7 +193,7 @@ inline double get16thOfHoriz(int const snum, bool const interpolate, double cons
return (!interpolate ? ps[snum].horizon.sum() : ps[snum].horizon.interpolatedsum(smoothratio)).asq16() * (0.0625 / FRACUNIT); return (!interpolate ? ps[snum].horizon.sum() : ps[snum].horizon.interpolatedsum(smoothratio)).asq16() * (0.0625 / FRACUNIT);
} }
inline void doslopetilting(player_struct* p, double const scaleAdjust) inline void doslopetilting(player_struct* p, double const scaleAdjust = 1)
{ {
bool const canslopetilt = p->on_ground && sector[p->cursectnum].lotag != ST_2_UNDERWATER && (sector[p->cursectnum].floorstat & 2); bool const canslopetilt = p->on_ground && sector[p->cursectnum].lotag != ST_2_UNDERWATER && (sector[p->cursectnum].floorstat & 2);
calcviewpitch(p->pos.vec2, &p->horizon.horizoff, p->angle.ang, p->aim_mode == 0, canslopetilt, p->cursectnum, scaleAdjust); calcviewpitch(p->pos.vec2, &p->horizon.horizoff, p->angle.ang, p->aim_mode == 0, canslopetilt, p->cursectnum, scaleAdjust);

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

@ -2779,7 +2779,7 @@ void processinput_d(int snum)
if (SyncInput()) if (SyncInput())
{ {
p->horizon.backup(); p->horizon.backup();
doslopetilting(p, 1); doslopetilting(p);
} }
if (chz.type == kHitSprite) if (chz.type == kHitSprite)

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

@ -3461,7 +3461,7 @@ void processinput_r(int snum)
if (SyncInput()) if (SyncInput())
{ {
p->horizon.backup(); p->horizon.backup();
doslopetilting(p, 1); doslopetilting(p);
} }
if (chz.type == kHitSprite) if (chz.type == kHitSprite)