X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=d4b6bdd3691f03593806e6ec41f59dde424813bb;hb=bba5c4a7b77b3be25c3b872b21c96e28a57cee32;hp=189d241aae564c6fcd0489e9c0f7f8e4a2105509;hpb=c97b4f7894fd3d797ecea3de574b58499c43aa85;p=d2df-sdl.git diff --git a/src/game/g_player.pas b/src/game/g_player.pas index 189d241..d4b6bdd 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -95,12 +95,16 @@ const PLAYER_AP_SOFT = 100; PLAYER_AP_LIMIT = 200; SUICIDE_DAMAGE = 112; + WEAPON_DELAY = 5; + + PLAYER_BURN_TIME = 110; PLAYER1_DEF_COLOR: TRGB = (R:64; G:175; B:48); PLAYER2_DEF_COLOR: TRGB = (R:96; G:96; B:96); type TPlayerStat = record + Num: Integer; Ping: Word; Loss: Byte; Name: String; @@ -162,9 +166,8 @@ type FFlag: Byte; FSecrets: Integer; FCurrWeap: Byte; - FNetWeapCtr: LongWord; // spam server with our current weapon until we'll receive this in plrpos packet FNextWeap: WORD; - FNextWeapDelay: Byte; // frames (unused) + FNextWeapDelay: Byte; // frames FBFGFireCounter: SmallInt; FLastSpawnerUID: Word; FLastHit: Byte; @@ -191,6 +194,9 @@ type FSawSoundIdle: TPlayableSound; FSawSoundHit: TPlayableSound; FSawSoundSelect: TPlayableSound; + FFlameSoundOn: TPlayableSound; + FFlameSoundOff: TPlayableSound; + FFlameSoundWork: TPlayableSound; FJetSoundOn: TPlayableSound; FJetSoundOff: TPlayableSound; FJetSoundFly: TPlayableSound; @@ -201,9 +207,6 @@ 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; @@ -256,19 +259,21 @@ type FWantsInGame: Boolean; FGhost: Boolean; FPhysics: Boolean; + FFlaming: Boolean; FJetpack: Boolean; FActualModelName: string; FClientID: SmallInt; FPing: Word; FLoss: Byte; + FReady: Boolean; FDummy: Boolean; FFireTime: Integer; + FHandicap: Integer; // debug: viewport offset viewPortX, viewPortY, viewPortW, viewPortH: Integer; function isValidViewPort (): Boolean; inline; - procedure SetCurrWeapProp (newweap: Byte); constructor Create(); virtual; destructor Destroy(); override; @@ -276,10 +281,9 @@ type function GetRespawnPoint(): Byte; procedure PressKey(Key: Byte; Time: Word = 1); procedure ReleaseKeys(); - procedure ReleaseKeysNoWeapon(); procedure SetModel(ModelName: String); procedure SetColor(Color: TRGB); - procedure SetWeaponHost(W: Byte); + procedure SetWeapon(W: Byte); function IsKeyPressed(K: Byte): Boolean; function GetKeys(): Byte; function PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean; virtual; @@ -297,7 +301,7 @@ type 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(); @@ -316,6 +320,7 @@ type procedure DrawPickup(); procedure DrawRulez(); procedure DrawAim(); + procedure DrawIndicator(); procedure DrawBubble(); procedure DrawGUI(); procedure Update(); virtual; @@ -329,9 +334,11 @@ type procedure SetLerp(XTo, YTo: Integer); procedure QueueWeaponSwitch(Weapon: Byte); procedure RealizeCurrentWeapon(); + procedure FlamerOn; + procedure FlamerOff; procedure JetpackOn; procedure JetpackOff; - procedure CatchFire(Attacker: Word); + procedure CatchFire(Attacker: Word; Timeout: Integer = PLAYER_BURN_TIME); //WARNING! this does nothing for now, but still call it! procedure positionChanged (); //WARNING! call this after entity position was changed, or coldet will not work right! @@ -339,11 +346,6 @@ 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; @@ -358,8 +360,7 @@ type property Frags: Integer read FFrags write FFrags; property Death: Integer read FDeath write FDeath; property Kills: Integer read FKills write FKills; - property CurrWeap: Byte read FCurrWeap write SetCurrWeapProp; - property NetWeapCtr: LongWord read FNetWeapCtr write FNetWeapCtr; + property CurrWeap: Byte read FCurrWeap write FCurrWeap; property MonsterKills: Integer read FMonsterKills write FMonsterKills; property Secrets: Integer read FSecrets; property GodMode: Boolean read FGodMode write FGodMode; @@ -390,7 +391,7 @@ type property eFrags: Integer read FFrags write FFrags; property eDeath: Integer read FDeath write FDeath; property eKills: Integer read FKills write FKills; - property eCurrWeap: Byte read FCurrWeap write SetCurrWeapProp; + property eCurrWeap: Byte read FCurrWeap write FCurrWeap; property eMonsterKills: Integer read FMonsterKills write FMonsterKills; property eSecrets: Integer read FSecrets write FSecrets; property eGodMode: Boolean read FGodMode write FGodMode; @@ -554,6 +555,7 @@ var gFly: Boolean = False; gAimLine: Boolean = False; gChatBubble: Byte = 0; + gPlayerIndicator: Boolean = True; gNumBots: Word = 0; gLMSPID1: Word = 0; gLMSPID2: Word = 0; @@ -595,8 +597,9 @@ procedure g_Player_DrawShells(); procedure g_Player_RemoveAllCorpses(); procedure g_Player_Corpses_SaveState (st: TStream); procedure g_Player_Corpses_LoadState (st: TStream); -procedure g_Bot_Add(Team, Difficult: Byte); -procedure g_Bot_AddList(Team: Byte; lname: ShortString; num: Integer = -1); +procedure g_Player_ResetReady(); +procedure g_Bot_Add(Team, Difficult: Byte; Handicap: Integer = 100); +procedure g_Bot_AddList(Team: Byte; lname: ShortString; num: Integer = -1; Handicap: Integer = 100); procedure g_Bot_MixNames(); procedure g_Bot_RemoveAll(); @@ -885,6 +888,8 @@ begin if b = 1 then gPlayers[a].FDirection := TDirection.D_LEFT else gPlayers[a].FDirection := TDirection.D_RIGHT; // b = 2 // Çäîðîâüå gPlayers[a].FHealth := utils.readLongInt(st); + // Ôîðà + gPlayers[a].FHandicap := utils.readLongInt(st); // Æèçíè gPlayers[a].FLives := utils.readByte(st); // Áðîíÿ @@ -913,7 +918,6 @@ begin gPlayers[a].FSecrets := utils.readLongInt(st); // Òåêóùåå îðóæèå gPlayers[a].FCurrWeap := utils.readByte(st); - gPlayers[a].FNetWeapCtr := 0; // Ñëåäóþùåå æåëàåìîå îðóæèå gPlayers[a].FNextWeap := utils.readWord(st); // ...è ïàóçà @@ -1007,7 +1011,7 @@ begin end; end; -procedure g_Bot_Add(Team, Difficult: Byte); +procedure g_Bot_Add(Team, Difficult: Byte; Handicap: Integer = 100); var m: SSArray; _name, _model: String; @@ -1096,6 +1100,8 @@ begin //FDifficult.SafeWeaponPrior[a] := WEAPON_PRIOR3[a]; end; + FHandicap := Handicap; + g_Console_Add(Format(_lc[I_PLAYER_JOIN], [Name]), True); if g_Game_IsNet then MH_SEND_PlayerCreate(UID); @@ -1104,7 +1110,7 @@ begin end; end; -procedure g_Bot_AddList(Team: Byte; lName: ShortString; num: Integer = -1); +procedure g_Bot_AddList(Team: Byte; lName: ShortString; num: Integer = -1; Handicap: Integer = 100); var m: SSArray; _name, _model: String; @@ -1167,6 +1173,8 @@ begin FDifficult.Cover := BotList[num].cover; FDifficult.CloseJump := BotList[num].close_jump; + FHandicap := Handicap; + for a := WP_FIRST to WP_LAST do begin FDifficult.WeaponPrior[a] := BotList[num].w_prior1[a]; @@ -1475,6 +1483,7 @@ begin SetLength(Result, Length(Result)+1); with Result[High(Result)] do begin + Num := a; Ping := gPlayers[a].FPing; Loss := gPlayers[a].FLoss; Name := gPlayers[a].FName; @@ -1489,6 +1498,22 @@ begin end; end; +procedure g_Player_ResetReady(); +var + a: Integer; +begin + if not g_Game_IsServer then Exit; + if gPlayers = nil then Exit; + + for a := 0 to High(gPlayers) do + if gPlayers[a] <> nil then + begin + gPlayers[a].FReady := False; + if g_Game_IsNet then + MH_SEND_GameEvent(NET_EV_INTER_READY, gPlayers[a].UID, 'N'); + end; +end; + procedure g_Player_RememberAll; var i: Integer; @@ -1952,19 +1977,6 @@ end; function TPlayer.isValidViewPort (): Boolean; inline; begin result := (viewPortW > 0) and (viewPortH > 0); end; -procedure TPlayer.SetCurrWeapProp (newweap: Byte); -begin - if (newweap > High(FWeapon)) then exit; - if (not FWeapon[newweap]) then exit; - if not g_Game_IsClient then Inc(FNetWeapCtr, 2); // just in case, to really override client's counter - if (FCurrWeap <> newweap) then - begin - if (newweap = WEAPON_SAW) then FSawSoundSelect.PlayAt(FObj.X, FObj.Y); - end; - FCurrWeap := newweap; - FModel.SetWeapon(newweap); -end; - procedure TPlayer.BFGHit(); begin g_Weapon_BFGHit(FObj.X+FObj.Rect.X+(FObj.Rect.Width div 2), @@ -2122,6 +2134,9 @@ begin FSawSoundIdle := TPlayableSound.Create(); FSawSoundHit := TPlayableSound.Create(); FSawSoundSelect := TPlayableSound.Create(); + FFlameSoundOn := TPlayableSound.Create(); + FFlameSoundOff := TPlayableSound.Create(); + FFlameSoundWork := TPlayableSound.Create(); FJetSoundFly := TPlayableSound.Create(); FJetSoundOn := TPlayableSound.Create(); FJetSoundOff := TPlayableSound.Create(); @@ -2130,6 +2145,9 @@ begin FSawSoundIdle.SetByName('SOUND_WEAPON_IDLESAW'); FSawSoundHit.SetByName('SOUND_WEAPON_HITSAW'); FSawSoundSelect.SetByName('SOUND_WEAPON_SELECTSAW'); + FFlameSoundOn.SetByName('SOUND_WEAPON_FLAMEON'); + FFlameSoundOff.SetByName('SOUND_WEAPON_FLAMEOFF'); + FFlameSoundWork.SetByName('SOUND_WEAPON_FLAMEWORK'); FJetSoundFly.SetByName('SOUND_PLAYER_JETFLY'); FJetSoundOn.SetByName('SOUND_PLAYER_JETON'); FJetSoundOff.SetByName('SOUND_PLAYER_JETOFF'); @@ -2143,6 +2161,7 @@ begin FFireTime := 0; FFirePainTime := 0; FFireAttacker := 0; + FHandicap := 100; FActualModelName := 'doomer'; @@ -2153,55 +2172,9 @@ begin FJustTeleported := False; FNetTime := 0; - FNetWeapCtr := 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; @@ -2335,6 +2308,10 @@ begin FSawSound.Free(); FSawSoundIdle.Free(); FSawSoundHit.Free(); + FSawSoundSelect.Free(); + FFlameSoundOn.Free(); + FFlameSoundOff.Free(); + FFlameSoundWork.Free(); FJetSoundFly.Free(); FJetSoundOn.Free(); FJetSoundOff.Free(); @@ -2345,6 +2322,25 @@ begin inherited; end; +procedure TPlayer.DrawIndicator(); +var + indX, indY: Integer; + indW, indH: Word; + ID: DWORD; +begin + if FAlive then + begin + if g_Texture_Get('TEXTURE_PLAYER_INDICATOR', ID) then + begin + e_GetTextureSize(ID, @indW, @indH); + indX := FObj.X + FObj.Rect.X + (FObj.Rect.Width - indW) div 2; + indY := FObj.Y; + e_Draw(ID, indX, indY - indH, 0, True, False); + end; + end; + //e_TextureFontPrint(indX, indY, FName, gStdFont); // Shows player name overhead +end; + procedure TPlayer.DrawBubble(); var bubX, bubY: Integer; @@ -2494,7 +2490,9 @@ begin 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 @@ -3093,11 +3091,17 @@ begin if FAmmo[A_FUEL] > 0 then begin g_Weapon_flame(wx, wy, xd, yd, FUID); + FlamerOn; FReloading[FCurrWeap] := WEAPON_RELOAD[FCurrWeap]; Dec(FAmmo[A_FUEL]); FFireAngle := FAngle; f := True; DidFire := True; + end + else + begin + FlamerOff; + if g_Game_IsNet and g_Game_IsServer then MH_SEND_PlayerStats(FUID); end; end; @@ -3141,6 +3145,35 @@ begin PANEL_WATER or PANEL_ACID1 or PANEL_ACID2, True); end; +procedure TPlayer.FlamerOn; +begin + FFlameSoundOff.Stop(); + FFlameSoundOff.SetPosition(0); + if FFlaming then + begin + if (not FFlameSoundOn.IsPlaying()) and (not FFlameSoundWork.IsPlaying()) then + FFlameSoundWork.PlayAt(FObj.X, FObj.Y); + end + else + begin + FFlameSoundOn.PlayAt(FObj.X, FObj.Y); + FFlaming := True; + end; +end; + +procedure TPlayer.FlamerOff; +begin + if FFlaming then + begin + FFlameSoundOn.Stop(); + FFlameSoundOn.SetPosition(0); + FFlameSoundWork.Stop(); + FFlameSoundWork.SetPosition(0); + FFlameSoundOff.PlayAt(FObj.X, FObj.Y); + FFlaming := False; + end; +end; + procedure TPlayer.JetpackOn; begin FJetSoundFly.Stop; @@ -3158,9 +3191,17 @@ begin FJetSoundOff.PlayAt(FObj.X, FObj.Y); end; -procedure TPlayer.CatchFire(Attacker: Word); +procedure TPlayer.CatchFire(Attacker: Word; Timeout: Integer = PLAYER_BURN_TIME); begin - FFireTime := 100; + if Timeout <= 0 then + exit; + if (FMegaRulez[MR_SUIT] > gTime) or (FMegaRulez[MR_INVUL] > gTime) then + exit; // Íå çàãîðàåìñÿ êîãäà åñòü çàùèòà + if g_Obj_CollidePanel(@FObj, 0, 0, PANEL_WATER or PANEL_ACID1 or PANEL_ACID2) then + exit; // Íå ïîäãîðàåì â âîäå íà âñÿêèé ñëó÷àé + if FFireTime <= 0 then + g_Sound_PlayExAt('SOUND_IGNITE', FObj.X, FObj.Y); + FFireTime := Timeout; FFireAttacker := Attacker; if g_Game_IsNet and g_Game_IsServer then MH_SEND_PlayerStats(FUID); @@ -3451,7 +3492,7 @@ begin end; // Âûáðîñ ôëàãà: - DropFlag(); + DropFlag(KillType = K_FALLKILL); end; g_Player_CreateCorpse(Self); @@ -3609,7 +3650,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; @@ -3625,8 +3666,8 @@ begin 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); @@ -3639,177 +3680,83 @@ function TPlayer.getNextWeaponIndex (): Byte; 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; - *) - - { - 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 - 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 * 2; // 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; @@ -3835,13 +3782,10 @@ var 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 - //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; @@ -3852,49 +3796,42 @@ 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? - Inc(FNetWeapCtr); 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); 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 exclusively by network layer -procedure TPlayer.SetWeaponHost(W: Byte); +procedure TPlayer.SetWeapon(W: Byte); begin - if (W > High(FWeapon)) then exit; - if (not FWeapon[W]) then exit; // server is authority! - if FCurrWeap <> W then - begin - if (W = WEAPON_SAW) then FSawSoundSelect.PlayAt(FObj.X, FObj.Y); - end; + if W = WEAPON_SAW then + FSawSoundSelect.PlayAt(FObj.X, FObj.Y); FCurrWeap := W; - FModel.SetWeapon(W); - //if g_Game_IsClient then resetWeaponQueue(); + FModel.SetWeapon(CurrWeap); + resetWeaponQueue(); end; function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean; @@ -3920,9 +3857,9 @@ begin case ItemType of ITEM_MEDKIT_SMALL: - if FHealth < PLAYER_HP_SOFT then + if (FHealth < PLAYER_HP_SOFT) or (FFireTime > 0) then begin - IncMax(FHealth, 10, PLAYER_HP_SOFT); + if FHealth < PLAYER_HP_SOFT then IncMax(FHealth, 10, PLAYER_HP_SOFT); Result := True; remove := True; FFireTime := 0; @@ -3930,9 +3867,9 @@ begin end; ITEM_MEDKIT_LARGE: - if FHealth < PLAYER_HP_SOFT then + if (FHealth < PLAYER_HP_SOFT) or (FFireTime > 0) then begin - IncMax(FHealth, 25, PLAYER_HP_SOFT); + if FHealth < PLAYER_HP_SOFT then IncMax(FHealth, 25, PLAYER_HP_SOFT); Result := True; remove := True; FFireTime := 0; @@ -3958,9 +3895,9 @@ begin end; ITEM_SPHERE_BLUE: - if FHealth < PLAYER_HP_LIMIT then + if (FHealth < PLAYER_HP_LIMIT) or (FFireTime > 0) then begin - IncMax(FHealth, 100, PLAYER_HP_LIMIT); + if FHealth < PLAYER_HP_LIMIT then IncMax(FHealth, 100, PLAYER_HP_LIMIT); Result := True; remove := True; FFireTime := 0; @@ -3968,7 +3905,7 @@ begin end; ITEM_SPHERE_WHITE: - if (FHealth < PLAYER_HP_LIMIT) or (FArmor < PLAYER_AP_LIMIT) then + if (FHealth < PLAYER_HP_LIMIT) or (FArmor < PLAYER_AP_LIMIT) or (FFireTime > 0) then begin if FHealth < PLAYER_HP_LIMIT then FHealth := PLAYER_HP_LIMIT; @@ -4173,7 +4110,7 @@ begin (FAmmo[A_SHELLS] < FMaxAmmo[A_SHELLS]) or (FAmmo[A_ROCKETS] < FMaxAmmo[A_ROCKETS]) or (FAmmo[A_CELLS] < FMaxAmmo[A_CELLS]) or - (FMaxAmmo[A_FUEL] < AmmoLimits[1, A_FUEL]) then + (FAmmo[A_FUEL] < FMaxAmmo[A_FUEL]) then begin FMaxAmmo[A_BULLETS] := AmmoLimits[1, A_BULLETS]; FMaxAmmo[A_SHELLS] := AmmoLimits[1, A_SHELLS]; @@ -4189,6 +4126,8 @@ begin IncMax(FAmmo[A_ROCKETS], 1, FMaxAmmo[A_ROCKETS]); if FAmmo[A_CELLS] < FMaxAmmo[A_CELLS] then IncMax(FAmmo[A_CELLS], 40, FMaxAmmo[A_CELLS]); + if FAmmo[A_FUEL] < FMaxAmmo[A_FUEL] then + IncMax(FAmmo[A_FUEL], 50, FMaxAmmo[A_FUEL]); FRulez := FRulez + [R_ITEM_BACKPACK]; Result := True; @@ -4252,7 +4191,7 @@ begin Include(FRulez, R_BERSERK); if allowBerserkSwitching then begin - CurrWeap := WEAPON_KASTET; + FCurrWeap := WEAPON_KASTET; resetWeaponQueue(); FModel.SetWeapon(WEAPON_KASTET); end; @@ -4265,11 +4204,10 @@ begin 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 + if (FHealth < PLAYER_HP_SOFT) or (FFireTime > 0) then begin - FHealth := PLAYER_HP_SOFT; + if FHealth < PLAYER_HP_SOFT then FHealth := PLAYER_HP_SOFT; FBerserk := gTime+30000; Result := True; remove := True; @@ -4287,9 +4225,9 @@ begin end; ITEM_BOTTLE: - if FHealth < PLAYER_HP_LIMIT then + if (FHealth < PLAYER_HP_LIMIT) or (FFireTime > 0) then begin - IncMax(FHealth, 4, PLAYER_HP_LIMIT); + if FHealth < PLAYER_HP_LIMIT then IncMax(FHealth, 4, PLAYER_HP_LIMIT); Result := True; remove := True; FFireTime := 0; @@ -4349,8 +4287,6 @@ begin end; procedure TPlayer.Reset(Force: Boolean); -var - i: Integer; begin if Force then FAlive := False; @@ -4368,8 +4304,7 @@ begin FMonsterKills := 0; FDeath := 0; FSecrets := 0; - if g_Game_IsClient then FNetWeapCtr := 0 else Inc(FNetWeapCtr, 2); - resetWeaponQueue(); + FReady := False; if FNoRespawn then begin FSpectator := False; @@ -4380,16 +4315,10 @@ 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(); @@ -4401,12 +4330,6 @@ begin FLastHit := 0; FLastFrag := 0; FComboEvnt := -1; - if g_Game_IsClient then FNetWeapCtr := 0 else Inc(FNetWeapCtr, 2); - 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); @@ -4567,19 +4490,12 @@ var a, b, c: Byte; Anim: TAnimation; ID: DWORD; - i: Integer; begin FIncCam := 0; FBFGFireCounter := -1; FShellTimer := -1; FPain := 0; FLastHit := 0; - if g_Game_IsClient then FNetWeapCtr := 0 else Inc(FNetWeapCtr, 2); - 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; @@ -4628,7 +4544,7 @@ begin // Âîñêðåøåíèå áåç îðóæèÿ: if not FAlive then begin - FHealth := PLAYER_HP_SOFT; + FHealth := Round(PLAYER_HP_SOFT * (FHandicap / 100)); FArmor := 0; FAlive := True; FAir := AIR_DEF; @@ -4642,10 +4558,11 @@ begin FWeapon[WEAPON_PISTOL] := True; FWeapon[WEAPON_KASTET] := True; - CurrWeap := WEAPON_PISTOL; - if g_Game_IsClient then FNetWeapCtr := 0 else Inc(FNetWeapCtr, 2); + FCurrWeap := WEAPON_PISTOL; resetWeaponQueue(); + FModel.SetWeapon(FCurrWeap); + for b := A_BULLETS to A_HIGH do FAmmo[b] := 0; @@ -4696,6 +4613,7 @@ begin FDamageBuffer := 0; FJetpack := False; FCanJetpack := False; + FFlaming := False; FFireTime := 0; FFirePainTime := 0; FFireAttacker := 0; @@ -5023,7 +4941,6 @@ begin DoLerp(4); if NetServer then - begin if FClientID >= 0 then begin FPing := NetClients[FClientID].Peer^.lastRoundTripTime; @@ -5036,7 +4953,6 @@ begin FPing := 0; FLoss := 0; end; - end; if FAlive and (FPunchAnim <> nil) then FPunchAnim.Update(); @@ -5067,8 +4983,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 @@ -5099,7 +5015,15 @@ begin if FKeys[KEY_RIGHT].Pressed then Run(TDirection.D_RIGHT); //if FKeys[KEY_NEXTWEAPON].Pressed and AnyServer then NextWeapon(); //if FKeys[KEY_PREVWEAPON].Pressed and AnyServer then PrevWeapon(); - if FKeys[KEY_FIRE].Pressed and AnyServer then Fire(); + if FKeys[KEY_FIRE].Pressed and AnyServer then Fire() + else + begin + if AnyServer then + begin + FlamerOff; + if NetServer then MH_SEND_PlayerStats(FUID); + end; + end; if FKeys[KEY_OPEN].Pressed and AnyServer then Use(); if FKeys[KEY_JUMP].Pressed then Jump() else @@ -5360,11 +5284,13 @@ begin if FFirePainTime <= 0 then begin if g_Game_IsServer then - Damage(5, FFireAttacker, 0, 0, HIT_FLAME); - FFirePainTime := 18; + Damage(2, FFireAttacker, 0, 0, HIT_FLAME); + FFirePainTime := 12 - FFireTime div 12; end; FFirePainTime := FFirePainTime - 1; FFireTime := FFireTime - 1; + if ((FFireTime mod 33) = 0) and (FMegaRulez[MR_INVUL] < gTime) then + FModel.PlaySound(MODELSOUND_PAIN, 1, FObj.X, FObj.Y); if (FFireTime = 0) and g_Game_IsNet and g_Game_IsServer then MH_SEND_PlayerStats(FUID); end; @@ -5396,7 +5322,7 @@ begin else if FHealth > -50 then Kill(K_HARDKILL, FLastSpawnerUID, FLastHit) else Kill(K_EXTRAHARDKILL, FLastSpawnerUID, FLastHit); - if FAlive then + if FAlive and ((FLastHit <> HIT_FLAME) or (FFireTime <= 0)) then begin if FDamageBuffer <= 20 then FModel.PlaySound(MODELSOUND_PAIN, 1, FObj.X, FObj.Y) else if FDamageBuffer <= 55 then FModel.PlaySound(MODELSOUND_PAIN, 2, FObj.X, FObj.Y) @@ -5667,6 +5593,7 @@ begin WEAPON_FLAMETHROWER: begin g_Weapon_flame(wx, wy, xd, yd, FUID, WID); + FlamerOn; FFireAngle := FAngle; f := True; end; @@ -5723,7 +5650,7 @@ end; function TPlayer.GetFlag(Flag: Byte): Boolean; var s, ts: String; - evtype: Byte; + evtype, a: Byte; begin Result := False; @@ -5751,6 +5678,16 @@ begin 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; @@ -5782,6 +5719,16 @@ begin 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 @@ -5809,6 +5756,16 @@ 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 @@ -5825,9 +5782,10 @@ 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 @@ -5852,6 +5810,16 @@ begin 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; @@ -5861,6 +5829,11 @@ end; procedure TPlayer.GetSecret(); begin + if (self = gPlayer1) or (self = gPlayer2) then + begin + g_Console_Add(Format(_lc[I_PLAYER_SECRET], [FName]), True); + g_Sound_PlayEx('SOUND_GAME_SECRET'); + end; Inc(FSecrets); end; @@ -5888,18 +5861,6 @@ 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; @@ -5943,7 +5904,6 @@ begin FAir := FSavedState.Air; FJetFuel := FSavedState.JetFuel; FCurrWeap := FSavedState.CurrWeap; - FModel.SetWeapon(FCurrWeap); FNextWeap := FSavedState.NextWeap; FNextWeapDelay := FSavedState.NextWeapDelay; @@ -5984,6 +5944,8 @@ begin utils.writeInt(st, Byte(b)); // Çäîðîâüå utils.writeInt(st, LongInt(FHealth)); + // Êîýôôèöèåíò èíâàëèäíîñòè + utils.writeInt(st, LongInt(FHandicap)); // Æèçíè utils.writeInt(st, Byte(FLives)); // Áðîíÿ @@ -6086,6 +6048,8 @@ begin if b = 1 then FDirection := TDirection.D_LEFT else FDirection := TDirection.D_RIGHT; // b = 2 // Çäîðîâüå FHealth := utils.readLongInt(st); + // Êîýôôèöèåíò èíâàëèäíîñòè + FHandicap := utils.readLongInt(st); // Æèçíè FLives := utils.readByte(st); // Áðîíÿ @@ -6114,7 +6078,6 @@ begin FSecrets := utils.readLongInt(st); // Òåêóùåå îðóæèå FCurrWeap := utils.readByte(st); - if not g_Game_IsClient then Inc(FNetWeapCtr, 2); // Æåëàåìîå îðóæèå FNextWeap := utils.readWord(st); // ...è ïàóçà @@ -6249,7 +6212,7 @@ begin Include(FRulez, R_BERSERK); if FBFGFireCounter < 1 then begin - CurrWeap := WEAPON_KASTET; + FCurrWeap := WEAPON_KASTET; resetWeaponQueue(); FModel.SetWeapon(WEAPON_KASTET); end; @@ -6410,6 +6373,12 @@ begin FSawSoundIdle.Pause(Enable); FSawSoundHit.Pause(Enable); FSawSoundSelect.Pause(Enable); + FFlameSoundOn.Pause(Enable); + FFlameSoundOff.Pause(Enable); + FFlameSoundWork.Pause(Enable); + FJetSoundFly.Pause(Enable); + FJetSoundOn.Pause(Enable); + FJetSoundOff.Pause(Enable); end; { T C o r p s e : } @@ -6678,7 +6647,6 @@ begin FAIFlags := nil; FSelectedWeapon := FCurrWeap; - FNetWeapCtr := 0; resetWeaponQueue(); FTargetUID := 0; end; @@ -7109,7 +7077,7 @@ begin end; end; - //HACK! (does it belong there?) + //HACK! (does it belongs there?) RealizeCurrentWeapon(); // Åñëè åñòü âîçìîæíûå öåëè: