X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_weapons.pas;h=9b0952edbb1652aa1a28ca09fb948d5a23527471;hb=refs%2Fheads%2Fmaster;hp=88670fdb5a59ccf102cfa252b8ff235e816020d3;hpb=487e04991bdf82d82a690011784a9735c0f60060;p=d2df-sdl.git diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas index 88670fd..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,20 +19,9 @@ unit g_weapons; interface uses - g_textures, g_basic, e_graphics, g_phys, BinEditor, xprofiler; + SysUtils, Classes, mempool, + g_textures, g_basic, e_graphics, g_phys, xprofiler; -const - HIT_SOME = 0; - HIT_ROCKET = 1; - HIT_BFG = 2; - HIT_TRAP = 3; - HIT_FALL = 4; - HIT_WATER = 5; - HIT_ACID = 6; - HIT_ELECTRO = 7; - HIT_FLAME = 8; - HIT_SELF = 9; - HIT_DISCON = 10; type TShot = record @@ -63,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); @@ -84,18 +72,19 @@ 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; procedure g_Weapon_DestroyShot(I: Integer; X, Y: Integer; Loud: Boolean = True); -procedure g_Weapon_SaveState(var Mem: TBinMemoryWriter); -procedure g_Weapon_LoadState(var Mem: TBinMemoryReader); +procedure g_Weapon_SaveState (st: TStream); +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; @@ -104,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; @@ -114,7 +103,7 @@ const WEAPON_MANCUB_FIRE = 25; WEAPON_SKEL_FIRE = 26; - WP_FIRST = WEAPON_KASTET; + WP_FIRST = WEAPON_IRONFIST; WP_LAST = WEAPON_FLAMETHROWER; @@ -126,10 +115,10 @@ implementation uses Math, g_map, g_player, g_gfx, g_sound, g_main, g_panel, - g_console, SysUtils, g_options, g_game, + g_console, g_options, g_game, g_triggers, MAPDEF, e_log, g_monsters, g_saveload, g_language, g_netmsg, g_grid, - binheap, hashtable; + geom, binheap, hashtable, utils, xstreams; type TWaterPanel = record @@ -168,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; @@ -179,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 @@ -338,7 +332,7 @@ var function monsWaterCheck (mon: TMonster): Boolean; begin result := false; // don't stop - if mon.Live and mon.Collide(gWater[WaterMap[a][c]]) and (not InWArray(monidx, chkTrap_mn)) and (i2 < 1023) then //FIXME + if mon.alive and mon.Collide(gWater[WaterMap[a][c]]) and (not InWArray(monidx, chkTrap_mn)) and (i2 < 1023) then //FIXME begin i2 += 1; chkTrap_mn[i2] := monidx; @@ -385,7 +379,7 @@ begin pan := gWater[WaterMap[a][c]]; for d := 0 to High(gPlayers) do begin - if (gPlayers[d] <> nil) and (gPlayers[d].Live) then + if (gPlayers[d] <> nil) and (gPlayers[d].alive) then begin if gPlayers[d].Collide(pan) then begin @@ -468,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; @@ -499,7 +493,7 @@ procedure g_Weapon_BFG9000(X, Y: Integer; SpawnerUID: Word); function monsCheck (mon: TMonster): Boolean; begin result := false; // don't stop - if (mon.Live) and (mon.UID <> SpawnerUID) then + if (mon.alive) and (mon.UID <> SpawnerUID) then begin with mon do begin @@ -533,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; @@ -547,7 +541,7 @@ begin if h <> -1 then for i := 0 to h do - if (gPlayers[i] <> nil) and (gPlayers[i].Live) and (gPlayers[i].UID <> SpawnerUID) then + if (gPlayers[i] <> nil) and (gPlayers[i].alive) and (gPlayers[i].UID <> SpawnerUID) then with gPlayers[i] do if (g_PatchLength(X, Y, GameX+PLAYER_RECT.X+(PLAYER_RECT.Width div 2), GameY+PLAYER_RECT.Y+(PLAYER_RECT.Height div 2)) <= SHOT_BFG_RADIUS) and @@ -700,7 +694,7 @@ begin begin g_Obj_Init(@Obj); - Obj.Rect.Width := 32; + Obj.Rect.Width := 16; Obj.Rect.Height := 16; Triggers := nil; @@ -744,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; @@ -769,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; @@ -802,7 +800,7 @@ var if h <> -1 then for i := 0 to h do - if (gPlayers[i] <> nil) and gPlayers[i].Live and g_Obj_Collide(obj, @gPlayers[i].Obj) then + if (gPlayers[i] <> nil) and gPlayers[i].alive and g_Obj_Collide(obj, @gPlayers[i].Obj) then begin ChkTeam := True; if (Team > 0) and (g_GetUIDType(SpawnerUID) = UID_PLAYER) then @@ -829,7 +827,7 @@ var function monsCheckHit (monidx: Integer; mon: TMonster): Boolean; begin result := false; // don't stop - if mon.Live and g_Obj_Collide(obj, @mon.Obj) then + if mon.alive and g_Obj_Collide(obj, @mon.Obj) then begin if HitMonster(mon, d, obj^.Vel.X, obj^.Vel.Y, SpawnerUID, t) then begin @@ -878,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; @@ -895,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; @@ -936,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; @@ -982,7 +990,7 @@ var mm := Max(abs(dx), abs(dy)); if mm = 0 then mm := 1; - if mon.Live then + if mon.alive then begin HitMonster(mon, ((mon.Obj.Rect.Width div 4)*10*(rad-mm)) div rad, 0, 0, SpawnerUID, HIT_ROCKET); end; @@ -1006,7 +1014,7 @@ begin if h <> -1 then for i := 0 to h do - if (gPlayers[i] <> nil) and gPlayers[i].Live then + if (gPlayers[i] <> nil) and gPlayers[i].alive then with gPlayers[i] do begin dx := Obj.X+Obj.Rect.X+(Obj.Rect.Width div 2)-X; @@ -1052,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; @@ -1060,7 +1068,7 @@ begin if gAdvGibs and (h <> -1) then for i := 0 to h do - if gGibs[i].Live then + if gGibs[i].alive then with gGibs[i] do begin dx := Obj.X+Obj.Rect.X+(Obj.Rect.Width div 2)-X; @@ -1105,7 +1113,7 @@ end; procedure g_Weapon_LoadData(); begin - e_WriteLog('Loading weapons data...', MSG_NOTIFY); + e_WriteLog('Loading weapons data...', TMsgType.Notify); g_Sound_CreateWADEx('SOUND_WEAPON_HITPUNCH', GameWAD+':SOUNDS\HITPUNCH'); g_Sound_CreateWADEx('SOUND_WEAPON_MISSPUNCH', GameWAD+':SOUNDS\MISSPUNCH'); @@ -1123,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'); @@ -1132,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'); @@ -1166,12 +1178,12 @@ begin g_Texture_CreateWADEx('TEXTURE_SHELL_SHELL', GameWAD+':TEXTURES\ESHELL'); //wgunMonHash := hashNewIntInt(); - wgunHitHeap := TBinaryHeapHitTimes.Create(hitTimeLess); + wgunHitHeap := TBinaryHeapHitTimes.Create(); end; procedure g_Weapon_FreeData(); begin - e_WriteLog('Releasing weapons data...', MSG_NOTIFY); + e_WriteLog('Releasing weapons data...', TMsgType.Notify); g_Sound_Delete('SOUND_WEAPON_HITPUNCH'); g_Sound_Delete('SOUND_WEAPON_MISSPUNCH'); @@ -1189,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'); @@ -1198,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'); @@ -1234,7 +1250,7 @@ begin result := false; for i := 0 to High(gPlayers) do begin - if (gPlayers[i] <> nil) and gPlayers[i].Live and gPlayers[i].Collide(X, Y) then + if (gPlayers[i] <> nil) and gPlayers[i].alive and gPlayers[i].Collide(X, Y) then begin if HitPlayer(gPlayers[i], dmg, vx*10, vy*10-3, SpawnerUID, HIT_SOME) then begin @@ -1319,7 +1335,7 @@ begin //vy := (dy*10 div d)*yi; {$IF DEFINED(D2F_DEBUG)} - stt := curTimeMicro(); + stt := getTimeMicro(); {$ENDIF} xx := x; @@ -1350,7 +1366,7 @@ begin begin _collide := True; {$IF DEFINED(D2F_DEBUG)} - stt := curTimeMicro()-stt; + stt := getTimeMicro()-stt; e_WriteLog(Format('*** old trace time: %u microseconds', [LongWord(stt)]), MSG_NOTIFY); showTime := false; {$ENDIF} @@ -1370,7 +1386,7 @@ begin {$IF DEFINED(D2F_DEBUG)} if showTime then begin - stt := curTimeMicro()-stt; + stt := getTimeMicro()-stt; e_WriteLog(Format('*** old trace time: %u microseconds', [LongWord(stt)]), MSG_NOTIFY); end; {$ENDIF} @@ -1382,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].Live 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)} @@ -1426,7 +1454,7 @@ var for i := 0 to High(gPlayers) do begin plr := gPlayers[i]; - if (plr <> nil) and plr.Live then + if (plr <> nil) and plr.alive then begin plr.getMapBox(px, py, pw, ph); if lineAABBIntersects(x, y, x2, y2, px, py, pw, ph, inx, iny) then @@ -1446,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 @@ -1474,6 +1501,8 @@ var {$IF DEFINED(D2F_DEBUG)} stt: UInt64; {$ENDIF} + mit: PMonster; + it: TMonsterGrid.Iter; begin (* if not gwep_debug_fast_trace then @@ -1485,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; @@ -1508,11 +1542,11 @@ begin if (dy > 0) then yi := 1 else if (dy < 0) then yi := -1 else yi := 0; {$IF DEFINED(D2F_DEBUG)} - e_WriteLog(Format('GUN TRACE: (%d,%d) to (%d,%d)', [x, y, x2, y2]), MSG_NOTIFY); - stt := curTimeMicro(); + e_WriteLog(Format('GUN TRACE: (%d,%d) to (%d,%d)', [x, y, x2, y2]), TMsgType.Notify); + stt := getTimeMicro(); {$ENDIF} - wallHitFlag := g_Map_traceToNearestWall(x, y, x2, y2, @wallHitX, @wallHitY); + wallHitFlag := (g_Map_traceToNearestWall(x, y, x2, y2, @wallHitX, @wallHitY) <> nil); if wallHitFlag then begin x2 := wallHitX; @@ -1528,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 @@ -1563,8 +1601,8 @@ begin if wallHitFlag then begin {$IF DEFINED(D2F_DEBUG)} - stt := curTimeMicro()-stt; - e_WriteLog(Format('*** new trace time: %u microseconds', [LongWord(stt)]), MSG_NOTIFY); + stt := getTimeMicro()-stt; + e_WriteLog(Format('*** new trace time: %u microseconds', [LongWord(stt)]), TMsgType.Notify); {$ENDIF} g_GFX_Spark(wallHitX, wallHitY, 2+Random(2), 180+a, 0, 0); if g_Game_IsServer and g_Game_IsNet then MH_SEND_Effect(wallHitX, wallHitY, 180+a, NET_GFX_SPARK); @@ -1572,8 +1610,8 @@ begin else begin {$IF DEFINED(D2F_DEBUG)} - stt := curTimeMicro()-stt; - e_WriteLog(Format('*** new trace time: %u microseconds', [LongWord(stt)]), MSG_NOTIFY); + stt := getTimeMicro()-stt; + e_WriteLog(Format('*** new trace time: %u microseconds', [LongWord(stt)]), TMsgType.Notify); {$ENDIF} end; @@ -1621,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; @@ -1642,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; @@ -1700,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; @@ -1721,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; @@ -1739,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; @@ -1760,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; @@ -1779,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; @@ -1800,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; @@ -1818,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; @@ -1839,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; @@ -1857,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; @@ -1875,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; @@ -1896,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; @@ -1917,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; @@ -1936,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; @@ -1957,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; @@ -1976,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; @@ -1997,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; @@ -2036,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; @@ -2051,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); @@ -2082,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; @@ -2152,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 @@ -2181,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 @@ -2316,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; @@ -2339,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 @@ -2495,9 +2590,9 @@ end; procedure g_Weapon_Draw(); var - i: Integer; + i, fX, fY: Integer; a: SmallInt; - p: TPoint; + p: TDFPoint; begin if Shots = nil then Exit; @@ -2514,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, M_NONE, p, a) + Animation.DrawEx(fX, fY, TMirrorType.None, p, a) else - Animation.Draw(Obj.X, Obj.Y, M_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, M_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 @@ -2568,93 +2670,82 @@ begin end; end; -procedure g_Weapon_SaveState(var Mem: TBinMemoryWriter); +procedure g_Weapon_SaveState (st: TStream); var count, i, j: Integer; - dw: DWORD; begin -// Ñ÷èòàåì êîëè÷åñòâî ñóùåñòâóþùèõ ñíàðÿäîâ: + // Ñ÷èòàåì êîëè÷åñòâî ñóùåñòâóþùèõ ñíàðÿäîâ count := 0; - if Shots <> nil then - for i := 0 to High(Shots) do - if Shots[i].ShotType <> 0 then - count := count + 1; + for i := 0 to High(Shots) do if (Shots[i].ShotType <> 0) then Inc(count); - Mem := TBinMemoryWriter.Create((count+1) * 80); + // Êîëè÷åñòâî ñíàðÿäîâ + utils.WriteInt(st, count); -// Êîëè÷åñòâî ñíàðÿäîâ: - Mem.WriteInt(count); - - if count = 0 then - Exit; + if (count = 0) then exit; for i := 0 to High(Shots) do + begin if Shots[i].ShotType <> 0 then begin - // Ñèãíàòóðà ñíàðÿäà: - dw := SHOT_SIGNATURE; // 'SHOT' - Mem.WriteDWORD(dw); - // Òèï ñíàðÿäà: - Mem.WriteByte(Shots[i].ShotType); - // Öåëü: - Mem.WriteWord(Shots[i].Target); - // UID ñòðåëÿâøåãî: - Mem.WriteWord(Shots[i].SpawnerUID); - // Ðàçìåð ïîëÿ Triggers: - dw := Length(Shots[i].Triggers); - Mem.WriteDWORD(dw); - // Òðèããåðû, àêòèâèðîâàííûå âûñòðåëîì: - for j := 0 to Integer(dw)-1 do - Mem.WriteDWORD(Shots[i].Triggers[j]); - // Îáúåêò ñíàðÿäà: - Obj_SaveState(@Shots[i].Obj, Mem); - // Êîñòûëèíà åáàíàÿ: - Mem.WriteByte(Shots[i].Stopped); + // Ñèãíàòóðà ñíàðÿäà + utils.writeSign(st, 'SHOT'); + utils.writeInt(st, Byte(0)); // version + // Òèï ñíàðÿäà + utils.writeInt(st, Byte(Shots[i].ShotType)); + // Öåëü + utils.writeInt(st, Word(Shots[i].Target)); + // UID ñòðåëÿâøåãî + utils.writeInt(st, Word(Shots[i].SpawnerUID)); + // Ðàçìåð ïîëÿ Triggers + utils.writeInt(st, Integer(Length(Shots[i].Triggers))); + // Òðèããåðû, àêòèâèðîâàííûå âûñòðåëîì + for j := 0 to Length(Shots[i].Triggers)-1 do utils.writeInt(st, LongWord(Shots[i].Triggers[j])); + // Îáúåêò ñíàðÿäà + Obj_SaveState(st, @Shots[i].Obj); + // Êîñòûëèíà åáàíàÿ + utils.writeInt(st, Byte(Shots[i].Stopped)); end; + end; end; -procedure g_Weapon_LoadState(var Mem: TBinMemoryReader); +procedure g_Weapon_LoadState (st: TStream); var - count, i, j: Integer; - dw: DWORD; + count, tc, i, j: Integer; + dw: LongWord; begin - if Mem = nil then - Exit; + if (st = nil) then exit; -// Êîëè÷åñòâî ñíàðÿäîâ: - Mem.ReadInt(count); + // Êîëè÷åñòâî ñíàðÿäîâ + count := utils.readLongInt(st); + if (count < 0) or (count > 1024*1024) then raise XStreamError.Create('invalid shots counter'); SetLength(Shots, count); - if count = 0 then - Exit; + if (count = 0) then exit; for i := 0 to count-1 do begin - // Ñèãíàòóðà ñíàðÿäà: - Mem.ReadDWORD(dw); - if dw <> SHOT_SIGNATURE then // 'SHOT' - begin - raise EBinSizeError.Create('g_Weapons_LoadState: Wrong Shot Signature'); - end; - // Òèï ñíàðÿäà: - Mem.ReadByte(Shots[i].ShotType); - // Öåëü: - Mem.ReadWord(Shots[i].Target); - // UID ñòðåëÿâøåãî: - Mem.ReadWord(Shots[i].SpawnerUID); - // Ðàçìåð ïîëÿ Triggers: - Mem.ReadDWORD(dw); - SetLength(Shots[i].Triggers, dw); - // Òðèããåðû, àêòèâèðîâàííûå âûñòðåëîì: - for j := 0 to Integer(dw)-1 do - Mem.ReadDWORD(Shots[i].Triggers[j]); - // Îáúåêò ïðåäìåòà: - Obj_LoadState(@Shots[i].Obj, Mem); - // Êîñòûëèíà åáàíàÿ: - Mem.ReadByte(Shots[i].Stopped); - - // Óñòàíîâêà òåêñòóðû èëè àíèìàöèè: + // Ñèãíàòóðà ñíàðÿäà + if not utils.checkSign(st, 'SHOT') then raise XStreamError.Create('invalid shot signature'); + if (utils.readByte(st) <> 0) then raise XStreamError.Create('invalid shot version'); + // Òèï ñíàðÿäà: + Shots[i].ShotType := utils.readByte(st); + // Öåëü + Shots[i].Target := utils.readWord(st); + // UID ñòðåëÿâøåãî + Shots[i].SpawnerUID := utils.readWord(st); + // Ðàçìåð ïîëÿ Triggers + tc := utils.readLongInt(st); + if (tc < 0) or (tc > 1024*1024) then raise XStreamError.Create('invalid shot triggers counter'); + SetLength(Shots[i].Triggers, tc); + // Òðèããåðû, àêòèâèðîâàííûå âûñòðåëîì + for j := 0 to tc-1 do Shots[i].Triggers[j] := utils.readLongWord(st); + // Îáúåêò ïðåäìåòà + Obj_LoadState(@Shots[i].Obj, st); + // Êîñòûëèíà åáàíàÿ + Shots[i].Stopped := utils.readByte(st); + + // Óñòàíîâêà òåêñòóðû èëè àíèìàöèè Shots[i].TextureID := DWORD(-1); Shots[i].Animation := nil;