X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=9aa72a832c3c6d2cf52adfdb1ac70adcee3565cf;hb=ee1df96f7123dcf3cdf0b0527cf7a790ec9d8d64;hp=759450b25be60295da39a099a2a12d68e6ac2bdf;hpb=546a929a401a64c32fda3380c3fe71306fd54eb1;p=d2df-sdl.git diff --git a/src/game/g_player.pas b/src/game/g_player.pas index 759450b..9aa72a8 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -3381,7 +3381,8 @@ begin if SpawnerUID = FUID then begin // Ñàìîóáèëñÿ - if Srv and (DoFrags or (gGameSettings.GameMode = GM_TDM)) then + if Srv and (gGameSettings.GameMode = GM_TDM) then + Dec(gTeamStat[FTeam].Goals); begin Dec(FFrags); FLastFrag := 0; @@ -3877,6 +3878,8 @@ function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean var a: Boolean; + switchWeapon: Byte; + hadWeapon: Boolean; begin Result := False; if g_Game_IsClient then Exit; @@ -3884,7 +3887,6 @@ begin // a = true - ìåñòî ñïàâíà ïðåäìåòà: a := LongBool(gGameSettings.Options and GAME_OPTION_WEAPONSTAY) and arespawn; remove := not a; - case ItemType of ITEM_MEDKIT_SMALL: if (FHealth < PLAYER_HP_SOFT) or (FFireTime > 0) then @@ -3950,6 +3952,8 @@ begin ITEM_WEAPON_SAW: if (not FWeapon[WEAPON_SAW]) or ((not arespawn) and (gGameSettings.GameMode in [GM_DM, GM_TDM, GM_CTF])) then begin + hadWeapon := FWeapon[WEAPON_SAW]; + switchWeapon := WEAPON_SAW; FWeapon[WEAPON_SAW] := True; Result := True; if gFlash = 2 then Inc(FPickup, 5); @@ -3961,7 +3965,8 @@ begin begin // Íóæíî, ÷òîáû íå âçÿòü âñå ïóëè ñðàçó: if a and FWeapon[WEAPON_SHOTGUN1] then Exit; - + hadWeapon := FWeapon[WEAPON_SHOTGUN1]; + switchWeapon := WEAPON_SHOTGUN1; IncMax(FAmmo[A_SHELLS], 4, FMaxAmmo[A_SHELLS]); FWeapon[WEAPON_SHOTGUN1] := True; Result := True; @@ -3973,7 +3978,8 @@ begin if (FAmmo[A_SHELLS] < FMaxAmmo[A_SHELLS]) or not FWeapon[WEAPON_SHOTGUN2] then begin if a and FWeapon[WEAPON_SHOTGUN2] then Exit; - + hadWeapon := FWeapon[WEAPON_SHOTGUN2]; + switchWeapon := WEAPON_SHOTGUN2; IncMax(FAmmo[A_SHELLS], 4, FMaxAmmo[A_SHELLS]); FWeapon[WEAPON_SHOTGUN2] := True; Result := True; @@ -3985,7 +3991,8 @@ begin if (FAmmo[A_BULLETS] < FMaxAmmo[A_BULLETS]) or not FWeapon[WEAPON_CHAINGUN] then begin if a and FWeapon[WEAPON_CHAINGUN] then Exit; - + hadWeapon := FWeapon[WEAPON_CHAINGUN]; + switchWeapon := WEAPON_CHAINGUN; IncMax(FAmmo[A_BULLETS], 50, FMaxAmmo[A_BULLETS]); FWeapon[WEAPON_CHAINGUN] := True; Result := True; @@ -3997,7 +4004,8 @@ begin if (FAmmo[A_ROCKETS] < FMaxAmmo[A_ROCKETS]) or not FWeapon[WEAPON_ROCKETLAUNCHER] then begin if a and FWeapon[WEAPON_ROCKETLAUNCHER] then Exit; - + switchWeapon := WEAPON_ROCKETLAUNCHER; + hadWeapon := FWeapon[WEAPON_ROCKETLAUNCHER]; IncMax(FAmmo[A_ROCKETS], 2, FMaxAmmo[A_ROCKETS]); FWeapon[WEAPON_ROCKETLAUNCHER] := True; Result := True; @@ -4009,7 +4017,8 @@ begin if (FAmmo[A_CELLS] < FMaxAmmo[A_CELLS]) or not FWeapon[WEAPON_PLASMA] then begin if a and FWeapon[WEAPON_PLASMA] then Exit; - + switchWeapon := WEAPON_PLASMA; + hadWeapon := FWeapon[WEAPON_PLASMA]; IncMax(FAmmo[A_CELLS], 40, FMaxAmmo[A_CELLS]); FWeapon[WEAPON_PLASMA] := True; Result := True; @@ -4021,7 +4030,8 @@ begin if (FAmmo[A_CELLS] < FMaxAmmo[A_CELLS]) or not FWeapon[WEAPON_BFG] then begin if a and FWeapon[WEAPON_BFG] then Exit; - + switchWeapon := WEAPON_BFG; + hadWeapon := FWeapon[WEAPON_BFG]; IncMax(FAmmo[A_CELLS], 40, FMaxAmmo[A_CELLS]); FWeapon[WEAPON_BFG] := True; Result := True; @@ -4033,7 +4043,8 @@ begin if (FAmmo[A_SHELLS] < FMaxAmmo[A_SHELLS]) or not FWeapon[WEAPON_SUPERPULEMET] then begin if a and FWeapon[WEAPON_SUPERPULEMET] then Exit; - + switchWeapon := WEAPON_SUPERPULEMET; + hadWeapon := FWeapon[WEAPON_SUPERPULEMET]; IncMax(FAmmo[A_SHELLS], 4, FMaxAmmo[A_SHELLS]); FWeapon[WEAPON_SUPERPULEMET] := True; Result := True; @@ -4045,7 +4056,8 @@ begin if (FAmmo[A_FUEL] < FMaxAmmo[A_FUEL]) or not FWeapon[WEAPON_FLAMETHROWER] then begin if a and FWeapon[WEAPON_FLAMETHROWER] then Exit; - + switchWeapon := WEAPON_FLAMETHROWER; + hadWeapon := FWeapon[WEAPON_FLAMETHROWER]; IncMax(FAmmo[A_FUEL], 100, FMaxAmmo[A_FUEL]); FWeapon[WEAPON_FLAMETHROWER] := True; Result := True; @@ -4219,11 +4231,33 @@ begin if not (R_BERSERK in FRulez) then begin Include(FRulez, R_BERSERK); + (* if allowBerserkSwitching then begin FCurrWeap := WEAPON_KASTET; resetWeaponQueue(); FModel.SetWeapon(WEAPON_KASTET); + end; *) + if ( (g_Game_IsNet = False) or (NetMode = NET_SERVER) ) and ( ( (Self = gPlayer1) and (gPlayer1Settings.WeaponSwitch <> 0) ) or ( (gPlayer2 <> nil) and (Self = gPlayer2) and (gPlayer2Settings.WeaponSwitch <> 0) )) then + begin + if (Self = gPlayer1) then + begin + if (gPlayer1Settings.WeaponSwitch = 1) or ( (gPlayer1Settings.WeaponSwitch = 2) and (gPlayer1Settings.WeaponPreferences[WP_LAST+1] > gPlayer1Settings.WeaponPreferences[FCurrWeap]) ) then + begin + FCurrWeap := WEAPON_KASTET; + resetWeaponQueue(); + FModel.SetWeapon(WEAPON_KASTET); + end; + end + else + begin + if (gPlayer2Settings.WeaponSwitch = 1) or ( (gPlayer2Settings.WeaponSwitch = 2) and (gPlayer2Settings.WeaponPreferences[WP_LAST+1] > gPlayer2Settings.WeaponPreferences[FCurrWeap]) ) then + begin + FCurrWeap := WEAPON_KASTET; + resetWeaponQueue(); + FModel.SetWeapon(WEAPON_KASTET); + end; + end; end; if gFlash <> 0 then begin @@ -4292,6 +4326,26 @@ begin if gFlash = 2 then Inc(FPickup, 5); end; end; + if ( (g_Game_IsNet = False) or (NetMode = NET_SERVER) ) and ( ( (Self = gPlayer1) and (gPlayer1Settings.WeaponSwitch <> 0) ) or ( (gPlayer2 <> nil) and (Self = gPlayer2) and (gPlayer2Settings.WeaponSwitch <> 0) )) then + begin + if (hadWeapon = False) then + begin + if (Self = gPlayer1) and ( (gPlayer1Settings.WeaponSwitch = 1) or ( (gPlayer1Settings.WeaponSwitch = 2) + and (gPlayer1Settings.WeaponPreferences[switchWeapon] > gPlayer1Settings.WeaponPreferences[FCurrWeap]) ) ) then + begin + FCurrWeap := switchWeapon; + resetWeaponQueue(); + FModel.SetWeapon(switchWeapon); + end + else if (Self = gPlayer2) and ( (gPlayer2Settings.WeaponSwitch = 1) or ( (gPlayer2Settings.WeaponSwitch = 2) + and (gPlayer2Settings.WeaponPreferences[switchWeapon] > gPlayer2Settings.WeaponPreferences[FCurrWeap]) ) ) then + begin + FCurrWeap := switchWeapon; + resetWeaponQueue(); + FModel.SetWeapon(switchWeapon); + end; + end; + end; end; procedure TPlayer.Touch(); @@ -4927,7 +4981,7 @@ begin DoLerp(4); if NetServer then - if FClientID >= 0 then + if (FClientID >= 0) and (NetClients[FClientID].Peer <> nil) then begin FPing := NetClients[FClientID].Peer^.lastRoundTripTime; if NetClients[FClientID].Peer^.packetsSent > 0 then