diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index f9de6195596b43fa555a80dcbff9ba1d6c241388..897ece3dfc10bb11996e6ebe4df8e0d36fa54819 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
FFlag: Byte;
FSecrets: Integer;
FCurrWeap: Byte;
FFlag: Byte;
FSecrets: Integer;
FCurrWeap: Byte;
+ //FNetForceWeap: Byte; // spam server with this -- this is new weapon we want to use
+ FNetForceWeapFIdx: LongWord; // frame index; ignore weapon change if it is lesser than this
+ //FCurrFrameIdx: LongWord; // increased in each `Update()`
FNextWeap: WORD;
FNextWeapDelay: Byte; // frames (unused)
FBFGFireCounter: SmallInt;
FNextWeap: WORD;
FNextWeapDelay: Byte; // frames (unused)
FBFGFireCounter: SmallInt;
property Death: Integer read FDeath write FDeath;
property Kills: Integer read FKills write FKills;
property CurrWeap: Byte read FCurrWeap write FCurrWeap;
property Death: Integer read FDeath write FDeath;
property Kills: Integer read FKills write FKills;
property CurrWeap: Byte read FCurrWeap write FCurrWeap;
+ //property NetForceWeap: Byte read FNetForceWeap write FNetForceWeap;
+ property NetForceWeapFIdx: LongWord read FNetForceWeapFIdx write FNetForceWeapFIdx;
+ //property CurrFrameIdx: LongWord read FCurrFrameIdx write FCurrFrameIdx;
property MonsterKills: Integer read FMonsterKills write FMonsterKills;
property Secrets: Integer read FSecrets;
property GodMode: Boolean read FGodMode write FGodMode;
property MonsterKills: Integer read FMonsterKills write FMonsterKills;
property Secrets: Integer read FSecrets;
property GodMode: Boolean read FGodMode write FGodMode;
gPlayers[a].FSecrets := utils.readLongInt(st);
// Òåêóùåå îðóæèå
gPlayers[a].FCurrWeap := utils.readByte(st);
gPlayers[a].FSecrets := utils.readLongInt(st);
// Òåêóùåå îðóæèå
gPlayers[a].FCurrWeap := utils.readByte(st);
+ //gPlayers[a].FNetForceWeap := gPlayers[a].FCurrWeap;
// Ñëåäóþùåå æåëàåìîå îðóæèå
gPlayers[a].FNextWeap := utils.readWord(st);
// ...è ïàóçà
// Ñëåäóþùåå æåëàåìîå îðóæèå
gPlayers[a].FNextWeap := utils.readWord(st);
// ...è ïàóçà
if gPlayers[i] is TPlayer then
begin
gPlayers[i].Update();
if gPlayers[i] is TPlayer then
begin
gPlayers[i].Update();
- gPlayers[i].RealizeCurrentWeapon(); // WARNING! DO NOT MOVE THIS INTO `Update()`!
+ if g_Game_IsClient or not g_Game_IsNet then
+ begin
+ gPlayers[i].RealizeCurrentWeapon(); // WARNING! DO NOT MOVE THIS INTO `Update()`!
+ end;
end
else
begin
end
else
begin
FJustTeleported := False;
FNetTime := 0;
FJustTeleported := False;
FNetTime := 0;
+ //FNetForceWeap := FCurrWeap;
+ FNetForceWeapFIdx := 0;
+ //FCurrFrameIdx := 0;
+
resetWeaponQueue();
releaseAllWeaponSwitchKeys();
end;
resetWeaponQueue();
releaseAllWeaponSwitchKeys();
end;
if FWeapon[nw] then
begin
if FWeapon[nw] then
begin
+ //k8: emulate this on client immediately, or wait for server confirmation?
+ {
+ if g_Game_IsClient then
+ begin
+ FNetForceWeap := nw;
+ //FNetForceWeapFIdx := FCurrFrameIdx+5; // force for ~5 frames
+ FNetForceWeapFIdx := gTime+5; // force for ~5 frames
+ writeln('NETWEAPONSWITCH: fw=', NetForceWeap, '; fwfidx=', NetForceWeapFIdx, '; cfrm=', gTime);
+ end;
+ }
+ FNetForceWeapFIdx := gTime+5; // force for ~5 frames
FCurrWeap := nw;
FCurrWeap := nw;
+ if nw = WEAPON_SAW then FSawSoundSelect.PlayAt(FObj.X, FObj.Y);
+ FModel.SetWeapon(nw);
FTime[T_SWITCH] := gTime+156;
FTime[T_SWITCH] := gTime+156;
- if FCurrWeap = WEAPON_SAW then FSawSoundSelect.PlayAt(FObj.X, FObj.Y);
- FModel.SetWeapon(FCurrWeap);
if g_Game_IsNet then MH_SEND_PlayerStats(FUID);
if g_Game_IsNet then MH_SEND_PlayerStats(FUID);
+ //if g_Game_IsNet and g_Game_IsClient then
end;
end;
end;
end;
FNextWeap := $4000;
end;
FNextWeap := $4000;
end;
+// used by network layer
procedure TPlayer.SetWeapon(W: Byte);
begin
if FCurrWeap <> W then
procedure TPlayer.SetWeapon(W: Byte);
begin
if FCurrWeap <> W then
- if W = WEAPON_SAW then
+ if (W = WEAPON_SAW) then
FSawSoundSelect.PlayAt(FObj.X, FObj.Y);
FCurrWeap := W;
FModel.SetWeapon(CurrWeap);
FSawSoundSelect.PlayAt(FObj.X, FObj.Y);
FCurrWeap := W;
FModel.SetWeapon(CurrWeap);
- resetWeaponQueue();
+ //if g_Game_IsClient then resetWeaponQueue();
end;
function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean;
end;
function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean;
if allowBerserkSwitching then
begin
FCurrWeap := WEAPON_KASTET;
if allowBerserkSwitching then
begin
FCurrWeap := WEAPON_KASTET;
+ //FNetForceWeap := FCurrWeap;
resetWeaponQueue();
FModel.SetWeapon(WEAPON_KASTET);
end;
resetWeaponQueue();
FModel.SetWeapon(WEAPON_KASTET);
end;
FMonsterKills := 0;
FDeath := 0;
FSecrets := 0;
FMonsterKills := 0;
FDeath := 0;
FSecrets := 0;
+ //FCurrFrameIdx := 0;
+ //FNetForceWeap := FCurrWeap;
+ //FNetForceWeapFIdx := 0;
if FNoRespawn then
begin
FSpectator := False;
if FNoRespawn then
begin
FSpectator := False;
FShellTimer := -1;
FPain := 0;
FLastHit := 0;
FShellTimer := -1;
FPain := 0;
FLastHit := 0;
+ //FNetForceWeap := FCurrWeap;
if not g_Game_IsServer then
Exit;
if not g_Game_IsServer then
Exit;
FWeapon[WEAPON_PISTOL] := True;
FWeapon[WEAPON_KASTET] := True;
FCurrWeap := WEAPON_PISTOL;
FWeapon[WEAPON_PISTOL] := True;
FWeapon[WEAPON_KASTET] := True;
FCurrWeap := WEAPON_PISTOL;
+ //FNetForceWeap := FCurrWeap;
resetWeaponQueue();
FModel.SetWeapon(FCurrWeap);
resetWeaponQueue();
FModel.SetWeapon(FCurrWeap);
if (gPlayer2 = nil) and (gLMSPID2 = FUID) then
gPlayer2 := self;
if (gPlayer2 = nil) and (gLMSPID2 = FUID) then
gPlayer2 := self;
+ //FNetForceWeap := FCurrWeap;
+
if g_Game_IsNet then
begin
MH_SEND_PlayerPos(True, FUID, NET_EVERYONE);
if g_Game_IsNet then
begin
MH_SEND_PlayerPos(True, FUID, NET_EVERYONE);
AnyServer: Boolean;
SetSpect: Boolean;
begin
AnyServer: Boolean;
SetSpect: Boolean;
begin
+ //Inc(FCurrFrameIdx);
+
NetServer := g_Game_IsNet and g_Game_IsServer;
AnyServer := g_Game_IsServer;
NetServer := g_Game_IsNet and g_Game_IsServer;
AnyServer := g_Game_IsServer;
FAir := FSavedState.Air;
FJetFuel := FSavedState.JetFuel;
FCurrWeap := FSavedState.CurrWeap;
FAir := FSavedState.Air;
FJetFuel := FSavedState.JetFuel;
FCurrWeap := FSavedState.CurrWeap;
+ //FNetForceWeap := FCurrWeap;
FNextWeap := FSavedState.NextWeap;
FNextWeapDelay := FSavedState.NextWeapDelay;
FNextWeap := FSavedState.NextWeap;
FNextWeapDelay := FSavedState.NextWeapDelay;
FSecrets := utils.readLongInt(st);
// Òåêóùåå îðóæèå
FCurrWeap := utils.readByte(st);
FSecrets := utils.readLongInt(st);
// Òåêóùåå îðóæèå
FCurrWeap := utils.readByte(st);
+ //FNetForceWeap := FCurrWeap;
// Æåëàåìîå îðóæèå
FNextWeap := utils.readWord(st);
// ...è ïàóçà
// Æåëàåìîå îðóæèå
FNextWeap := utils.readWord(st);
// ...è ïàóçà
if FBFGFireCounter < 1 then
begin
FCurrWeap := WEAPON_KASTET;
if FBFGFireCounter < 1 then
begin
FCurrWeap := WEAPON_KASTET;
+ //FNetForceWeap := FCurrWeap;
resetWeaponQueue();
FModel.SetWeapon(WEAPON_KASTET);
end;
resetWeaponQueue();
FModel.SetWeapon(WEAPON_KASTET);
end;