Changeset 6 for trunk/UCore.pas

Timestamp:

Mar 6, 2011, 7:31:53 PM (14 years ago)

Author:

george

Message:

• Added: Fullscreen mode.

File:

• trunk/UCore.pas (modified) (9 diffs)

trunk/UCore.pas

@@ -282 +282 @@
   end;
 
-
   if Engine.KeyState[Ord(Keys.Shoot)] then
     if Bullets.Count < MaxBulletCount then begin
       NewBullet := TBullet.Create;
       NewBullet.Player := Self;
-      NewBullet.Position := Position;
+      NewBullet.Position := Point(Position.X + DirectionToDelta[Direction].X * 4,
+        Position.Y + DirectionToDelta[Direction].Y * 4);
       NewBullet.Direction := Direction;
       Bullets.Add(NewBullet);
@@ -299 +299 @@
     Position.Y := Position.Y + DirectionToDelta[Direction].Y;
 
+    if Engine.World.Surface.ItemsXY[Position.Y, Position.X] <> Byte(smNothing) then begin
+      if (Engine.World.Surface.ItemsXY[Position.Y, Position.X] = Byte(smDirt1)) or
+        (Engine.World.Surface.ItemsXY[Position.Y, Position.X] = Byte(smDirt2)) then
+          Engine.World.Surface.ItemsXY[Position.Y, Position.X] := Byte(smNothing);
+      Bullets.Delete(I);
+    end else
     with Engine.World.Surface do
     if (Position.X >= Count.X) or (Position.X < 0) or
@@ -304 +310 @@
       Bullets.Delete(I) else
       Engine.World.Surface.ItemsXY[Position.Y, Position.X] := Byte(smBullet);
+    Engine.Redraw;
   end;
 end;
@@ -313 +320 @@
 begin
   with Engine.FBitmapLower.Canvas do begin
-    Rectangle(ScreenFrame);
     Brush.Color := SurfaceMatterColors[smRock];
     FillRect(ScreenFrame);
-
 
     with Engine.World do
@@ -326 +331 @@
           Pixels[X, Y] := SurfaceMatterColors[TSurfaceMatter(Surface.ItemsXY[YY, XX])];
       end;
+    Pen.Color := clBlack;
+    Frame(ScreenFrame);
 
     (*CopyRect(ScreenFrame, Engine.World.Surface.Canvas,
@@ -333 +340 @@
       Position.X + (ScreenFrame.Right - ScreenFrame.Left) div 2,
       Position.Y + (ScreenFrame.Bottom - ScreenFrame.Top) div 2));*)
-    TextOut(ScreenFrame.Left, ScreenFrame.Top, Name);
+    //TextOut(ScreenFrame.Left, ScreenFrame.Top, Name);
     //ShowMessage(IntToStr(ScreenFrame.Right - ScreenFrame.Left) + ' ' +
     //IntToStr(ScreenFrame.Bottom - ScreenFrame.Top));
@@ -361 +368 @@
 var
   X, Y: Integer;
+  XX, YY: Integer;
 begin
   Result := smNothing;
   with Engine.World, TTank(Tanks[NewDirection]) do
   for Y := 0 to Image.Count.Y - 1 do
-  for X := 0 to Image.Count.X - 1 do
+  for X := 0 to Image.Count.X - 1 do begin
+    XX := X + NewPosition.X - Image.Count.X div 2;
+    YY := Y + NewPosition.Y - Image.Count.Y div 2;
     if (Image.ItemsXY[Y, X] > 0) and
-    (Surface.ItemsXY[Y + NewPosition.Y, X + NewPosition.X] <> Byte(smNothing)) then
+    (Surface.ItemsXY[YY, XX] <> Byte(smNothing)) then
     begin
       Result := smDirt1;
-      if (Surface.ItemsXY[Y + NewPosition.Y, X + NewPosition.X] <> Byte(smDirt1)) and
-      (Surface.ItemsXY[Y + NewPosition.Y, X + NewPosition.X] <> Byte(smDirt2)) then
+      if (Surface.ItemsXY[YY, XX] <> Byte(smDirt1)) and
+      (Surface.ItemsXY[YY, XX] <> Byte(smDirt2)) then
       begin
-        Result := TSurfaceMatter(Surface.ItemsXY[Y + NewPosition.Y, X + NewPosition.X]);
+        Result := TSurfaceMatter(Surface.ItemsXY[YY, XX]);
         Exit;
       end;
     end;
+  end;
 end;
 
@@ -387 +398 @@
 begin
   with Engine.World do begin
-    Surface.Merge(Surface.CreateIndex(Position.X, Position.Y), TTank(Tanks[Direction]).Image, ShowTankProc);
+    Surface.Merge(Surface.CreateIndex(Position.X - TTank(Tanks[Direction]).Image.Count.X div 2,
+      Position.Y - TTank(Tanks[Direction]).Image.Count.Y div 2), TTank(Tanks[Direction]).Image, ShowTankProc);
   end;
 end;
@@ -399 +411 @@
 begin
   with Engine.World do begin
-    Surface.Merge(Surface.CreateIndex(Position.X, Position.Y), TTank(Tanks[Direction]).Image, HideTankProc);
+    Surface.Merge(Surface.CreateIndex(Position.X - TTank(Tanks[Direction]).Image.Count.X div 2,
+      Position.Y - TTank(Tanks[Direction]).Image.Count.Y div 2), TTank(Tanks[Direction]).Image, HideTankProc);
   end;
 end;