X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=5968cd1f4058e606d44ce0a45f9b2cc882cd4cc0;hb=c467a8913c6e2075633c2a5454e692cc94a4be0a;hp=4604b3c95f5a1f9ed2250ebed552b4e5ffc53f23;hpb=7c0186b3f1e66e80377d14364f0cec949e44e615;p=d2df-sdl.git diff --git a/src/game/g_player.pas b/src/game/g_player.pas index 4604b3c..5968cd1 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -162,6 +162,9 @@ type 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; @@ -274,6 +277,7 @@ type 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); @@ -313,6 +317,7 @@ type procedure DrawPickup(); procedure DrawRulez(); procedure DrawAim(); + procedure DrawIndicator(); procedure DrawBubble(); procedure DrawGUI(); procedure Update(); virtual; @@ -356,6 +361,9 @@ type 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; @@ -550,6 +558,7 @@ var gFly: Boolean = False; gAimLine: Boolean = False; gChatBubble: Byte = 0; + gPlayerIndicator: Boolean = True; gNumBots: Word = 0; gLMSPID1: Word = 0; gLMSPID2: Word = 0; @@ -909,6 +918,7 @@ begin gPlayers[a].FSecrets := utils.readLongInt(st); // Òåêóùåå îðóæèå gPlayers[a].FCurrWeap := utils.readByte(st); + //gPlayers[a].FNetForceWeap := gPlayers[a].FCurrWeap; // Ñëåäóþùåå æåëàåìîå îðóæèå gPlayers[a].FNextWeap := utils.readWord(st); // ...è ïàóçà @@ -1363,7 +1373,10 @@ begin 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 @@ -2135,6 +2148,10 @@ begin FJustTeleported := False; FNetTime := 0; + //FNetForceWeap := FCurrWeap; + FNetForceWeapFIdx := 0; + //FCurrFrameIdx := 0; + resetWeaponQueue(); releaseAllWeaponSwitchKeys(); end; @@ -2325,6 +2342,25 @@ begin 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; @@ -3589,7 +3625,7 @@ end; 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; @@ -3831,35 +3867,48 @@ 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; + 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); - resetWeaponQueue(); + //if g_Game_IsClient then resetWeaponQueue(); end; function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean; @@ -4218,6 +4267,7 @@ begin if allowBerserkSwitching then begin FCurrWeap := WEAPON_KASTET; + //FNetForceWeap := FCurrWeap; resetWeaponQueue(); FModel.SetWeapon(WEAPON_KASTET); end; @@ -4331,6 +4381,9 @@ begin FMonsterKills := 0; FDeath := 0; FSecrets := 0; + //FCurrFrameIdx := 0; + //FNetForceWeap := FCurrWeap; + //FNetForceWeapFIdx := 0; if FNoRespawn then begin FSpectator := False; @@ -4522,6 +4575,7 @@ begin FShellTimer := -1; FPain := 0; FLastHit := 0; + //FNetForceWeap := FCurrWeap; if not g_Game_IsServer then Exit; @@ -4585,6 +4639,7 @@ begin FWeapon[WEAPON_PISTOL] := True; FWeapon[WEAPON_KASTET] := True; FCurrWeap := WEAPON_PISTOL; + //FNetForceWeap := FCurrWeap; resetWeaponQueue(); FModel.SetWeapon(FCurrWeap); @@ -4664,6 +4719,8 @@ begin if (gPlayer2 = nil) and (gLMSPID2 = FUID) then gPlayer2 := self; + //FNetForceWeap := FCurrWeap; + if g_Game_IsNet then begin MH_SEND_PlayerPos(True, FUID, NET_EVERYONE); @@ -4956,6 +5013,8 @@ var AnyServer: Boolean; SetSpect: Boolean; begin + //Inc(FCurrFrameIdx); + NetServer := g_Game_IsNet and g_Game_IsServer; AnyServer := g_Game_IsServer; @@ -4966,6 +5025,7 @@ begin DoLerp(4); if NetServer then + begin if FClientID >= 0 then begin FPing := NetClients[FClientID].Peer^.lastRoundTripTime; @@ -4978,6 +5038,7 @@ begin FPing := 0; FLoss := 0; end; + end; if FAlive and (FPunchAnim <> nil) then FPunchAnim.Update(); @@ -5008,8 +5069,8 @@ begin 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 @@ -5829,6 +5890,18 @@ begin 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; @@ -5872,6 +5945,7 @@ begin FAir := FSavedState.Air; FJetFuel := FSavedState.JetFuel; FCurrWeap := FSavedState.CurrWeap; + //FNetForceWeap := FCurrWeap; FNextWeap := FSavedState.NextWeap; FNextWeapDelay := FSavedState.NextWeapDelay; @@ -6042,6 +6116,7 @@ begin FSecrets := utils.readLongInt(st); // Òåêóùåå îðóæèå FCurrWeap := utils.readByte(st); + //FNetForceWeap := FCurrWeap; // Æåëàåìîå îðóæèå FNextWeap := utils.readWord(st); // ...è ïàóçà @@ -6177,6 +6252,7 @@ begin if FBFGFireCounter < 1 then begin FCurrWeap := WEAPON_KASTET; + //FNetForceWeap := FCurrWeap; resetWeaponQueue(); FModel.SetWeapon(WEAPON_KASTET); end; @@ -7035,7 +7111,7 @@ begin end; end; - //HACK! (does it belongs there?) + //HACK! (does it belong there?) RealizeCurrentWeapon(); // Åñëè åñòü âîçìîæíûå öåëè: