X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_weapons.pas;h=9b0952edbb1652aa1a28ca09fb948d5a23527471;hb=HEAD;hp=311b18cbc344dbb78b83a7ad0d4c3053a858c9d9;hpb=d7d166dc3cd287276202e862746208892c4cc89f;p=d2df-sdl.git diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas index 311b18c..9b0952e 100644 --- a/src/game/g_weapons.pas +++ b/src/game/g_weapons.pas @@ -1,9 +1,8 @@ -(* Copyright (C) DooM 2D:Forever Developers +(* 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. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +19,7 @@ unit g_weapons; interface uses - SysUtils, Classes, + SysUtils, Classes, mempool, g_textures, g_basic, e_graphics, g_phys, xprofiler; @@ -52,19 +51,19 @@ function g_Weapon_Hit(obj: PObj; d: Integer; SpawnerUID: Word; t: Byte; HitCorps function g_Weapon_HitUID(UID: Word; d: Integer; SpawnerUID: Word; t: Byte): Boolean; function g_Weapon_CreateShot(I: Integer; ShotType: Byte; Spawner, TargetUID: Word; X, Y, XV, YV: Integer): LongWord; -procedure g_Weapon_gun(const x, y, xd, yd, v, dmg: Integer; SpawnerUID: Word; CheckTrigger: Boolean); +procedure g_Weapon_gun(const x, y, xd, yd, v, indmg: Integer; SpawnerUID: Word; CheckTrigger: Boolean); procedure g_Weapon_punch(x, y: Integer; d, SpawnerUID: Word); function g_Weapon_chainsaw(x, y: Integer; d, SpawnerUID: Word): Integer; -procedure g_Weapon_rocket(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False); +procedure g_Weapon_rocket(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False; compat: Boolean = true); procedure g_Weapon_revf(x, y, xd, yd: Integer; SpawnerUID, TargetUID: Word; WID: Integer = -1; Silent: Boolean = False); -procedure g_Weapon_flame(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False); -procedure g_Weapon_plasma(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False); -procedure g_Weapon_ball1(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False); -procedure g_Weapon_ball2(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False); -procedure g_Weapon_ball7(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False); -procedure g_Weapon_aplasma(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False); -procedure g_Weapon_manfire(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False); -procedure g_Weapon_bfgshot(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False); +procedure g_Weapon_flame(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False; compat: Boolean = true); +procedure g_Weapon_plasma(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False; compat: Boolean = true); +procedure g_Weapon_ball1(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False; compat: Boolean = true); +procedure g_Weapon_ball2(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False; compat: Boolean = true); +procedure g_Weapon_ball7(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False; compat: Boolean = true); +procedure g_Weapon_aplasma(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False; compat: Boolean = true); +procedure g_Weapon_manfire(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False; compat: Boolean = true); +procedure g_Weapon_bfgshot(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False; compat: Boolean = true); procedure g_Weapon_bfghit(x, y: Integer); procedure g_Weapon_pistol(x, y, xd, yd: Integer; SpawnerUID: Word; Silent: Boolean = False); procedure g_Weapon_mgun(x, y, xd, yd: Integer; SpawnerUID: Word; Silent: Boolean = False); @@ -73,6 +72,7 @@ procedure g_Weapon_dshotgun(x, y, xd, yd: Integer; SpawnerUID: Word; Silent: Boo function g_Weapon_Explode(X, Y: Integer; rad: Integer; SpawnerUID: Word): Boolean; procedure g_Weapon_BFG9000(X, Y: Integer; SpawnerUID: Word); +procedure g_Weapon_PreUpdate(); procedure g_Weapon_Update(); procedure g_Weapon_Draw(); function g_Weapon_Danger(UID: Word; X, Y: Integer; Width, Height: Word; Time: Byte): Boolean; @@ -84,7 +84,7 @@ procedure g_Weapon_LoadState (st: TStream); procedure g_Weapon_AddDynLights(); const - WEAPON_KASTET = 0; + WEAPON_IRONFIST = 0; WEAPON_SAW = 1; WEAPON_PISTOL = 2; WEAPON_SHOTGUN1 = 3; @@ -93,7 +93,7 @@ const WEAPON_ROCKETLAUNCHER = 6; WEAPON_PLASMA = 7; WEAPON_BFG = 8; - WEAPON_SUPERPULEMET = 9; + WEAPON_SUPERCHAINGUN = 9; WEAPON_FLAMETHROWER = 10; WEAPON_ZOMBY_PISTOL = 20; WEAPON_IMP_FIRE = 21; @@ -103,7 +103,7 @@ const WEAPON_MANCUB_FIRE = 25; WEAPON_SKEL_FIRE = 26; - WP_FIRST = WEAPON_KASTET; + WP_FIRST = WEAPON_IRONFIST; WP_LAST = WEAPON_FLAMETHROWER; @@ -118,7 +118,7 @@ uses g_console, g_options, g_game, g_triggers, MAPDEF, e_log, g_monsters, g_saveload, g_language, g_netmsg, g_grid, - binheap, hashtable, utils, xstreams; + geom, binheap, hashtable, utils, xstreams; type TWaterPanel = record @@ -157,8 +157,13 @@ type x, y: Integer; end; + TBinHeapKeyHitTime = class + public + class function less (const a, b: Integer): Boolean; inline; + end; + // indicies in `wgunHitTime` array - TBinaryHeapHitTimes = specialize TBinaryHeapBase; + TBinaryHeapHitTimes = specialize TBinaryHeapBase; var WaterMap: array of array of DWORD = nil; @@ -168,7 +173,7 @@ var wgunHitTimeUsed: Integer = 0; -function hitTimeLess (a, b: Integer): Boolean; +class function TBinHeapKeyHitTime.less (const a, b: Integer): Boolean; var hta, htb: PHitTime; begin @@ -457,12 +462,12 @@ begin if (t <> HIT_FLAME) or (m.FFireTime = 0) or (vx <> 0) or (vy <> 0) then Result := m.Damage(d, vx, vy, SpawnerUID, t) else - Result := True; + Result := (gLMSRespawn = LMS_RESPAWN_NONE); // don't hit monsters when it's warmup time if t = HIT_FLAME then m.CatchFire(SpawnerUID); end else - Result := True; + Result := (gLMSRespawn = LMS_RESPAWN_NONE); // don't hit monsters when it's warmup time end; @@ -522,7 +527,7 @@ begin g_TraceVector(X, Y, Obj.X+Obj.Rect.X+(Obj.Rect.Width div 2), Obj.Y+Obj.Rect.Y+(Obj.Rect.Height div 2)) then begin - Damage(50, 0, 0); + Damage(50, SpawnerUID, 0, 0); g_Weapon_BFGHit(Obj.X+Obj.Rect.X+(Obj.Rect.Width div 2), Obj.Y+Obj.Rect.Y+(Obj.Rect.Height div 2)); end; @@ -689,7 +694,7 @@ begin begin g_Obj_Init(@Obj); - Obj.Rect.Width := 32; + Obj.Rect.Width := 16; Obj.Rect.Height := 16; Triggers := nil; @@ -733,6 +738,8 @@ begin end; end; + Shots[find_id].Obj.oldX := X; + Shots[find_id].Obj.oldY := Y; Shots[find_id].Obj.X := X; Shots[find_id].Obj.Y := Y; Shots[find_id].Obj.Vel.X := XV; @@ -758,6 +765,8 @@ begin if a = 0 then a := 1; + Shots[i].Obj.oldX := x; + Shots[i].Obj.oldY := y; Shots[i].Obj.X := x; Shots[i].Obj.Y := y; Shots[i].Obj.Vel.X := (xd*s) div a; @@ -867,8 +876,8 @@ begin g_Obj_Collide(obj, @gCorpses[i].Obj) then begin // Ðàñïèëèâàåì òðóï: - gCorpses[i].Damage(d, (obj^.Vel.X+obj^.Accel.X) div 4, - (obj^.Vel.Y+obj^.Accel.Y) div 4); + gCorpses[i].Damage(d, SpawnerUID, (obj^.Vel.X+obj^.Accel.X) div 4, + (obj^.Vel.Y+obj^.Accel.Y) div 4); Result := 1; end; end; @@ -884,10 +893,16 @@ begin Exit; end; - if PlayerHit() then + // È â êîíöå èãðîêîâ, íî òîëüêî åñëè ïîëîæåíî + // (èëè ñíàðÿä îò ìîíñòðà, èëè friendlyfire, èëè friendly_hit_projectile) + if (g_GetUIDType(SpawnerUID) <> UID_PLAYER) or + ([TGameOption.TEAM_DAMAGE, TGameOption.TEAM_HIT_PROJECTILE] <= gGameSettings.Options) then begin - Result := 1; - Exit; + if PlayerHit() then + begin + Result := 1; + Exit; + end; end; end; @@ -925,11 +940,15 @@ begin Exit; end; - // È â êîíöå ñâîèõ èãðîêîâ - if PlayerHit(1) then + // È â êîíöå ñâîèõ èãðîêîâ, íî òîëüêî åñëè ïîëîæåíî + // (èëè friendlyfire, èëè friendly_hit_projectile) + if [TGameOption.TEAM_DAMAGE, TGameOption.TEAM_HIT_PROJECTILE] <= gGameSettings.Options then begin - Result := 1; - Exit; + if PlayerHit(1) then + begin + Result := 1; + Exit; + end; end; end; @@ -1041,7 +1060,7 @@ begin mm := Max(abs(dx), abs(dy)); if mm = 0 then mm := 1; - Damage(Round(100*(rad-m)/rad), (dx*10) div mm, (dy*10) div mm); + Damage(Round(100*(rad-m)/rad), SpawnerUID, (dx*10) div mm, (dy*10) div mm); end; end; @@ -1112,6 +1131,7 @@ begin g_Sound_CreateWADEx('SOUND_WEAPON_FIRECGUN', GameWAD+':SOUNDS\FIRECGUN'); g_Sound_CreateWADEx('SOUND_WEAPON_FIREBFG', GameWAD+':SOUNDS\FIREBFG'); g_Sound_CreateWADEx('SOUND_FIRE', GameWAD+':SOUNDS\FIRE'); + g_Sound_CreateWADEx('SOUND_IGNITE', GameWAD+':SOUNDS\IGNITE'); g_Sound_CreateWADEx('SOUND_WEAPON_STARTFIREBFG', GameWAD+':SOUNDS\STARTFIREBFG'); g_Sound_CreateWADEx('SOUND_WEAPON_EXPLODEROCKET', GameWAD+':SOUNDS\EXPLODEROCKET'); g_Sound_CreateWADEx('SOUND_WEAPON_EXPLODEBFG', GameWAD+':SOUNDS\EXPLODEBFG'); @@ -1121,6 +1141,9 @@ begin g_Sound_CreateWADEx('SOUND_WEAPON_FIREBALL', GameWAD+':SOUNDS\FIREBALL'); g_Sound_CreateWADEx('SOUND_WEAPON_EXPLODEBALL', GameWAD+':SOUNDS\EXPLODEBALL'); g_Sound_CreateWADEx('SOUND_WEAPON_FIREREV', GameWAD+':SOUNDS\FIREREV'); + g_Sound_CreateWADEx('SOUND_WEAPON_FLAMEON', GameWAD+':SOUNDS\STARTFLM'); + g_Sound_CreateWADEx('SOUND_WEAPON_FLAMEOFF', GameWAD+':SOUNDS\STOPFLM'); + g_Sound_CreateWADEx('SOUND_WEAPON_FLAMEWORK', GameWAD+':SOUNDS\WORKFLM'); g_Sound_CreateWADEx('SOUND_PLAYER_JETFLY', GameWAD+':SOUNDS\WORKJETPACK'); g_Sound_CreateWADEx('SOUND_PLAYER_JETON', GameWAD+':SOUNDS\STARTJETPACK'); g_Sound_CreateWADEx('SOUND_PLAYER_JETOFF', GameWAD+':SOUNDS\STOPJETPACK'); @@ -1155,7 +1178,7 @@ begin g_Texture_CreateWADEx('TEXTURE_SHELL_SHELL', GameWAD+':TEXTURES\ESHELL'); //wgunMonHash := hashNewIntInt(); - wgunHitHeap := TBinaryHeapHitTimes.Create(hitTimeLess); + wgunHitHeap := TBinaryHeapHitTimes.Create(); end; procedure g_Weapon_FreeData(); @@ -1178,6 +1201,7 @@ begin g_Sound_Delete('SOUND_WEAPON_FIRECGUN'); g_Sound_Delete('SOUND_WEAPON_FIREBFG'); g_Sound_Delete('SOUND_FIRE'); + g_Sound_Delete('SOUND_IGNITE'); g_Sound_Delete('SOUND_WEAPON_STARTFIREBFG'); g_Sound_Delete('SOUND_WEAPON_EXPLODEROCKET'); g_Sound_Delete('SOUND_WEAPON_EXPLODEBFG'); @@ -1187,6 +1211,9 @@ begin g_Sound_Delete('SOUND_WEAPON_FIREBALL'); g_Sound_Delete('SOUND_WEAPON_EXPLODEBALL'); g_Sound_Delete('SOUND_WEAPON_FIREREV'); + g_Sound_Delete('SOUND_WEAPON_FLAMEON'); + g_Sound_Delete('SOUND_WEAPON_FLAMEOFF'); + g_Sound_Delete('SOUND_WEAPON_FLAMEWORK'); g_Sound_Delete('SOUND_PLAYER_JETFLY'); g_Sound_Delete('SOUND_PLAYER_JETON'); g_Sound_Delete('SOUND_PLAYER_JETOFF'); @@ -1371,18 +1398,30 @@ end; //!!!FIXME!!! -procedure g_Weapon_gun (const x, y, xd, yd, v, dmg: Integer; SpawnerUID: Word; CheckTrigger: Boolean); +procedure g_Weapon_gun (const x, y, xd, yd, v, indmg: Integer; SpawnerUID: Word; CheckTrigger: Boolean); var x0, y0: Integer; x2, y2: Integer; xi, yi: Integer; wallDistSq: Integer = $3fffffff; + spawnerPlr: TPlayer = nil; + dmg: Integer; function doPlayerHit (idx: Integer; hx, hy: Integer): Boolean; begin result := false; if (idx < 0) or (idx > High(gPlayers)) then exit; if (gPlayers[idx] = nil) or not gPlayers[idx].alive then exit; + if (spawnerPlr <> nil) then + begin + if (not ([TGameOption.TEAM_HIT_TRACE, TGameOption.TEAM_DAMAGE] <= gGameSettings.Options)) and + (spawnerPlr.Team <> TEAM_NONE) and (spawnerPlr.Team = gPlayers[idx].Team) then + begin + if (spawnerPlr <> gPlayers[idx]) and not (TGameOption.TEAM_ABSORB_DAMAGE in gGameSettings.Options) then + dmg := Max(1, dmg div 2); + exit; + end; + end; result := HitPlayer(gPlayers[idx], dmg, (xi*v)*10, (yi*v)*10-3, SpawnerUID, HIT_SOME); if result and (v <> 0) then gPlayers[idx].Push((xi*v), (yi*v)); {$IF DEFINED(D2F_DEBUG)} @@ -1435,13 +1474,12 @@ var end; end; - function sqchecker (mon: TMonster; tag: Integer): Boolean; + procedure sqchecker (mon: TMonster); var mx, my, mw, mh: Integer; inx, iny: Integer; distSq: Integer; begin - result := false; // don't stop mon.getMapBox(mx, my, mw, mh); if lineAABBIntersects(x0, y0, x2, y2, mx, my, mw, mh, inx, iny) then begin @@ -1463,6 +1501,8 @@ var {$IF DEFINED(D2F_DEBUG)} stt: UInt64; {$ENDIF} + mit: PMonster; + it: TMonsterGrid.Iter; begin (* if not gwep_debug_fast_trace then @@ -1474,6 +1514,11 @@ begin if (xd = 0) and (yd = 0) then exit; + if (g_GetUIDType(SpawnerUID) = UID_PLAYER) then + spawnerPlr := g_Player_Get(SpawnerUID); + + dmg := indmg; + //wgunMonHash.reset(); //FIXME: clear hash on level change wgunHitHeap.clear(); wgunHitTimeUsed := 0; @@ -1517,7 +1562,11 @@ begin if playerPossibleHit() then exit; // instant hit // collect monsters - g_Mons_AlongLine(x, y, x2, y2, sqchecker); + //g_Mons_AlongLine(x, y, x2, y2, sqchecker); + + it := monsGrid.forEachAlongLine(x, y, x2, y2, -1); + for mit in it do sqchecker(mit^); + it.release(); // here, we collected all monsters and players in `wgunHitHeap` and `wgunHitTime` // also, if `wallWasHit` is `true`, then `wallHitX` and `wallHitY` contains spark coords @@ -1610,7 +1659,7 @@ begin end; procedure g_Weapon_rocket(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; - Silent: Boolean = False); + Silent: Boolean = False; compat: Boolean = true); var find_id: DWORD; dx, dy: Integer; @@ -1631,7 +1680,10 @@ begin Obj.Rect.Width := SHOT_ROCKETLAUNCHER_WIDTH; Obj.Rect.Height := SHOT_ROCKETLAUNCHER_HEIGHT; - dx := IfThen(xd > x, -Obj.Rect.Width, 0); + if compat then + dx := IfThen(xd > x, -Obj.Rect.Width, 0) + else + dx := -(Obj.Rect.Width div 2); dy := -(Obj.Rect.Height div 2); ShotType := WEAPON_ROCKETLAUNCHER; @@ -1689,7 +1741,7 @@ begin end; procedure g_Weapon_plasma(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; - Silent: Boolean = False); + Silent: Boolean = False; compat: Boolean = true); var find_id, FramesID: DWORD; dx, dy: Integer; @@ -1710,7 +1762,10 @@ begin Obj.Rect.Width := SHOT_PLASMA_WIDTH; Obj.Rect.Height := SHOT_PLASMA_HEIGHT; - dx := IfThen(xd>x, -Obj.Rect.Width, 0); + if compat then + dx := IfThen(xd > x, -Obj.Rect.Width, 0) + else + dx := -(Obj.Rect.Width div 2); dy := -(Obj.Rect.Height div 2); ShotType := WEAPON_PLASMA; @@ -1728,7 +1783,7 @@ begin end; procedure g_Weapon_flame(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; - Silent: Boolean = False); + Silent: Boolean = False; compat: Boolean = true); var find_id: DWORD; dx, dy: Integer; @@ -1749,7 +1804,10 @@ begin Obj.Rect.Width := SHOT_FLAME_WIDTH; Obj.Rect.Height := SHOT_FLAME_HEIGHT; - dx := IfThen(xd>x, -Obj.Rect.Width, 0); + if compat then + dx := IfThen(xd > x, -Obj.Rect.Width, 0) + else + dx := -(Obj.Rect.Width div 2); dy := -(Obj.Rect.Height div 2); ShotType := WEAPON_FLAMETHROWER; @@ -1768,7 +1826,7 @@ begin end; procedure g_Weapon_ball1(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; - Silent: Boolean = False); + Silent: Boolean = False; compat: Boolean = true); var find_id, FramesID: DWORD; dx, dy: Integer; @@ -1789,7 +1847,10 @@ begin Obj.Rect.Width := 16; Obj.Rect.Height := 16; - dx := IfThen(xd>x, -Obj.Rect.Width, 0); + if compat then + dx := IfThen(xd > x, -Obj.Rect.Width, 0) + else + dx := -(Obj.Rect.Width div 2); dy := -(Obj.Rect.Height div 2); ShotType := WEAPON_IMP_FIRE; @@ -1807,7 +1868,7 @@ begin end; procedure g_Weapon_ball2(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; - Silent: Boolean = False); + Silent: Boolean = False; compat: Boolean = true); var find_id, FramesID: DWORD; dx, dy: Integer; @@ -1828,7 +1889,10 @@ begin Obj.Rect.Width := 16; Obj.Rect.Height := 16; - dx := IfThen(xd>x, -Obj.Rect.Width, 0); + if compat then + dx := IfThen(xd > x, -Obj.Rect.Width, 0) + else + dx := -(Obj.Rect.Width div 2); dy := -(Obj.Rect.Height div 2); ShotType := WEAPON_CACO_FIRE; @@ -1846,7 +1910,7 @@ begin end; procedure g_Weapon_ball7(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; - Silent: Boolean = False); + Silent: Boolean = False; compat: Boolean = true); var find_id, FramesID: DWORD; dx, dy: Integer; @@ -1864,10 +1928,13 @@ begin begin g_Obj_Init(@Obj); - Obj.Rect.Width := 32; + Obj.Rect.Width := 16; Obj.Rect.Height := 16; - dx := IfThen(xd>x, -Obj.Rect.Width, 0); + if compat then + dx := IfThen(xd > x, -Obj.Rect.Width, 0) + else + dx := -(Obj.Rect.Width div 2); dy := -(Obj.Rect.Height div 2); ShotType := WEAPON_BARON_FIRE; @@ -1885,7 +1952,7 @@ begin end; procedure g_Weapon_aplasma(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; - Silent: Boolean = False); + Silent: Boolean = False; compat: Boolean = true); var find_id, FramesID: DWORD; dx, dy: Integer; @@ -1906,7 +1973,10 @@ begin Obj.Rect.Width := 16; Obj.Rect.Height := 16; - dx := IfThen(xd>x, -Obj.Rect.Width, 0); + if compat then + dx := IfThen(xd > x, -Obj.Rect.Width, 0) + else + dx := -(Obj.Rect.Width div 2); dy := -(Obj.Rect.Height div 2); ShotType := WEAPON_BSP_FIRE; @@ -1925,7 +1995,7 @@ begin end; procedure g_Weapon_manfire(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; - Silent: Boolean = False); + Silent: Boolean = False; compat: Boolean = true); var find_id, FramesID: DWORD; dx, dy: Integer; @@ -1946,7 +2016,10 @@ begin Obj.Rect.Width := 32; Obj.Rect.Height := 32; - dx := IfThen(xd>x, -Obj.Rect.Width, 0); + if compat then + dx := IfThen(xd > x, -Obj.Rect.Width, 0) + else + dx := -(Obj.Rect.Width div 2); dy := -(Obj.Rect.Height div 2); ShotType := WEAPON_MANCUB_FIRE; @@ -1965,7 +2038,7 @@ begin end; procedure g_Weapon_bfgshot(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; - Silent: Boolean = False); + Silent: Boolean = False; compat: Boolean = true); var find_id, FramesID: DWORD; dx, dy: Integer; @@ -1986,7 +2059,10 @@ begin Obj.Rect.Width := SHOT_BFG_WIDTH; Obj.Rect.Height := SHOT_BFG_HEIGHT; - dx := IfThen(xd>x, -Obj.Rect.Width, 0); + if compat then + dx := IfThen(xd > x, -Obj.Rect.Width, 0) + else + dx := -(Obj.Rect.Width div 2); dy := -(Obj.Rect.Height div 2); ShotType := WEAPON_BFG; @@ -2025,8 +2101,16 @@ begin g_Weapon_gun(x, y, xd, yd, 1, 3, SpawnerUID, True); if gGameSettings.GameMode in [GM_DM, GM_TDM, GM_CTF] then begin - g_Weapon_gun(x, y+1, xd, yd+1, 1, 3, SpawnerUID, False); - g_Weapon_gun(x, y-1, xd, yd-1, 1, 2, SpawnerUID, False); + if ABS(x-xd) >= ABS(y-yd) then + begin + g_Weapon_gun(x, y+1, xd, yd+1, 1, 3, SpawnerUID, False); + g_Weapon_gun(x, y-1, xd, yd-1, 1, 2, SpawnerUID, False); + end + else + begin + g_Weapon_gun(x+1, y, xd+1, yd, 1, 3, SpawnerUID, False); + g_Weapon_gun(x-1, y, xd-1, yd, 1, 2, SpawnerUID, False); + end; end; end; @@ -2040,30 +2124,39 @@ begin if (gGameSettings.GameMode in [GM_DM, GM_TDM, GM_CTF]) and (g_GetUIDType(SpawnerUID) = UID_PLAYER) then begin - g_Weapon_gun(x, y+1, xd, yd+1, 1, 2, SpawnerUID, False); - g_Weapon_gun(x, y-1, xd, yd-1, 1, 2, SpawnerUID, False); + if ABS(x-xd) >= ABS(y-yd) then + begin + g_Weapon_gun(x, y+1, xd, yd+1, 1, 2, SpawnerUID, False); + g_Weapon_gun(x, y-1, xd, yd-1, 1, 2, SpawnerUID, False); + end + else + begin + g_Weapon_gun(x+1, y, xd+1, yd, 1, 2, SpawnerUID, False); + g_Weapon_gun(x-1, y, xd-1, yd, 1, 2, SpawnerUID, False); + end; end; end; procedure g_Weapon_shotgun(x, y, xd, yd: Integer; SpawnerUID: Word; Silent: Boolean = False); var - i, j: Integer; + i, j, k: Integer; begin if not Silent then if gSoundEffectsDF then g_Sound_PlayExAt('SOUND_WEAPON_FIRESHOTGUN', x, y); for i := 0 to 9 do begin - j := Random(17)-8; // -8 .. 8 - g_Weapon_gun(x, y+j, xd, yd+j, IfThen(i mod 2 <> 0, 1, 0), 3, SpawnerUID, i=0); + j := 0; k := 0; + if ABS(x-xd) >= ABS(y-yd) then j := Random(17) - 8 else k := Random(17) - 8; // -8 .. 8 + g_Weapon_gun(x+k, y+j, xd+k, yd+j, IfThen(i mod 2 <> 0, 1, 0), 3, SpawnerUID, i=0); end; end; procedure g_Weapon_dshotgun(x, y, xd, yd: Integer; SpawnerUID: Word; Silent: Boolean = False); var - a, i, j: Integer; + a, i, j, k: Integer; begin if not Silent then g_Sound_PlayExAt('SOUND_WEAPON_FIRESHOTGUN2', x, y); @@ -2071,11 +2164,25 @@ begin if gGameSettings.GameMode in [GM_DM, GM_TDM, GM_CTF] then a := 25 else a := 20; for i := 0 to a do begin - j := Random(41)-20; // -20 .. 20 - g_Weapon_gun(x, y+j, xd, yd+j, IfThen(i mod 3 <> 0, 0, 1), 3, SpawnerUID, i=0); + j := 0; k := 0; + if ABS(x-xd) >= ABS(y-yd) then j := Random(41) - 20 else k := Random(41) - 20; // -20 .. 20 + g_Weapon_gun(x+k, y+j, xd+k, yd+j, IfThen(i mod 3 <> 0, 0, 1), 3, SpawnerUID, i=0); end; end; +procedure g_Weapon_PreUpdate(); +var + i: Integer; +begin + if Shots = nil then Exit; + for i := 0 to High(Shots) do + if Shots[i].ShotType <> 0 then + begin + Shots[i].Obj.oldX := Shots[i].Obj.X; + Shots[i].Obj.oldY := Shots[i].Obj.Y; + end; +end; + procedure g_Weapon_Update(); var i, a, h, cx, cy, oldvx, oldvy, tf: Integer; @@ -2141,7 +2248,7 @@ begin if Stopped = 0 then begin - st := g_Obj_Move(@Obj, False, spl); + st := g_Obj_Move_Projectile(@Obj, False, spl); end else begin @@ -2170,19 +2277,17 @@ begin // Â âîäå øëåéô - ïóçûðè, â âîçäóõå øëåéô - äûì: if WordBool(st and MOVE_INWATER) then - g_GFX_Bubbles(Obj.X+(Obj.Rect.Width div 2), - Obj.Y+(Obj.Rect.Height div 2), - 1+Random(3), 16, 16) - else - if g_Frames_Get(_id, 'FRAMES_SMOKE') then - begin - Anim := TAnimation.Create(_id, False, 3); - Anim.Alpha := 150; - g_GFX_OnceAnim(Obj.X-14+Random(9), - Obj.Y+(Obj.Rect.Height div 2)-20+Random(9), - Anim, ONCEANIM_SMOKE); - Anim.Free(); - end; + begin + g_Game_Effect_Bubbles(cx, cy, 1+Random(3), 16, 16); + end + else if g_Frames_Get(_id, 'FRAMES_SMOKE') then + begin + Anim := TAnimation.Create(_id, False, 3); + Anim.Alpha := 150; + g_GFX_OnceAnim(Obj.X-14+Random(9), cy-20+Random(9), + Anim, ONCEANIM_SMOKE); + Anim.Free(); + end; // Ïîïàëè â êîãî-òî èëè â ñòåíó: if WordBool(st and (MOVE_HITWALL or MOVE_HITLAND or MOVE_HITCEIL)) or @@ -2305,7 +2410,8 @@ begin end; end else - g_GFX_Bubbles(cx, cy, 1+Random(3), 16, 16); + g_Game_Effect_Bubbles(cx, cy, 1+Random(3), 16, 16); + ShotType := 0; Continue; end; @@ -2328,7 +2434,7 @@ begin Stopped := MOVE_HITCEIL; end; - a := IfThen(Stopped = 0, 3, 1); + a := IfThen(Stopped = 0, 10, 1); // Åñëè â êîãî-òî ïîïàëè if g_Weapon_Hit(@Obj, a, SpawnerUID, HIT_FLAME, False) <> 0 then begin @@ -2484,7 +2590,7 @@ end; procedure g_Weapon_Draw(); var - i: Integer; + i, fX, fY: Integer; a: SmallInt; p: TDFPoint; begin @@ -2503,24 +2609,31 @@ begin else a := 0; + Obj.lerp(gLerpFactor, fX, fY); p.X := Obj.Rect.Width div 2; p.Y := Obj.Rect.Height div 2; + if Shots[i].ShotType = WEAPON_BFG then + begin + DEC(fX, 6); + DEC(fY, 7); + end; + if Animation <> nil then begin if (Shots[i].ShotType = WEAPON_BARON_FIRE) or (Shots[i].ShotType = WEAPON_MANCUB_FIRE) or (Shots[i].ShotType = WEAPON_SKEL_FIRE) then - Animation.DrawEx(Obj.X, Obj.Y, TMirrorType.None, p, a) + Animation.DrawEx(fX, fY, TMirrorType.None, p, a) else - Animation.Draw(Obj.X, Obj.Y, TMirrorType.None); + Animation.Draw(fX, fY, TMirrorType.None); end else if TextureID <> 0 then begin if (Shots[i].ShotType = WEAPON_ROCKETLAUNCHER) then - e_DrawAdv(TextureID, Obj.X, Obj.Y, 0, True, False, a, @p, TMirrorType.None) + e_DrawAdv(TextureID, fX, fY, 0, True, False, a, @p, TMirrorType.None) else if (Shots[i].ShotType <> WEAPON_FLAMETHROWER) then - e_Draw(TextureID, Obj.X, Obj.Y, 0, True, False); + e_Draw(TextureID, fX, fY, 0, True, False); end; if g_debug_Frames then