X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_weapons.pas;h=bcbf4c16352e7c35a3f173e0fddf781f51760538;hb=5472594f32e33da0c66606ec9eebc8f798ef6b54;hp=6f6b60be4f374bee6f2a45d9bce097425dbbfa72;hpb=88ce644db1b40111bdb380f4357fa59bdb5173be;p=d2df-sdl.git diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas index 6f6b60b..bcbf4c1 100644 --- a/src/game/g_weapons.pas +++ b/src/game/g_weapons.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_weapons; interface @@ -1462,7 +1478,7 @@ begin triggers := nil; ShotType := WEAPON_MANCUB_FIRE; - g_Frames_Get(FramesID, 'FRAMES_WEAPON_MANCUBFIRE'); + g_Frames_Get(FramesID, 'FRAMES_WEAPON_MANCUBFIRE'); Animation := TAnimation.Create(FramesID, True, 4); end; @@ -1486,7 +1502,7 @@ begin if Integer(find_id) >= High(Shots) then SetLength(Shots, find_id + 64) end; - + with Shots[find_id] do begin g_Obj_Init(@Obj); @@ -1932,6 +1948,15 @@ begin else e_Draw(TextureID, Obj.X, Obj.Y, 0, True, False); end; + + if g_debug_Frames then + begin + e_DrawQuad(Obj.X+Obj.Rect.X, + Obj.Y+Obj.Rect.Y, + Obj.X+Obj.Rect.X+Obj.Rect.Width-1, + Obj.Y+Obj.Rect.Y+Obj.Rect.Height-1, + 0, 255, 0); + end; end; end; @@ -2097,7 +2122,7 @@ begin if Shots = nil then Exit; if (I > High(Shots)) or (I < 0) then Exit; - + with Shots[I] do begin if ShotType = 0 then Exit; @@ -2141,7 +2166,7 @@ begin s := 'FRAMES_EXPLODE_PLASMA' else s := 'FRAMES_EXPLODE_BSPFIRE'; - + if g_Frames_Get(TextureID, s) and loud then begin Anim := TAnimation.Create(TextureID, False, 3);