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

- Remove GameInterface::getConsoleAngles(), it's not needed anymore.

Browse source
This commit is contained in:
Mitchell Richters 2023-04-04 07:02:39 +10:00
parent 3ef431a428
commit a68fcfc71c
9 changed files with 13 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/core/gamecontrol.cpp
View file

@ -1409,17 +1409,6 @@ void GameInterface::FreeLevelData()
GC::FullGC(); GC::FullGC();
} }
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void GameInterface::doPlayerMovement(const float scaleAdjust)
{
gameInput.processMovement(scaleAdjust);
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// DrawCrosshair // DrawCrosshair

6
source/core/gameinput.cpp
View file

@ -106,7 +106,7 @@ void processCrouchToggle(bool& toggle, ESyncBits& actions, const bool crouchable
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void GameInput::processMovement(const float scaleAdjust, const int drink_amt, const bool allowstrafe, const double turnscale) void GameInput::processMovement(PlayerAngles* const plrAngles, const float scaleAdjust, const int drink_amt, const bool allowstrafe, const double turnscale)
{ {
// open up input packet for this session. // open up input packet for this session.
InputPacket thisInput{}; InputPacket thisInput{};
@ -158,7 +158,6 @@ void GameInput::processMovement(const float scaleAdjust, const int drink_amt, co
// directly update player angles if we can. // directly update player angles if we can.
if (scaleAdjust < 1) if (scaleAdjust < 1)
{ {
const auto plrAngles = gi->getConsoleAngles();
plrAngles->CameraAngles.Yaw += DAngle::fromDeg(thisInput.avel); plrAngles->CameraAngles.Yaw += DAngle::fromDeg(thisInput.avel);
plrAngles->CameraAngles.Pitch += DAngle::fromDeg(thisInput.horz); plrAngles->CameraAngles.Pitch += DAngle::fromDeg(thisInput.horz);
} }
@ -171,7 +170,7 @@ void GameInput::processMovement(const float scaleAdjust, const int drink_amt, co
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void GameInput::processVehicle(const float scaleAdjust, const float baseVel, const float velScale, const bool canMove, const bool canTurn, const bool attenuate) void GameInput::processVehicle(PlayerAngles* const plrAngles, const float scaleAdjust, const float baseVel, const float velScale, const bool canMove, const bool canTurn, const bool attenuate)
{ {
// open up input packet for this session. // open up input packet for this session.
InputPacket thisInput{}; InputPacket thisInput{};
@ -216,7 +215,6 @@ void GameInput::processVehicle(const float scaleAdjust, const float baseVel, con
// directly update player angles if we can. // directly update player angles if we can.
if (scaleAdjust < 1) if (scaleAdjust < 1)
{ {
const auto plrAngles = gi->getConsoleAngles();
plrAngles->CameraAngles.Yaw += DAngle::fromDeg(thisInput.avel); plrAngles->CameraAngles.Yaw += DAngle::fromDeg(thisInput.avel);
plrAngles->CameraAngles.Pitch += DAngle::fromDeg(thisInput.horz); plrAngles->CameraAngles.Pitch += DAngle::fromDeg(thisInput.horz);
} }

8
source/core/gameinput.h
View file

@ -75,8 +75,8 @@ public:
} }
// Prototypes for large member functions. // Prototypes for large member functions.
void processMovement(const float scaleAdjust, const int drink_amt = 0, const bool allowstrafe = true, const double turnscale = 1.); void processMovement(PlayerAngles* const plrAngles, const float scaleAdjust, const int drink_amt = 0, const bool allowstrafe = true, const double turnscale = 1.);
void processVehicle(const float scaleAdjust, const float baseVel, const float velScale, const bool canMove, const bool canTurn, const bool attenuate); void processVehicle(PlayerAngles* const plrAngles, const float scaleAdjust, const float baseVel, const float velScale, const bool canMove, const bool canTurn, const bool attenuate);
void getInput(const double scaleAdjust, InputPacket* packet = nullptr); void getInput(const double scaleAdjust, InputPacket* packet = nullptr);
}; };
@ -89,8 +89,8 @@ struct PlayerAngles
DAngle YawSpin; DAngle YawSpin;
friend FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngles& w, PlayerAngles* def); friend FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngles& w, PlayerAngles* def);
friend void GameInput::processMovement(const float scaleAdjust, const int drink_amt, const bool allowstrafe, const double turnscale); friend void GameInput::processMovement(PlayerAngles* const plrAngles, const float scaleAdjust, const int drink_amt, const bool allowstrafe, const double turnscale);
friend void GameInput::processVehicle(const float scaleAdjust, const float baseVel, const float velScale, const bool canMove, const bool canTurn, const bool attenuate); friend void GameInput::processVehicle(PlayerAngles* const plrAngles, const float scaleAdjust, const float baseVel, const float velScale, const bool canMove, const bool canTurn, const bool attenuate);
// Prototypes. // Prototypes.
void doPitchKeys(InputPacket* const input); void doPitchKeys(InputPacket* const input);

3
source/core/gamestruct.h
View file

@ -101,7 +101,6 @@ struct GameInterface
virtual DAngle playerPitchMin() { return DAngle::fromDeg(57.375); } virtual DAngle playerPitchMin() { return DAngle::fromDeg(57.375); }
virtual DAngle playerPitchMax() { return DAngle::fromDeg(-57.375); } virtual DAngle playerPitchMax() { return DAngle::fromDeg(-57.375); }
virtual DCoreActor* getConsoleActor() = 0; virtual DCoreActor* getConsoleActor() = 0;
virtual PlayerAngles* getConsoleAngles() = 0;
virtual void ToggleThirdPerson() = 0; virtual void ToggleThirdPerson() = 0;
virtual void SwitchCoopView() { Printf("Unsupported command\n"); } virtual void SwitchCoopView() { Printf("Unsupported command\n"); }
virtual void ToggleShowWeapon() { Printf("Unsupported command\n"); } virtual void ToggleShowWeapon() { Printf("Unsupported command\n"); }
@ -119,7 +118,7 @@ struct GameInterface
virtual bool WantEscape() { return false; } virtual bool WantEscape() { return false; }
virtual void StartSoundEngine() = 0; virtual void StartSoundEngine() = 0;
virtual void reapplyInputBits(InputPacket* const input) = 0; virtual void reapplyInputBits(InputPacket* const input) = 0;
virtual void doPlayerMovement(const float scaleAdjust); virtual void doPlayerMovement(const float scaleAdjust) = 0;
virtual FString statFPS() virtual FString statFPS()
{ {

2
source/games/blood/src/blood.h
View file

@ -131,7 +131,6 @@ struct GameInterface : public ::GameInterface
DAngle playerPitchMin() override { return DAngle::fromDeg(54.575); } DAngle playerPitchMin() override { return DAngle::fromDeg(54.575); }
DAngle playerPitchMax() override { return DAngle::fromDeg(-43.15); } DAngle playerPitchMax() override { return DAngle::fromDeg(-43.15); }
DCoreActor* getConsoleActor() override { return gPlayer[myconnectindex].actor; } DCoreActor* getConsoleActor() override { return gPlayer[myconnectindex].actor; }
PlayerAngles* getConsoleAngles() override { return &gPlayer[myconnectindex].Angles; }
void ToggleThirdPerson() override; void ToggleThirdPerson() override;
void SwitchCoopView() override; void SwitchCoopView() override;
void ToggleShowWeapon() override; void ToggleShowWeapon() override;
@ -146,6 +145,7 @@ struct GameInterface : public ::GameInterface
void RemoveQAVInterpProps(const int res_id) override; void RemoveQAVInterpProps(const int res_id) override;
void StartSoundEngine() override; void StartSoundEngine() override;
void reapplyInputBits(InputPacket* const input) override { input->actions |= gPlayer[myconnectindex].input.actions & ~(SB_BUTTON_MASK | SB_RUN | SB_WEAPONMASK_BITS); } void reapplyInputBits(InputPacket* const input) override { input->actions |= gPlayer[myconnectindex].input.actions & ~(SB_BUTTON_MASK | SB_RUN | SB_WEAPONMASK_BITS); }
void doPlayerMovement(const float scaleAdjust) override { gameInput.processMovement(&gPlayer[myconnectindex].Angles, scaleAdjust); }
GameStats getStats() override; GameStats getStats() override;
}; };

1
source/games/duke/src/duke3d.h
View file

@ -53,7 +53,6 @@ struct GameInterface : public ::GameInterface
void LevelCompleted(MapRecord* map, int skill) override; void LevelCompleted(MapRecord* map, int skill) override;
bool DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos, const DAngle cang, const DVector2& xydim, const double czoom, double const interpfrac) override; bool DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos, const DAngle cang, const DVector2& xydim, const double czoom, double const interpfrac) override;
DCoreActor* getConsoleActor() override { return ps[myconnectindex].GetActor(); } DCoreActor* getConsoleActor() override { return ps[myconnectindex].GetActor(); }
PlayerAngles* getConsoleAngles() override { return &ps[myconnectindex].Angles; }
void ToggleThirdPerson() override; void ToggleThirdPerson() override;
void SwitchCoopView() override; void SwitchCoopView() override;
void ToggleShowWeapon() override; void ToggleShowWeapon() override;

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

@ -525,11 +525,11 @@ void GameInterface::doPlayerMovement(const float scaleAdjust)
const auto canTurn = p->OnMotorcycle || p->MotoSpeed || p->moto_drink; const auto canTurn = p->OnMotorcycle || p->MotoSpeed || p->moto_drink;
const auto attenuate = p->OnMotorcycle && p->MotoSpeed <= 0; const auto attenuate = p->OnMotorcycle && p->MotoSpeed <= 0;
gameInput.processVehicle(scaleAdjust, baseVel, velScale, canMove, canTurn, attenuate); gameInput.processVehicle(&p->Angles, scaleAdjust, baseVel, velScale, canMove, canTurn, attenuate);
} }
else else
{ {
gameInput.processMovement(scaleAdjust, p->drink_amt); gameInput.processMovement(&p->Angles, scaleAdjust, p->drink_amt);
} }
} }

2
source/games/exhumed/src/exhumed.h
View file

@ -234,12 +234,12 @@ struct GameInterface : public ::GameInterface
DAngle playerPitchMin() override { return DAngle::fromDeg(49.5); } DAngle playerPitchMin() override { return DAngle::fromDeg(49.5); }
DAngle playerPitchMax() override { return DAngle::fromDeg(-49.5); } DAngle playerPitchMax() override { return DAngle::fromDeg(-49.5); }
DCoreActor* getConsoleActor() override { return PlayerList[nLocalPlayer].pActor; } DCoreActor* getConsoleActor() override { return PlayerList[nLocalPlayer].pActor; }
PlayerAngles* getConsoleAngles() override { return &PlayerList[nLocalPlayer].Angles; }
void ToggleThirdPerson() override; void ToggleThirdPerson() override;
void processSprites(tspriteArray& tsprites, const DVector3& view, DAngle viewang, double interpfrac) override; void processSprites(tspriteArray& tsprites, const DVector3& view, DAngle viewang, double interpfrac) override;
int GetCurrentSkill() override; int GetCurrentSkill() override;
void StartSoundEngine() override; void StartSoundEngine() override;
void reapplyInputBits(InputPacket* const input) override { input->actions |= PlayerList[nLocalPlayer].input.actions & SB_CENTERVIEW; } void reapplyInputBits(InputPacket* const input) override { input->actions |= PlayerList[nLocalPlayer].input.actions & SB_CENTERVIEW; }
void doPlayerMovement(const float scaleAdjust) override { gameInput.processMovement(&PlayerList[nLocalPlayer].Angles, scaleAdjust); }
::GameStats getStats() override; ::GameStats getStats() override;
}; };

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

@ -1878,7 +1878,6 @@ struct GameInterface : public ::GameInterface
void NewGame(MapRecord *map, int skill, bool) override; void NewGame(MapRecord *map, int skill, bool) override;
bool DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos, const DAngle cang, const DVector2& xydim, const double czoom, double const interpfrac) override; bool DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos, const DAngle cang, const DVector2& xydim, const double czoom, double const interpfrac) override;
DCoreActor* getConsoleActor() override { return Player[myconnectindex].actor; } DCoreActor* getConsoleActor() override { return Player[myconnectindex].actor; }
PlayerAngles* getConsoleAngles() override { return &Player[myconnectindex].Angles; }
void ToggleThirdPerson() override; void ToggleThirdPerson() override;
void SwitchCoopView() override; void SwitchCoopView() override;
void processSprites(tspriteArray& tsprites, const DVector3& view, DAngle viewang, double smoothRatio) override; void processSprites(tspriteArray& tsprites, const DVector3& view, DAngle viewang, double smoothRatio) override;
@ -1891,7 +1890,8 @@ struct GameInterface : public ::GameInterface
void reapplyInputBits(InputPacket* const input) override { input->actions |= Player[myconnectindex].input.actions & SB_CENTERVIEW; } void reapplyInputBits(InputPacket* const input) override { input->actions |= Player[myconnectindex].input.actions & SB_CENTERVIEW; }
void doPlayerMovement(const float scaleAdjust) override void doPlayerMovement(const float scaleAdjust) override
{ {
gameInput.processMovement(scaleAdjust, 0, !Player[myconnectindex].sop, Player[myconnectindex].sop_control ? 3. / 1.40625 : 1.); const auto pp = &Player[myconnectindex];
gameInput.processMovement(&pp->Angles, scaleAdjust, 0, !pp->sop, pp->sop_control ? (3. / 1.40625) : 1.);
} }