zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 17:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Pass the player_struct through to FinalizeInput() in line with other functions.

Browse source
This commit is contained in:
Mitchell Richters 2021-01-02 11:04:03 +11:00
parent bcb838f3fb
commit 9833c94114
5 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -233,7 +233,7 @@ void donewgame(MapRecord* map, int sk);
void startnewgame(MapRecord* map, int skill);
int playercolor2lookup(int color);
void PlayerColorChanged(void);
bool movementBlocked(int snum);
bool movementBlocked(player_struct *p);
void loadcons();
void recordoldspritepos();

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

@ -767,12 +767,11 @@ static void processVehicleInput(player_struct *p, ControlInfo* const hidInput, I
//
//---------------------------------------------------------------------------
static void FinalizeInput(int playerNum, InputPacket& input, bool vehicle)
static void FinalizeInput(player_struct *p, InputPacket& input, bool vehicle)
{
auto p = &ps[playerNum];
bool blocked = movementBlocked(playerNum) || p->GetActor()->s.extra <= 0 || (p->dead_flag && !ud.god);
bool blocked = movementBlocked(p) || p->GetActor()->s.extra <= 0 || (p->dead_flag && !ud.god);
if (blocked && ps[playerNum].newOwner == nullptr)
if (blocked && p->newOwner == nullptr)
{
// neutralize all movement when blocked or in automap follow mode
loc.fvel = loc.svel = 0;
@ -842,7 +841,7 @@ void GameInterface::GetInput(InputPacket* packet, ControlInfo* const hidInput)
processMovement(&input, &loc, hidInput, scaleAdjust, p->drink_amt);
}
FinalizeInput(myconnectindex, input, rrraVehicle);
FinalizeInput(p, input, rrraVehicle);
if (!SyncInput())
{

8
source/games/duke/src/player.cpp
View file

@ -944,20 +944,18 @@ void playerAimDown(int snum, ESyncBits actions)
//
//---------------------------------------------------------------------------
bool movementBlocked(int snum)
bool movementBlocked(player_struct *p)
{
auto p = &ps[snum];
auto blockingweapon = [=]()
{
if (isRR()) return false;
if (isWW2GI()) return aplWeaponWorksLike[p->curr_weapon][snum] == TRIPBOMB_WEAPON;
if (isWW2GI()) return aplWeaponWorksLike[p->curr_weapon][p->i] == TRIPBOMB_WEAPON;
else return p->curr_weapon == TRIPBOMB_WEAPON;
};
auto weapondelay = [=]()
{
if (isWW2GI()) return aplWeaponFireDelay[p->curr_weapon][snum];
if (isWW2GI()) return aplWeaponFireDelay[p->curr_weapon][p->i];
else return 4;
};

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

@ -2893,7 +2893,7 @@ void processinput_d(int snum)
//Do the quick lefts and rights
if (movementBlocked(snum))
if (movementBlocked(p))
{
doubvel = 0;
p->posxv = 0;

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

@ -3646,7 +3646,7 @@ void processinput_r(int snum)
//Do the quick lefts and rights
if (movementBlocked(snum))
if (movementBlocked(p))
{
doubvel = 0;
p->posxv = 0;