diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 897ece3dfc10bb11996e6ebe4df8e0d36fa54819..23f38ffd70a4916bbdde1d67bd417bf7d1d9ba3d 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
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;
procedure DrawPickup();
procedure DrawRulez();
procedure DrawAim();
+ procedure DrawIndicator();
procedure DrawBubble();
procedure DrawGUI();
procedure Update(); virtual;
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;
gFly: Boolean = False;
gAimLine: Boolean = False;
gChatBubble: Byte = 0;
+ gPlayerIndicator: Boolean = True;
gNumBots: Word = 0;
gLMSPID1: Word = 0;
gLMSPID2: Word = 0;
gPlayers[a].FSecrets := utils.readLongInt(st);
// Òåêóùåå îðóæèå
gPlayers[a].FCurrWeap := utils.readByte(st);
- //gPlayers[a].FNetForceWeap := gPlayers[a].FCurrWeap;
// Ñëåäóþùåå æåëàåìîå îðóæèå
gPlayers[a].FNextWeap := utils.readWord(st);
// ...è ïàóçà
if gPlayers[i] is TPlayer then
begin
gPlayers[i].Update();
- if g_Game_IsClient or not g_Game_IsNet then
- begin
- gPlayers[i].RealizeCurrentWeapon(); // WARNING! DO NOT MOVE THIS INTO `Update()`!
- end;
+ gPlayers[i].RealizeCurrentWeapon(); // WARNING! DO NOT MOVE THIS INTO `Update()`!
end
else
begin
FJustTeleported := False;
FNetTime := 0;
- //FNetForceWeap := FCurrWeap;
- FNetForceWeapFIdx := 0;
- //FCurrFrameIdx := 0;
-
resetWeaponQueue();
releaseAllWeaponSwitchKeys();
end;
inherited;
end;
+procedure TPlayer.DrawIndicator();
+var
+ indX, indY: Integer;
+ indW, indH: Word;
+ ID: DWORD;
+begin
+ if FAlive then
+ begin
+ indX := FObj.X+FObj.Rect.X;
+ indY := FObj.Y - 12;
+ if g_Texture_Get('TEXTURE_PLAYER_INDICATOR', ID) then
+ begin
+ e_GetTextureSize(ID, @indW, @indH);
+ e_Draw(ID, indX + indW div 2, indY, 0, True, False);
+ end;
+ end;
+ //e_TextureFontPrint(indX, indY, FName, gStdFont); // Shows player name overhead
+end;
+
procedure TPlayer.DrawBubble();
var
bubX, bubY: Integer;
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;
- if nw = WEAPON_SAW then FSawSoundSelect.PlayAt(FObj.X, FObj.Y);
- FModel.SetWeapon(nw);
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 and g_Game_IsClient then
end;
end;
FNextWeap := $4000;
end;
-// used by network layer
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);
- //if g_Game_IsClient then resetWeaponQueue();
+ resetWeaponQueue();
end;
function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean;
if allowBerserkSwitching then
begin
FCurrWeap := WEAPON_KASTET;
- //FNetForceWeap := FCurrWeap;
resetWeaponQueue();
FModel.SetWeapon(WEAPON_KASTET);
end;
FMonsterKills := 0;
FDeath := 0;
FSecrets := 0;
- //FCurrFrameIdx := 0;
- //FNetForceWeap := FCurrWeap;
- //FNetForceWeapFIdx := 0;
if FNoRespawn then
begin
FSpectator := False;
FShellTimer := -1;
FPain := 0;
FLastHit := 0;
- //FNetForceWeap := FCurrWeap;
if not g_Game_IsServer then
Exit;
FWeapon[WEAPON_PISTOL] := True;
FWeapon[WEAPON_KASTET] := True;
FCurrWeap := WEAPON_PISTOL;
- //FNetForceWeap := FCurrWeap;
resetWeaponQueue();
FModel.SetWeapon(FCurrWeap);
if (gPlayer2 = nil) and (gLMSPID2 = FUID) then
gPlayer2 := self;
- //FNetForceWeap := FCurrWeap;
-
if g_Game_IsNet then
begin
MH_SEND_PlayerPos(True, FUID, NET_EVERYONE);
AnyServer: Boolean;
SetSpect: Boolean;
begin
- //Inc(FCurrFrameIdx);
-
NetServer := g_Game_IsNet and g_Game_IsServer;
AnyServer := g_Game_IsServer;
FAir := FSavedState.Air;
FJetFuel := FSavedState.JetFuel;
FCurrWeap := FSavedState.CurrWeap;
- //FNetForceWeap := FCurrWeap;
FNextWeap := FSavedState.NextWeap;
FNextWeapDelay := FSavedState.NextWeapDelay;
FSecrets := utils.readLongInt(st);
// Òåêóùåå îðóæèå
FCurrWeap := utils.readByte(st);
- //FNetForceWeap := FCurrWeap;
// Æåëàåìîå îðóæèå
FNextWeap := utils.readWord(st);
// ...è ïàóçà
if FBFGFireCounter < 1 then
begin
FCurrWeap := WEAPON_KASTET;
- //FNetForceWeap := FCurrWeap;
resetWeaponQueue();
FModel.SetWeapon(WEAPON_KASTET);
end;