zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-25 21:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- WHaven: Uplift gi->GetInput() to work after merging.

Browse source
This commit is contained in:
Mitchell Richters 2021-11-27 23:18:27 +11:00 committed by Christoph Oelckers
parent 0ccf2bb9ef
commit 8f4cd93023
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/core/gameinput.h
View file

@ -79,11 +79,11 @@ struct PlayerHorizon
void scaletozero(fixedhoriz& object, double const value, double const scaleAdjust, double const push = 0.) void scaletozero(fixedhoriz& object, double const value, double const scaleAdjust, double const push = 0.)
{ {
if (object.asq16()) if (object.asq16())
{ {
auto sgn = Sgn(object.asq16()); auto sgn = Sgn(object.asq16());
object -= getscaledhoriz(value, scaleAdjust, &object, push == 0 ? sgn * (1. / 3.) : push); object -= getscaledhoriz(value, scaleAdjust, &object, push == 0 ? sgn * (1. / 3.) : push);
if (sgn != Sgn(object.asq16())) object = q16horiz(0); if (sgn != Sgn(object.asq16())) object = q16horiz(0);
} }
} }
// Ticrate playsim adjustment processor. // Ticrate playsim adjustment processor.
@ -199,11 +199,11 @@ struct PlayerAngle
void scaletozero(binangle& object, double const value, double const scaleAdjust, double const push = 0.) void scaletozero(binangle& object, double const value, double const scaleAdjust, double const push = 0.)
{ {
if (object.asbam()) if (object.asbam())
{ {
auto sgn = Sgn(object.signedbam()); auto sgn = Sgn(object.signedbam());
object -= getscaledangle(value, scaleAdjust, &object, push == 0 ? sgn * (1. / 3.) : push); object -= getscaledangle(value, scaleAdjust, &object, push == 0 ? sgn * (1. / 3.) : push);
if (sgn != Sgn(object.signedbam())) object = bamang(0); if (sgn != Sgn(object.signedbam())) object = bamang(0);
} }
} }
// Ticrate playsim adjustment processor. // Ticrate playsim adjustment processor.

3
source/games/whaven/src/input.cpp
View file

@ -93,7 +93,7 @@ static void UpdatePlayerSpriteAngle(PLAYER& plr)
plr.actor()->s().ang = plr.angle.ang.asbuild(); plr.actor()->s().ang = plr.angle.ang.asbuild();
} }
void GameInterface::GetInput(InputPacket* packet, ControlInfo* const hidInput) void GameInterface::GetInput(ControlInfo* const hidInput, double const scaleAdjust, InputPacket* packet)
{ {
if (paused || M_Active()) if (paused || M_Active())
{ {
@ -112,7 +112,6 @@ void GameInterface::GetInput(InputPacket* packet, ControlInfo* const hidInput)
if (plr.dead) localInput.actions &= SB_OPEN; if (plr.dead) localInput.actions &= SB_OPEN;
} }
double const scaleAdjust = InputScale();
InputPacket input{}; InputPacket input{};
if (!plr.dead) if (!plr.dead)

2
source/games/whaven/src/wh.h
View file

@ -527,7 +527,7 @@ struct GameInterface : public ::GameInterface
FString GetCoordString() override; FString GetCoordString() override;
//void ExitFromMenu() override; //void ExitFromMenu() override;
//void DrawPlayerSprite(const DVector2& origin, bool onteam) override; //void DrawPlayerSprite(const DVector2& origin, bool onteam) override;
void GetInput(InputPacket* packet, ControlInfo* const hidInput) override; void GetInput(ControlInfo* const hidInput, double const scaleAdjust, InputPacket* packet) override;
void UpdateSounds() override; void UpdateSounds() override;
void Startup() override; void Startup() override;
void DrawBackground() override; void DrawBackground() override;