X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=f2a98ff8aedc6f6f86c10b39ed904677955781fc;hb=946dacc05676ab11a026b4874d8b2485e7cd7b46;hp=bb9b4149dca2a8bfcc677691bf985814fbb1b4ca;hpb=88ce644db1b40111bdb380f4357fa59bdb5173be;p=d2df-sdl.git diff --git a/src/game/g_player.pas b/src/game/g_player.pas index bb9b414..f2a98ff 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -1,3 +1,19 @@ +(* Copyright (C) DooM 2D:Forever Developers + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + *) +{$MODE DELPHI} unit g_player; interface @@ -243,6 +259,7 @@ type procedure SetFlag(Flag: Byte); function DropFlag(): Boolean; procedure AllRulez(Health: Boolean); + procedure RestoreHealthArmor(); procedure FragCombo(); procedure GiveItem(ItemType: Byte); procedure Damage(value: Word; SpawnerUID: Word; vx, vy: Integer; t: Byte); virtual; @@ -399,7 +416,7 @@ type procedure Draw(); procedure SaveState(var Mem: TBinMemoryWriter); procedure LoadState(var Mem: TBinMemoryReader); - + property Obj: TObj read FObj; property State: Byte read FState; property Mess: Boolean read FMess; @@ -470,7 +487,7 @@ implementation uses e_log, g_map, g_items, g_console, SysUtils, g_gfx, Math, g_options, g_triggers, g_menu, MAPDEF, g_game, - WADEDITOR, g_main, g_monsters, CONFIG, g_language, g_net, g_netmsg; + wadreader, g_main, g_monsters, CONFIG, g_language, g_net, g_netmsg; type TBotProfile = record @@ -514,11 +531,14 @@ const TEAMCOLOR: Array [TEAM_RED..TEAM_BLUE] of TRGB = ((R:255; G:0; B:0), (R:0; G:0; B:255)); DIFFICULT_EASY: TDifficult = (DiagFire: 32; InvisFire: 32; DiagPrecision: 32; - FlyPrecision: 32; Cover: 32; CloseJump: 32); + FlyPrecision: 32; Cover: 32; CloseJump: 32; + WeaponPrior:(0,0,0,0,0,0,0,0,0,0); CloseWeaponPrior:(0,0,0,0,0,0,0,0,0,0)); DIFFICULT_MEDIUM: TDifficult = (DiagFire: 127; InvisFire: 127; DiagPrecision: 127; - FlyPrecision: 127; Cover: 127; CloseJump: 127); + FlyPrecision: 127; Cover: 127; CloseJump: 127; + WeaponPrior:(0,0,0,0,0,0,0,0,0,0); CloseWeaponPrior:(0,0,0,0,0,0,0,0,0,0)); DIFFICULT_HARD: TDifficult = (DiagFire: 255; InvisFire: 255; DiagPrecision: 255; - FlyPrecision: 255; Cover: 255; CloseJump: 255); + FlyPrecision: 255; Cover: 255; CloseJump: 255; + WeaponPrior:(0,0,0,0,0,0,0,0,0,0); CloseWeaponPrior:(0,0,0,0,0,0,0,0,0,0)); WEAPON_PRIOR1: Array [WEAPON_KASTET..WEAPON_SUPERPULEMET] of Byte = (WEAPON_SUPERPULEMET, WEAPON_SHOTGUN2, WEAPON_SHOTGUN1, WEAPON_CHAINGUN, WEAPON_PLASMA, WEAPON_ROCKETLAUNCHER, @@ -1429,7 +1449,7 @@ var begin if (gShells = nil) or (Length(gShells) = 0) then Exit; - + with gShells[CurrentShell] do begin SpriteID := 0; @@ -1520,7 +1540,7 @@ var else g_Sound_PlayExAt('SOUND_PLAYER_SHELL' + IntToStr(k), X, Y); end; - + begin // Êóñêè ìÿñà: if gGibs <> nil then @@ -1542,7 +1562,7 @@ begin Obj.Vel.X := -(vel.X div 2); if WordBool(mr and (MOVE_HITCEIL or MOVE_HITLAND)) then Obj.Vel.Y := -(vel.Y div 2); - + if (Obj.Vel.X >= 0) then begin // Clockwise RAngle := RAngle + Abs(Obj.Vel.X)*6 + Abs(Obj.Vel.Y); @@ -1680,7 +1700,7 @@ begin SetLength(gShells, MaxGibs); CurrentGib := 0; CurrentShell := 0; - + if gCorpses <> nil then for i := 0 to High(gCorpses) do gCorpses[i].Free(); @@ -2156,6 +2176,7 @@ procedure TPlayer.Draw(); var ID: DWORD; w, h: Word; + dr: Boolean; begin if FLive then begin @@ -2175,7 +2196,16 @@ begin begin if (gPlayerDrawn <> nil) and ((Self = gPlayerDrawn) or ((FTeam = gPlayerDrawn.Team) and (gGameSettings.GameMode <> GM_DM))) then - FModel.Draw(FObj.X, FObj.Y, 200) + begin + if (FMegaRulez[MR_INVIS] - gTime) <= 2100 then + dr := not Odd((FMegaRulez[MR_INVIS] - gTime) div 300) + else + dr := True; + if dr then + FModel.Draw(FObj.X, FObj.Y, 200) + else + FModel.Draw(FObj.X, FObj.Y); + end else FModel.Draw(FObj.X, FObj.Y, 254); end @@ -5461,6 +5491,12 @@ begin FRulez := FRulez+[R_KEY_RED, R_KEY_GREEN, R_KEY_BLUE]; end; +procedure TPlayer.RestoreHealthArmor(); +begin + FHealth := PLAYER_HP_LIMIT; + FArmor := PLAYER_AP_LIMIT; +end; + procedure TPlayer.FragCombo(); var Param: Integer; @@ -5642,8 +5678,9 @@ begin g_Player_CreateGibs(FObj.X+FObj.Rect.X+(FObj.Rect.Width div 2), FObj.Y+FObj.Rect.Y+(FObj.Rect.Height div 2), FModelName, FColor); + // Çâóê ìÿñà îò òðóïà: pm := g_PlayerModel_Get(FModelName); - pm.PlaySound(MODELSOUND_DIE, 3, FObj.X, FObj.Y); + pm.PlaySound(MODELSOUND_DIE, 5, FObj.X, FObj.Y); pm.Free; end; end @@ -5686,7 +5723,7 @@ begin if gTime mod (GAME_TICK*2) <> 0 then begin g_Obj_Move(@FObj, True, True, True); - + Exit; end; @@ -6344,7 +6381,7 @@ begin else begin EnableAI := True; - + // Ïðîâåðÿåì, îòêëþ÷¸í ëè AI áîòîâ if (g_debug_BotAIOff = 1) and (Team = TEAM_RED) then EnableAI := False; @@ -6843,7 +6880,7 @@ end;} procedure TBot.SelectWeapon(Dist: Integer); var a: Integer; - + function HaveAmmo(weapon: Byte): Boolean; begin case weapon of