Changeset 43 for trunk/UCore.pas

Timestamp:

Apr 19, 2019, 11:25:56 AM (6 years ago)

Author:

chronos

Message:

• Fixed: Configurable player tank colors in New game dialog.

File:

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

trunk/UCore.pas

@@ -106 +106 @@
     function DigProc(Item1, Item2: Byte): Byte;
   public
-    Color: TColor;
+    Color1: TColor;
+    Color2: TColor;
     Id: Integer;
     Enabled: Boolean;
@@ -222 +223 @@
     FDrawThread: TDrawThread;
     FSystemThread: TSystemThread;
-    IntfImage: TLazIntfImage;
     ClearBackground: Boolean;
     procedure InitDigMasks;
@@ -341 +341 @@
 var
   I: Integer;
-begin
-  Clear;
-  Count := Config.GetValue(DOMString(Path + '/Count'), 0);
+  NewCount: Integer;
+begin
+  NewCount := Config.GetValue(DOMString(Path + '/Count'), 0);
+  while Count > NewCount do Delete(Count - 1);
+  while Count < NewCount do Add(TPlayer.Create);
   for I := 0 to Count - 1 do begin
     Items[I] := TPlayer.Create;
@@ -1285 +1287 @@
   Id := Source.Id;
   Keys := Source.Keys;
-  Color := Source.Color;
+  Color1 := Source.Color1;
+  Color2 := Source.Color2;
   Energy := Source.Energy;
   Shield := Source.Shield;
@@ -1298 +1301 @@
 begin
   with Config do begin
-    Self.Name := string(GetValue(DOMString(Path + '/Name'), ''));
-    Color := GetValue(DOMString(Path + '/Color'), 0);
-    Enabled := GetValue(DOMString(Path + '/Enabled'), False);
-    Keys.Left := GetValue(DOMString(Path + '/Keys/Left'), 0);
-    Keys.Right := GetValue(DOMString(Path + '/Keys/Right'), 0);
-    Keys.Down := GetValue(DOMString(Path + '/Keys/Down'), 0);
-    Keys.Up := GetValue(DOMString(Path + '/Keys/Up'), 0);
-    Keys.Shoot := GetValue(DOMString(Path + '/Keys/Shoot'), 0);
+    Self.Name := string(GetValue(DOMString(Path + '/Name'), UnicodeString(Name)));
+    Color1 := GetValue(DOMString(Path + '/Color1'), Color1);
+    Color2 := GetValue(DOMString(Path + '/Color2'), Color2);
+    Enabled := GetValue(DOMString(Path + '/Enabled'), Enabled);
+    Keys.Left := GetValue(DOMString(Path + '/Keys/Left'), Keys.Left);
+    Keys.Right := GetValue(DOMString(Path + '/Keys/Right'), Keys.Right);
+    Keys.Down := GetValue(DOMString(Path + '/Keys/Down'), Keys.Down);
+    Keys.Up := GetValue(DOMString(Path + '/Keys/Up'), Keys.Up);
+    Keys.Shoot := GetValue(DOMString(Path + '/Keys/Shoot'), Keys.Shoot);
   end;
   InitTanks;
@@ -1314 +1318 @@
   with Config do begin
     SetValue(DOMString(Path + '/Name'), DOMString(Self.Name));
-    SetValue(DOMString(Path + '/Color'), Color);
+    SetValue(DOMString(Path + '/Color1'), Color1);
+    SetValue(DOMString(Path + '/Color2'), Color2);
     SetValue(DOMString(Path + '/Enabled'), Enabled);
     SetValue(DOMString(Path + '/Keys/Left'), Keys.Left);
@@ -1569 +1574 @@
     Keys.Up := 87;
     Keys.Shoot := 69;
+    Color1 := $00ff00;
+    Color2 := $00a000;
     Enabled := True;
   end;
@@ -1577 +1584 @@
     Keys.Up := 38;
     Keys.Shoot := 17;
+    Color1 := $ff2c2c;
+    Color2 := $b60000;
     Enabled := True;
   end;
@@ -1585 +1594 @@
     Keys.Up := 80;
     Keys.Shoot := 191;
+    Color1 := $0000ff;
+    Color2 := $0000a0;
   end;
   with PlayerPool.AddNew do begin
@@ -1592 +1603 @@
     Keys.Up := 104;
     Keys.Shoot := 105;
+    Color1 := $ff2cff;
+    Color2 := $b600b6;
   end;
   with PlayerPool.AddNew do begin
@@ -1599 +1612 @@
     Keys.Up := 0;
     Keys.Shoot := 0;
+    Color1 := $ffff2c;
+    Color2 := $b6b600;
   end;
   with PlayerPool.AddNew do begin
@@ -1606 +1621 @@
     Keys.Up := 0;
     Keys.Shoot := 0;
+    Color1 := $2cffff;
+    Color2 := $00b6b6;
   end;
   with PlayerPool.AddNew do begin
@@ -1613 +1630 @@
     Keys.Up := 0;
     Keys.Shoot := 0;
+    Color1 := $008cff;
+    Color2 := $002da0;
   end;
   with PlayerPool.AddNew do begin
@@ -1620 +1639 @@
     Keys.Up := 0;
     Keys.Shoot := 0;
+    Color1 := $d0d0d0;
+    Color2 := $707070;
   end;
   for I := 0 to PlayerPool.Count - 1 do
@@ -1644 +1665 @@
     Players.Add(NewPlayer);
     Score := 0;
+    World.Matters[Integer(miPlayer1Home) + I * 4].Color := Color1;
+    World.Matters[Integer(miPlayer1TankBody) + I * 4].Color := Color1;
+    World.Matters[Integer(miPlayer1TankBody2) + I * 4].Color := Color2;
   end;
 end;
@@ -1701 +1725 @@
   FBitmapLower := TBitmapTColor.Create;
   FBitmapLock := TCriticalSection.Create;
-  IntfImage := TLazIntfImage.Create(1, 1);
   PlayerPool := TPlayers.Create;
   PlayerPool.Engine := Self;
@@ -1729 +1752 @@
   FreeAndNil(FBitmapLower);
   FreeAndNil(FBitmapLock);
-  FreeAndNil(IntfImage);
   FreeAndNil(PlayerPool);
   FreeAndNil(Players);
@@ -1765 +1787 @@
     try
       Lock.Acquire;
-      if ClearBackground then FBitmapLower.FillAll(clNavy);
+      //if ClearBackground then FBitmapLower.FillAll(clNavy);
       for I := 0 to Players.Count - 1 do begin
         TPlayer(Players[I]).Paint;