X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=9351a9d38b6937455c5f9d50233b4f0ca071cbc4;hb=2587eb5662fe075d616c89950be655d15fee15d6;hp=980aec736c8905ea0c91ba5392caa2a70468aad8;hpb=ec8ff55f97b6159f646c6e120a64a323d9fe8189;p=d2df-sdl.git diff --git a/src/game/g_player.pas b/src/game/g_player.pas index 980aec7..9351a9d 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -162,8 +162,11 @@ 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 + FNextWeapDelay: Byte; // frames (unused) FBFGFireCounter: SmallInt; FLastSpawnerUID: Word; FLastHit: Byte; @@ -200,6 +203,9 @@ type 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; @@ -271,9 +277,10 @@ 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); + procedure SetWeaponHost(W: Byte); function IsKeyPressed(K: Byte): Boolean; function GetKeys(): Byte; function PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean; virtual; @@ -310,6 +317,7 @@ type procedure DrawPickup(); procedure DrawRulez(); procedure DrawAim(); + procedure DrawIndicator(); procedure DrawBubble(); procedure DrawGUI(); procedure Update(); virtual; @@ -333,6 +341,11 @@ type 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; @@ -348,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; @@ -542,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; @@ -901,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); // ...è ïàóçà @@ -1354,7 +1372,9 @@ begin begin if gPlayers[i] is TPlayer then begin + //if (gPlayers[i].NetForceWeapFIdx > gTime) then writeln('*** PLAYER #', i, '; gTime=', gTime, '; nfwf=', gPlayers[i].NetForceWeapFIdx); gPlayers[i].Update(); + if (not gPlayers[i].alive) or (gPlayers[i].NetForceWeapFIdx >= gTime+15) then gPlayers[i].NetForceWeapFIdx := 0; // just in case gPlayers[i].RealizeCurrentWeapon(); // WARNING! DO NOT MOVE THIS INTO `Update()`! end else @@ -2127,9 +2147,57 @@ 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; @@ -2273,6 +2341,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; @@ -3537,7 +3624,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; @@ -3640,6 +3727,13 @@ begin WEAPON_FLAMETHROWER = 10; *) + { + if (FNextWeap <> 0) or (FNextWeapDelay <> 0) then + begin + e_WriteLog(Format('!!! FNextWeap=%04x; FNextWeapDelay=%d', [FNextWeap, FNextWeapDelay]), TMsgType.Warning); + end; + } + // cycling has priority if (FNextWeap and $C000) <> 0 then begin @@ -3659,7 +3753,7 @@ begin begin //e_WriteLog(Format(' SWITCH: cur=%d; new=%d (dir=%d; log=%d)', [FCurrWeap, rwidx, dir, cwi]), TMsgType.Warning); result := Byte(rwidx); - FNextWeapDelay := 10; + //FNextWeapDelay := 10; //k8: not needed anymore exit; end; end; @@ -3726,7 +3820,7 @@ begin // i found her! result := Byte(rwidx); resetWeaponQueue(); - FNextWeapDelay := 10; // anyway, 'cause why not + //FNextWeapDelay := 10; // anyway, 'cause why not; k8: not needed anymore exit; end; end; @@ -3756,15 +3850,20 @@ var begin //e_WriteLog(Format('***RealizeCurrentWeapon: FNextWeap=%x; FNextWeapDelay=%d', [FNextWeap, FNextWeapDelay]), MSG_WARNING); //FNextWeap := FNextWeap and $1FFF; - if FNextWeapDelay > 0 then Dec(FNextWeapDelay); // "alteration delay" + //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 not switchAllowed then begin + //writeln('WEAPON SWITCHING IS NOT ALLOWED! FBFGFireCounter=', FBFGFireCounter, '; gTime=', gTime, '; FTime[T_SWITCH]=', FTime[T_SWITCH]); //HACK for weapon cycling if (FNextWeap and $E000) <> 0 then FNextWeap := 0; exit; end; + if (FNetForceWeapFIdx >= gTime+15) then FNetForceWeapFIdx := 0; + nw := getNextWeaponIndex(); if nw = 255 then exit; // don't reset anything here if nw > High(FWeapon) then @@ -3777,35 +3876,51 @@ 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; -procedure TPlayer.SetWeapon(W: Byte); +// used exclusively by network layer +procedure TPlayer.SetWeaponHost(W: Byte); begin + if (W > High(FWeapon)) then exit; + if (not FWeapon[W]) then exit; // server is authority! + 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; @@ -4164,6 +4279,7 @@ begin if allowBerserkSwitching then begin FCurrWeap := WEAPON_KASTET; + //FNetForceWeap := FCurrWeap; resetWeaponQueue(); FModel.SetWeapon(WEAPON_KASTET); end; @@ -4260,6 +4376,8 @@ begin end; procedure TPlayer.Reset(Force: Boolean); +var + i: Integer; begin if Force then FAlive := False; @@ -4277,6 +4395,10 @@ begin FMonsterKills := 0; FDeath := 0; FSecrets := 0; + //FCurrFrameIdx := 0; + //FNetForceWeap := FCurrWeap; + FNetForceWeapFIdx := 0; + resetWeaponQueue(); if FNoRespawn then begin FSpectator := False; @@ -4287,10 +4409,16 @@ begin end; FLives := gGameSettings.MaxLives; + FBFGFireCounter := -1; + FTime[T_SWITCH] := 0; + for i := WP_FIRST to WP_LAST do FReloading[i] := 0; + SetFlag(FLAG_NONE); end; procedure TPlayer.SoftReset(); +var + i: Integer; begin ReleaseKeys(); @@ -4302,6 +4430,12 @@ begin FLastHit := 0; FLastFrag := 0; FComboEvnt := -1; + FNetForceWeapFIdx := 0; + resetWeaponQueue(); + + FBFGFireCounter := -1; + FTime[T_SWITCH] := 0; + for i := WP_FIRST to WP_LAST do FReloading[i] := 0; SetFlag(FLAG_NONE); SetAction(A_STAND, True); @@ -4462,12 +4596,20 @@ var a, b, c: Byte; Anim: TAnimation; ID: DWORD; + i: Integer; begin FIncCam := 0; FBFGFireCounter := -1; FShellTimer := -1; FPain := 0; FLastHit := 0; + //FNetForceWeap := FCurrWeap; + FNetForceWeapFIdx := 0; + resetWeaponQueue(); + + FBFGFireCounter := -1; + FTime[T_SWITCH] := 0; + for i := WP_FIRST to WP_LAST do FReloading[i] := 0; if not g_Game_IsServer then Exit; @@ -4531,6 +4673,8 @@ begin FWeapon[WEAPON_PISTOL] := True; FWeapon[WEAPON_KASTET] := True; FCurrWeap := WEAPON_PISTOL; + //FNetForceWeap := FCurrWeap; + FNetForceWeapFIdx := 0; resetWeaponQueue(); FModel.SetWeapon(FCurrWeap); @@ -4610,6 +4754,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); @@ -4902,6 +5048,8 @@ var AnyServer: Boolean; SetSpect: Boolean; begin + //Inc(FCurrFrameIdx); + NetServer := g_Game_IsNet and g_Game_IsServer; AnyServer := g_Game_IsServer; @@ -4912,6 +5060,7 @@ begin DoLerp(4); if NetServer then + begin if FClientID >= 0 then begin FPing := NetClients[FClientID].Peer^.lastRoundTripTime; @@ -4924,6 +5073,7 @@ begin FPing := 0; FLoss := 0; end; + end; if FAlive and (FPunchAnim <> nil) then FPunchAnim.Update(); @@ -4954,8 +5104,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 @@ -5775,6 +5925,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; @@ -5818,6 +5980,7 @@ begin FAir := FSavedState.Air; FJetFuel := FSavedState.JetFuel; FCurrWeap := FSavedState.CurrWeap; + //FNetForceWeap := FCurrWeap; FNextWeap := FSavedState.NextWeap; FNextWeapDelay := FSavedState.NextWeapDelay; @@ -5988,6 +6151,7 @@ begin FSecrets := utils.readLongInt(st); // Òåêóùåå îðóæèå FCurrWeap := utils.readByte(st); + //FNetForceWeap := FCurrWeap; // Æåëàåìîå îðóæèå FNextWeap := utils.readWord(st); // ...è ïàóçà @@ -6123,6 +6287,8 @@ begin if FBFGFireCounter < 1 then begin FCurrWeap := WEAPON_KASTET; + //FNetForceWeap := FCurrWeap; + FNetForceWeapFIdx := 0; resetWeaponQueue(); FModel.SetWeapon(WEAPON_KASTET); end; @@ -6551,6 +6717,7 @@ begin FAIFlags := nil; FSelectedWeapon := FCurrWeap; + FNetForceWeapFIdx := 0; resetWeaponQueue(); FTargetUID := 0; end; @@ -6981,7 +7148,7 @@ begin end; end; - //HACK! (does it belongs there?) + //HACK! (does it belong there?) RealizeCurrentWeapon(); // Åñëè åñòü âîçìîæíûå öåëè: