diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 7436e7a95a77d928002f0dd974b74fe045cebda9..854d8119b44c4f0b4fe27b264e7dd273dece20bc 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
PLAYER_AP_SOFT = 100;
PLAYER_AP_LIMIT = 200;
SUICIDE_DAMAGE = 112;
+ WEAPON_DELAY = 5;
PLAYER1_DEF_COLOR: TRGB = (R:64; G:175; B:48);
PLAYER2_DEF_COLOR: TRGB = (R:96; G:96; B:96);
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)
+ FNextWeapDelay: Byte; // frames
FBFGFireCounter: SmallInt;
FLastSpawnerUID: Word;
FLastHit: Byte;
FNetTime: LongWord;
mEDamageType: Integer;
- // client-side only
- weaponSwitchKeyReleased: array[0..16] of Byte; // bit 0: was released on prev frame; bit 1: new status
-
function CollideLevel(XInc, YInc: Integer): Boolean;
function StayOnStep(XInc, YInc: Integer): Boolean;
function GetRespawnPoint(): Byte;
procedure PressKey(Key: Byte; Time: Word = 1);
procedure ReleaseKeys();
- procedure ReleaseKeysNoWeapon();
procedure SetModel(ModelName: String);
procedure SetColor(Color: TRGB);
procedure SetWeapon(W: Byte);
procedure BFGHit();
function GetFlag(Flag: Byte): Boolean;
procedure SetFlag(Flag: Byte);
- function DropFlag(): Boolean;
+ function DropFlag(Silent: Boolean = True): Boolean;
procedure AllRulez(Health: Boolean);
procedure RestoreHealthArmor();
procedure FragCombo();
procedure getMapBox (out x, y, w, h: Integer); inline;
procedure moveBy (dx, dy: Integer); inline;
- procedure releaseAllWeaponSwitchKeys ();
- procedure weaponSwitchKeysStateChange (index: Integer; pressed: Boolean);
- function isWeaponSwitchKeyReleased (index: Integer): Boolean;
- procedure weaponSwitchKeysShiftNewStates ();
-
public
property Vel: TPoint2i read FObj.Vel;
property Obj: TObj read FObj;
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;
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 (not gPlayers[i].alive) then gPlayers[i].NetForceWeapFIdx := 0; // just in case
- //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;
-
-
-procedure TPlayer.releaseAllWeaponSwitchKeys ();
-var
- f: Integer;
-begin
- for f := 0 to High(weaponSwitchKeyReleased) do weaponSwitchKeyReleased[f] := $03;
-end;
-
-procedure TPlayer.weaponSwitchKeysStateChange (index: Integer; pressed: Boolean);
-begin
- Inc(index, 2); // -2: prev; -1: next
- if (index < 0) or (index > High(weaponSwitchKeyReleased)) then exit;
- weaponSwitchKeyReleased[index] := weaponSwitchKeyReleased[index] or $02;
- if (pressed) then weaponSwitchKeyReleased[index] := weaponSwitchKeyReleased[index] xor $02;
-end;
-
-function TPlayer.isWeaponSwitchKeyReleased (index: Integer): Boolean;
-begin
- Inc(index, 2); // -2: prev; -1: next
- if (index < 0) or (index > High(weaponSwitchKeyReleased)) then
- begin
- result := true;
- end
- else
- begin
- result := (weaponSwitchKeyReleased[index] and $01) <> 0;
- end;
end;
-procedure TPlayer.weaponSwitchKeysShiftNewStates ();
-var
- f: Integer;
-begin
- // copy bit 1 to bit 0
- for f := 0 to High(weaponSwitchKeyReleased) do
- begin
- weaponSwitchKeyReleased[f] :=
- (weaponSwitchKeyReleased[f] and $02) or
- ((weaponSwitchKeyReleased[f] shr 1) and $01);
- end;
-end;
-
-
procedure TPlayer.positionChanged (); inline;
begin
end;
if FAlive then
begin
indX := FObj.X+FObj.Rect.X;
- indY := FObj.Y - 12;
+ indY := FObj.Y;
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);
+ e_Draw(ID, indX + indW div 2, indY - indH, 0, True, False);
end;
end;
//e_TextureFontPrint(indX, indY, FName, gStdFont); // Shows player name overhead
end;
if (gChatBubble > 0) and (FKeys[KEY_CHAT].Pressed) and not FGhost then
- DrawBubble();
+ if (FMegaRulez[MR_INVIS] <= gTime) or ((gPlayerDrawn <> nil) and ((Self = gPlayerDrawn) or
+ ((FTeam = gPlayerDrawn.Team) and (gGameSettings.GameMode <> GM_DM)))) then
+ DrawBubble();
// e_DrawPoint(5, 335, 288, 255, 0, 0); // DL, UR, DL, UR
if gAimLine and alive and
((Self = gPlayer1) or (Self = gPlayer2)) then
end;
// Âûáðîñ ôëàãà:
- DropFlag();
+ DropFlag(KillType = K_FALLKILL);
end;
g_Player_CreateCorpse(Self);
procedure TPlayer.QueueWeaponSwitch(Weapon: Byte);
begin
- //if g_Game_IsClient then Exit;
+ if g_Game_IsClient then Exit;
if Weapon > High(FWeapon) then Exit;
FNextWeap := FNextWeap or (1 shl Weapon);
end;
result := false;
case weapon of
WEAPON_KASTET, WEAPON_SAW: result := true;
- WEAPON_SHOTGUN1, WEAPON_SHOTGUN2, WEAPON_SUPERPULEMET: result := (FAmmo[A_SHELLS] > 0);
- WEAPON_PISTOL, WEAPON_CHAINGUN: result := (FAmmo[A_BULLETS] > 0);
+ WEAPON_SHOTGUN1, WEAPON_SHOTGUN2: result := (FAmmo[A_SHELLS] > 0);
+ WEAPON_PISTOL, WEAPON_CHAINGUN, WEAPON_SUPERPULEMET: result := (FAmmo[A_BULLETS] > 0);
WEAPON_ROCKETLAUNCHER: result := (FAmmo[A_ROCKETS] > 0);
WEAPON_PLASMA, WEAPON_BFG: result := (FAmmo[A_CELLS] > 0);
WEAPON_FLAMETHROWER: result := (FAmmo[A_FUEL] > 0);
var
i: Word;
wantThisWeapon: array[0..64] of Boolean;
- weaponOrder: array[0..16] of Integer; // value: index in `FWeapon`
- wwc: Integer;
- f, dir, cwi, rwidx, curlidx: Integer;
-
- function real2log (ridx: Integer): Integer;
- var
- f: Integer;
- begin
- if (ridx >= 0) then
- begin
- for f := 0 to High(weaponOrder) do if (weaponOrder[f] = ridx) then begin result := f; exit; end;
- end;
- result := -1;
- end;
-
+ wwc: Integer = 0; //HACK!
+ dir, cwi: Integer;
begin
result := 255; // default result: "no switch"
-
// had weapon cycling on previous frame? remove that flag
if (FNextWeap and $2000) <> 0 then
begin
FNextWeap := FNextWeap and $1FFF;
FNextWeapDelay := 0;
end;
-
- for f := 0 to High(weaponOrder) do weaponOrder[f] := -1;
-
- // build weapon order (k8: i know, i know, learn how to do constants and such... gtfo, please!)
- // two knuckles are for "normal" and "berserk" (see `if` below -- it removes the one that is not needed)
- // priorities:
- // bfg, launcher, plasma, flamethrower, ssg, minigun, sg, pistol, berserk, chainsaw, fist
- weaponOrder[0] := WEAPON_SUPERPULEMET;
- weaponOrder[1] := WEAPON_BFG;
- weaponOrder[2] := WEAPON_ROCKETLAUNCHER;
- weaponOrder[3] := WEAPON_PLASMA;
- weaponOrder[4] := WEAPON_FLAMETHROWER;
- weaponOrder[5] := WEAPON_SHOTGUN2;
- weaponOrder[6] := WEAPON_CHAINGUN;
- weaponOrder[7] := WEAPON_SHOTGUN1;
- weaponOrder[8] := WEAPON_PISTOL;
- weaponOrder[9] := WEAPON_KASTET+666; // berserk fist
- weaponOrder[10] := WEAPON_SAW;
- weaponOrder[11] := WEAPON_KASTET; // normal fist
-
- for f := 0 to High(weaponOrder) do
- begin
- if (weaponOrder[f] = WEAPON_KASTET) then
- begin
- // normal fist: remove if we have a berserk pack
- if (R_BERSERK in FRulez) then weaponOrder[f] := -1;
- end
- else
- if (weaponOrder[f] = WEAPON_KASTET+666) then
- begin
- // berserk fist: remove if we don't have a berserk pack
- if (R_BERSERK in FRulez) then weaponOrder[f] := WEAPON_KASTET else weaponOrder[f] := -1;
- end;
- end;
-
- (*
- WEAPON_KASTET = 0;
- WEAPON_SAW = 1;
- WEAPON_PISTOL = 2;
- WEAPON_SHOTGUN1 = 3;
- WEAPON_SHOTGUN2 = 4;
- WEAPON_CHAINGUN = 5;
- WEAPON_ROCKETLAUNCHER = 6;
- WEAPON_PLASMA = 7;
- WEAPON_BFG = 8;
- WEAPON_SUPERPULEMET = 9;
- WEAPON_FLAMETHROWER = 10;
- *)
-
// cycling has priority
if (FNextWeap and $C000) <> 0 then
begin
- if (FNextWeap and $8000) <> 0 then dir := 1 else dir := -1; // should be reversed if we want "priority-driven cycling"
+ if (FNextWeap and $8000) <> 0 then
+ dir := 1
+ else
+ dir := -1;
FNextWeap := FNextWeap or $2000; // we need this
- if FNextWeapDelay > 0 then exit; // cooldown time
- //cwi := real2log(FCurrWeap);
- //if (cwi < 0) then cwi := 0;
+ if FNextWeapDelay > 0 then
+ exit; // cooldown time
cwi := FCurrWeap;
for i := 0 to High(FWeapon) do
begin
cwi := (cwi+length(FWeapon)+dir) mod length(FWeapon);
- //rwidx := weaponOrder[cwi];
- rwidx := cwi; // sorry
- if (rwidx < 0) then continue;
- if FWeapon[rwidx] then
- begin
- //e_WriteLog(Format(' SWITCH: cur=%d; new=%d (dir=%d; log=%d)', [FCurrWeap, rwidx, dir, cwi]), TMsgType.Warning);
- result := Byte(rwidx);
- //FNextWeapDelay := 10; //k8: not needed anymore
+ if FWeapon[cwi] then
+ begin
+ //e_WriteLog(Format(' SWITCH: cur=%d; new=%d', [FCurrWeap, cwi]), MSG_WARNING);
+ result := Byte(cwi);
+ FNextWeapDelay := WEAPON_DELAY;
exit;
end;
end;
resetWeaponQueue();
exit;
end;
-
// no cycling
- for i := 0 to High(wantThisWeapon) do wantThisWeapon[i] := false;
- wwc := 0;
-
- curlidx := -1; // start from a weapon with a highest priority (-1, 'cause loop will immediately increment this index)
-
+ for i := 0 to High(wantThisWeapon) do
+ wantThisWeapon[i] := false;
for i := 0 to High(FWeapon) do
- begin
if (FNextWeap and (1 shl i)) <> 0 then
begin
- cwi := real2log(i);
- if (cwi >= 0) then
- begin
- wantThisWeapon[cwi] := true;
- Inc(wwc);
- // if we hit currently selected weapon, start seachring from it, so we'll get "next weaker" weapon
- if (i = FCurrWeap) then curlidx := cwi; // compare real, start from logical
- end;
+ wantThisWeapon[i] := true;
+ Inc(wwc);
end;
- end;
-
+ // exclude currently selected weapon from the set
+ wantThisWeapon[FCurrWeap] := false;
// slow down alterations a little
- if (wwc > 1) then
+ if wwc > 1 then
begin
- // more than one weapon requested, assume "alteration", and check alteration delay
+ //e_WriteLog(Format(' FNextWeap=%x; delay=%d', [FNextWeap, FNextWeapDelay]), MSG_WARNING);
+ // more than one weapon requested, assume "alteration" and check alteration delay
if FNextWeapDelay > 0 then
begin
- //e_WriteLog(Format(' FNextWeap=%x; delay=%d', [FNextWeap, FNextWeapDelay]), TMsgType.Warning);
FNextWeap := 0;
exit;
end; // yeah
end;
-
// do not reset weapon queue, it will be done in `RealizeCurrentWeapon()`
// but clear all counters if no weapon should be switched
- if (wwc < 1) then
+ if wwc < 1 then
begin
resetWeaponQueue();
exit;
end;
-
- //e_WriteLog(Format('*** wwc=%d; currweap=%d; logweap=%d', [wwc, FCurrWeap, curlidx]), TMsgType.Warning);
-
- // find next weapon to switch onto
- cwi := curlidx;
- for i := 0 to High(weaponOrder) do
+ //e_WriteLog(Format('wwc=%d', [wwc]), MSG_WARNING);
+ // try weapons in descending order
+ for i := High(FWeapon) downto 0 do
begin
- cwi := (cwi+length(weaponOrder)+1) mod length(weaponOrder);
- if (cwi = curlidx) then continue; // skip current weapon
- if not wantThisWeapon[cwi] then continue;
- rwidx := weaponOrder[cwi];
- if (rwidx < 0) then continue;
- //e_WriteLog(Format(' trying logical %d (real %d); has=%d, hasammo=%d', [cwi, rwidx, Integer(FWeapon[rwidx]), Integer(hasAmmoForWeapon(rwidx))]), TMsgType.Warning);
- if FWeapon[rwidx] and ((wwc = 1) or hasAmmoForWeapon(rwidx)) then
+ if wantThisWeapon[i] and FWeapon[i] and ((wwc = 1) or hasAmmoForWeapon(i)) then
begin
- //e_WriteLog(' I FOUND HER!', TMsgType.Warning);
// i found her!
- result := Byte(rwidx);
+ result := Byte(i);
resetWeaponQueue();
- //FNextWeapDelay := 10; // anyway, 'cause why not; k8: not needed anymore
+ FNextWeapDelay := WEAPON_DELAY; // anyway, 'cause why not
exit;
end;
end;
-
// no suitable weapon found, so reset the queue, to avoid accidental "queuing" of weapon w/o ammo
resetWeaponQueue();
end;
begin
//e_WriteLog(Format('***RealizeCurrentWeapon: FNextWeap=%x; FNextWeapDelay=%d', [FNextWeap, FNextWeapDelay]), MSG_WARNING);
//FNextWeap := FNextWeap and $1FFF;
- //HACK: alteration delay will be reset when player released any weapon switch key
- FNextWeapDelay := 0; //k8: just in case
- //if FNextWeapDelay > 0 then Dec(FNextWeapDelay); // "alteration delay"
+ if FNextWeapDelay > 0 then Dec(FNextWeapDelay); // "alteration delay"
if not switchAllowed then
begin
if nw > High(FWeapon) then
begin
// don't forget to reset queue here!
- //e_WriteLog(Format(' RealizeCurrentWeapon: WUTAFUUUU?! (%d)', [nw]), TMsgType.Warning);
+ //e_WriteLog(' RealizeCurrentWeapon: WUTAFUUUU', MSG_WARNING);
resetWeaponQueue();
exit;
end;
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;
procedure TPlayer.NextWeapon();
begin
- //if g_Game_IsClient then Exit;
+ if g_Game_IsClient then Exit;
FNextWeap := $8000;
end;
procedure TPlayer.PrevWeapon();
begin
- //if g_Game_IsClient then Exit;
+ if g_Game_IsClient then Exit;
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;
Result := True;
remove := True;
FFireTime := 0;
- //k8:do we need it? if g_Game_IsNet and g_Game_IsServer then MH_SEND_PlayerStats(FUID);
end;
if FHealth < PLAYER_HP_SOFT then
begin
FMonsterKills := 0;
FDeath := 0;
FSecrets := 0;
- //FCurrFrameIdx := 0;
- //FNetForceWeap := FCurrWeap;
- FNetForceWeapFIdx := 0;
if FNoRespawn then
begin
FSpectator := False;
FLastHit := 0;
FLastFrag := 0;
FComboEvnt := -1;
- FNetForceWeapFIdx := 0;
SetFlag(FLAG_NONE);
SetAction(A_STAND, True);
FShellTimer := -1;
FPain := 0;
FLastHit := 0;
- //FNetForceWeap := FCurrWeap;
- FNetForceWeapFIdx := 0;
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;
DoLerp(4);
if NetServer then
- begin
if FClientID >= 0 then
begin
FPing := NetClients[FClientID].Peer^.lastRoundTripTime;
FPing := 0;
FLoss := 0;
end;
- end;
if FAlive and (FPunchAnim <> nil) then
FPunchAnim.Update();
end;
// no need to do that each second frame, weapon queue will take care of it
- if FAlive and FKeys[KEY_NEXTWEAPON].Pressed {and AnyServer} then NextWeapon();
- if FAlive and FKeys[KEY_PREVWEAPON].Pressed {and AnyServer} then PrevWeapon();
+ if FAlive and FKeys[KEY_NEXTWEAPON].Pressed and AnyServer then NextWeapon();
+ if FAlive and FKeys[KEY_PREVWEAPON].Pressed and AnyServer then PrevWeapon();
if gTime mod (GAME_TICK*2) <> 0 then
begin
function TPlayer.GetFlag(Flag: Byte): Boolean;
var
s, ts: String;
- evtype: Byte;
+ evtype, a: Byte;
begin
Result := False;
g_Map_ResetFlag(FFlag);
g_Game_Message(Format(_lc[I_MESSAGE_FLAG_CAPTURE], [AnsiUpperCase(s)]), 144);
+ if ((Self = gPlayer1) or (Self = gPlayer2)
+ or ((gPlayer1 <> nil) and (gPlayer1.Team = FTeam))
+ or ((gPlayer2 <> nil) and (gPlayer2.Team = FTeam))) then
+ a := 0
+ else
+ a := 1;
+
+ if not sound_cap_flag[a].IsPlaying() then
+ sound_cap_flag[a].Play();
+
gTeamStat[FTeam].Goals := gTeamStat[FTeam].Goals + 1;
Result := True;
g_Map_ResetFlag(Flag);
g_Game_Message(Format(_lc[I_MESSAGE_FLAG_RETURN], [AnsiUpperCase(s)]), 144);
+ if ((Self = gPlayer1) or (Self = gPlayer2)
+ or ((gPlayer1 <> nil) and (gPlayer1.Team = FTeam))
+ or ((gPlayer2 <> nil) and (gPlayer2.Team = FTeam))) then
+ a := 0
+ else
+ a := 1;
+
+ if not sound_ret_flag[a].IsPlaying() then
+ sound_ret_flag[a].Play();
+
Result := True;
if g_Game_IsNet then
begin
gFlags[Flag].State := FLAG_STATE_CAPTURED;
+ if ((Self = gPlayer1) or (Self = gPlayer2)
+ or ((gPlayer1 <> nil) and (gPlayer1.Team = FTeam))
+ or ((gPlayer2 <> nil) and (gPlayer2.Team = FTeam))) then
+ a := 0
+ else
+ a := 1;
+
+ if not sound_get_flag[a].IsPlaying() then
+ sound_get_flag[a].Play();
+
Result := True;
if g_Game_IsNet then
begin
FModel.SetFlag(FFlag);
end;
-function TPlayer.DropFlag(): Boolean;
+function TPlayer.DropFlag(Silent: Boolean = True): Boolean;
var
s: String;
+ a: Byte;
begin
Result := False;
if (not g_Game_IsServer) or (FFlag = FLAG_NONE) then
g_Console_Add(Format(_lc[I_PLAYER_FLAG_DROP], [FName, s]), True);
g_Game_Message(Format(_lc[I_MESSAGE_FLAG_DROP], [AnsiUpperCase(s)]), 144);
+ if ((Self = gPlayer1) or (Self = gPlayer2)
+ or ((gPlayer1 <> nil) and (gPlayer1.Team = FTeam))
+ or ((gPlayer2 <> nil) and (gPlayer2.Team = FTeam))) then
+ a := 0
+ else
+ a := 1;
+
+ if (not Silent) and (not sound_lost_flag[a].IsPlaying()) then
+ sound_lost_flag[a].Play();
+
if g_Game_IsNet then
MH_SEND_FlagEvent(FLAG_STATE_DROPPED, Flag, FUID, False);
end;
end;
end;
-procedure TPlayer.ReleaseKeysNoWeapon();
-var
- a: Integer;
-begin
- for a := Low(FKeys) to High(FKeys) do
- begin
- if (a = KEY_PREVWEAPON) or (a = KEY_NEXTWEAPON) then continue;
- FKeys[a].Pressed := False;
- FKeys[a].Time := 0;
- end;
-end;
-
procedure TPlayer.OnDamage(Angle: SmallInt);
begin
end;
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;
end;
end;
- //HACK! (does it belong there?)
+ //HACK! (does it belongs there?)
RealizeCurrentWeapon();
// Åñëè åñòü âîçìîæíûå öåëè: