X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_playermodel.pas;h=72f5fb23e726f916f937f888e9991ebd7e69bbbf;hb=6d6df4e3427cd01e03e172984c9d0d391ff38032;hp=3c121dba7854435f9a2e5d6a5cc4419b82f72a40;hpb=223356cbae3197afc861efa6241c4ae91bd92885;p=d2df-sdl.git diff --git a/src/game/g_playermodel.pas b/src/game/g_playermodel.pas index 3c121db..72f5fb2 100644 --- a/src/game/g_playermodel.pas +++ b/src/game/g_playermodel.pas @@ -19,7 +19,7 @@ unit g_playermodel; interface uses - g_textures, g_basic, g_weapons, e_graphics, wadreader; + MAPDEF, g_textures, g_basic, g_weapons, e_graphics, wadreader; const A_STAND = 0; @@ -78,7 +78,7 @@ type TGibsArray = Array of TGibSprite; TWeaponPoints = Array [WP_FIRST + 1..WP_LAST] of Array [A_STAND..A_LAST] of - Array [D_LEFT..D_RIGHT] of Array of TPoint; + Array [D_LEFT..D_RIGHT] of Array of TDFPoint; TPlayerModel = class (TObject) private @@ -95,7 +95,7 @@ type FCurrentWeapon: Byte; FDrawWeapon: Boolean; FFlag: Byte; - FFlagPoint: TPoint; + FFlagPoint: TDFPoint; FFlagAngle: SmallInt; FFlagAnim: TAnimation; FFire: Boolean; @@ -141,7 +141,7 @@ type TPlayerModelInfo = record Info: TModelInfo; ModelSpeed: Array [A_STAND..A_PAIN] of Byte; - FlagPoint: TPoint; + FlagPoint: TDFPoint; FlagAngle: SmallInt; WeaponPoints: TWeaponPoints; Gibs: TGibsArray; @@ -158,10 +158,10 @@ const W_ACT_NORMAL = 0; W_ACT_FIRE = 1; - FLAG_BASEPOINT: TPoint = (X:16; Y:43); - FLAG_DEFPOINT: TPoint = (X:32; Y:16); + FLAG_BASEPOINT: TDFPoint = (X:16; Y:43); + FLAG_DEFPOINT: TDFPoint = (X:32; Y:16); FLAG_DEFANGLE = -20; - WEAPONBASE: Array [WP_FIRST + 1..WP_LAST] of TPoint = + WEAPONBASE: Array [WP_FIRST + 1..WP_LAST] of TDFPoint = ((X:8; Y:4), (X:8; Y:8), (X:16; Y:16), (X:16; Y:24), (X:16; Y:16), (X:24; Y:24), (X:16; Y:16), (X:24; Y:24), (X:16; Y:16), (X:8; Y:8)); @@ -198,7 +198,7 @@ begin end; end; -function GetPoint(var str: String; var point: TPoint): Boolean; +function GetPoint(var str: String; var point: TDFPoint): Boolean; var a, x, y: Integer; s: String; @@ -802,7 +802,7 @@ procedure TPlayerModel.Draw(X, Y: Integer; Alpha: Byte = 0); var Mirror: TMirrorType; pos, act: Byte; - p: TPoint; + p: TDFPoint; begin // Ôëàãè: if Direction = D_LEFT then