X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fengine%2Fe_graphics.pas;h=b88dfb603b61262459c5d260469b0ad013ecf198;hb=1c315223c6dbddff71a842f83a5bb1ef7ff5c6cb;hp=83664b1c0050562fd35ae231ffcf7567d18273e9;hpb=c0312bae4028f5506223fd3a78b3b99798ac8a80;p=d2df-sdl.git

diff --git a/src/engine/e_graphics.pas b/src/engine/e_graphics.pas
index 83664b1..b88dfb6 100644
--- a/src/engine/e_graphics.pas
+++ b/src/engine/e_graphics.pas
@@ -29,9 +29,6 @@ type
     X, Y: Integer;
   end;
 
-  TPoint = MAPDEF.TPoint; // TODO: create an utiltypes.pas or something
-                          //       for other types like rect as well
-
   TPoint2f = record
     X, Y: Double;
   end;
@@ -49,7 +46,7 @@ type
    R, G, B: Byte;
   end;
 
-  PPoint = ^TPoint;
+  PDFPoint = ^TDFPoint;
   PPoint2f = ^TPoint2f;
   PRect = ^TRect;
   PRectWH = ^TRectWH;
@@ -65,7 +62,7 @@ procedure e_ResizeWindow(Width, Height: Integer);
 procedure e_Draw(ID: DWORD; X, Y: Integer; Alpha: Byte; AlphaChannel: Boolean;
                  Blending: Boolean; Mirror: TMirrorType = M_NONE);
 procedure e_DrawAdv(ID: DWORD; X, Y: Integer; Alpha: Byte; AlphaChannel: Boolean;
-                    Blending: Boolean; Angle: Single; RC: PPoint; Mirror: TMirrorType = M_NONE);
+                    Blending: Boolean; Angle: Single; RC: PDFPoint; Mirror: TMirrorType = M_NONE);
 procedure e_DrawSize(ID: DWORD; X, Y: Integer; Alpha: Byte; AlphaChannel: Boolean;
                      Blending: Boolean; Width, Height: Word; Mirror: TMirrorType = M_NONE);
 procedure e_DrawSizeMirror(ID: DWORD; X, Y: Integer; Alpha: Byte; AlphaChannel: Boolean;
@@ -170,7 +167,7 @@ type
     end;
    Space: ShortInt;
    Height: ShortInt;
-   Live: Boolean;
+   alive: Boolean;
   end;
 
   TSavedTexture = record
@@ -683,7 +680,7 @@ begin
 end;
 
 procedure e_DrawAdv(ID: DWORD; X, Y: Integer; Alpha: Byte; AlphaChannel: Boolean;
-                    Blending: Boolean; Angle: Single; RC: PPoint; Mirror: TMirrorType = M_NONE);
+                    Blending: Boolean; Angle: Single; RC: PDFPoint; Mirror: TMirrorType = M_NONE);
 begin
   if e_NoGraphics then Exit;
 
@@ -1054,7 +1051,7 @@ begin
 
  if e_CharFonts <> nil then
  for i := 0 to High(e_CharFonts) do
-  if not e_CharFonts[i].Live then
+  if not e_CharFonts[i].alive then
   begin
    id := i;
    Break;
@@ -1076,7 +1073,7 @@ begin
    end;
 
   Space := sp;
-  Live := True;
+  alive := True;
  end;
 
  Result := id;
@@ -1348,7 +1345,7 @@ begin
   for a := 0 to High(Chars) do
    if Chars[a].TextureID <> -1 then e_DeleteTexture(Chars[a].TextureID);
 
- e_CharFonts[FontID].Live := False;
+ e_CharFonts[FontID].alive := False;
 end;
 
 procedure e_CharFont_RemoveAll();