mirror of
https://github.com/ZDoom/Raze.git
synced 2025-03-30 20:51:02 +00:00
- Exhumed: Move nTemperature[]
into Player
struct.
This commit is contained in:
parent
572869f502
commit
45be386f7f
4 changed files with 7 additions and 12 deletions
|
@ -128,7 +128,6 @@ struct Weapon
|
|||
};
|
||||
|
||||
extern Weapon WeaponInfo[];
|
||||
extern int16_t nTemperature[];
|
||||
|
||||
void RestoreMinAmmo(int nPlayer);
|
||||
void FillWeapons(int nPlayer);
|
||||
|
|
|
@ -45,7 +45,6 @@ Weapon WeaponInfo[] = {
|
|||
{ kSeqDeadBrn, { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0, 1, 0, false }
|
||||
};
|
||||
|
||||
int16_t nTemperature[kMaxPlayers];
|
||||
static const uint8_t nMinAmmo[] = { 0, 24, 51, 50, 1, 0, 0 };
|
||||
int isRed = 0;
|
||||
|
||||
|
@ -60,10 +59,7 @@ void SerializeGun(FSerializer& arc)
|
|||
{
|
||||
if (arc.BeginObject("gun"))
|
||||
{
|
||||
arc.Array("temperature", nTemperature, kMaxPlayers)
|
||||
("isred", isRed)
|
||||
.EndObject();
|
||||
|
||||
arc("isred", isRed).EndObject();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -360,7 +356,7 @@ void MoveWeapons(int nPlayer)
|
|||
nPilotLightFrame = 0;
|
||||
|
||||
if (!PlayerList[nPlayer].bIsFiring || (nSectFlag & kSectUnderwater))
|
||||
nTemperature[nPlayer] = 0;
|
||||
PlayerList[nPlayer].nTemperature = 0;
|
||||
|
||||
auto pPlayerActor = PlayerList[nPlayer].pActor;
|
||||
int nWeapon = PlayerList[nPlayer].nCurrentWeapon;
|
||||
|
@ -678,11 +674,11 @@ loc_flag:
|
|||
|
||||
if (nWeapon == kWeaponFlamer && (!(nSectFlag & kSectUnderwater)))
|
||||
{
|
||||
nTemperature[nPlayer]++;
|
||||
PlayerList[nPlayer].nTemperature++;
|
||||
|
||||
if (nTemperature[nPlayer] > 50)
|
||||
if (PlayerList[nPlayer].nTemperature > 50)
|
||||
{
|
||||
nTemperature[nPlayer] = 0;
|
||||
PlayerList[nPlayer].nTemperature = 0;
|
||||
PlayerList[nPlayer].nState = 4;
|
||||
PlayerList[nPlayer].nSeqSize2 = 0;
|
||||
}
|
||||
|
|
|
@ -306,6 +306,7 @@ void RestartPlayer(int nPlayer)
|
|||
pPlayer->nCurrentItem = -1;
|
||||
pPlayer->nDeathType = 0;
|
||||
pPlayer->nQuake = 0;
|
||||
pPlayer->nTemperature = 0;
|
||||
SetTorch(nPlayer, 0);
|
||||
|
||||
if (nNetPlayerCount)
|
||||
|
@ -333,8 +334,6 @@ void RestartPlayer(int nPlayer)
|
|||
pPlayer->nMagic = 0;
|
||||
}
|
||||
|
||||
nTemperature[nPlayer] = 0;
|
||||
|
||||
BuildRa(nPlayer);
|
||||
}
|
||||
|
||||
|
|
|
@ -100,6 +100,7 @@ struct Player
|
|||
int16_t dVertPan;
|
||||
double nQuake;
|
||||
uint8_t nPlayer;
|
||||
int16_t nTemperature;
|
||||
PlayerSave sPlayerSave;
|
||||
int ototalvel;
|
||||
int totalvel;
|
||||
|
|
Loading…
Reference in a new issue