Changeset 62 for trunk

Timestamp:

Jan 5, 2023, 10:14:31 PM (2 years ago)

Author:

chronos

Message:

• Modified: Hide main menu in full screen mode.
• Modified: Use colors as player names.
• Modified: Use black background around player frames.

Location:

trunk

Files:

• Forms/UFormMain.lfm (modified) (7 diffs)
• Forms/UFormMain.pas (modified) (7 diffs)
• Languages/Tunneler.cs.po (modified) (5 diffs)
• Languages/Tunneler.pot (modified) (5 diffs)
• UEngine.pas (modified) (12 diffs)
• UMatter.pas (modified) (1 diff)
• UWorld.pas (modified) (1 diff)
• tunneler.lpi (modified) (1 diff)

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
   Left = 692
-  Height = 536
+  Height = 617
   Top = 479
-  Width = 668
+  Width = 770
   Caption = 'Tunneler'
-  ClientHeight = 506
-  ClientWidth = 668
-  DesignTimePPI = 125
+  ClientHeight = 583
+  ClientWidth = 770
+  DesignTimePPI = 144
   Menu = MainMenu1
   OnClose = FormClose
@@ -19 +19 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 24
-    Top = 482
-    Width = 668
+    Height = 28
+    Top = 555
+    Width = 770
     Panels = <    
       item
-        Width = 64
+        Width = 74
       end    
       item
-        Width = 64
+        Width = 74
       end    
       item
-        Width = 64
+        Width = 74
       end    
       item
-        Width = 64
+        Width = 74
       end    
       item
-        Width = 64
+        Width = 74
       end    
       item
-        Width = 64
+        Width = 74
       end    
       item
-        Width = 64
+        Width = 74
       end>
     ParentFont = False
@@ -50 +50 @@
   object Image1: TImage
     Left = 0
-    Height = 482
+    Height = 555
     Top = 0
-    Width = 668
+    Width = 770
     Align = alClient
     OnResize = Image1Resize
@@ -59 +59 @@
     Interval = 50
     OnTimer = TimerDrawTimer
-    Left = 129
-    Top = 66
+    Left = 149
+    Top = 76
   end
   object MainMenu1: TMainMenu
-    Left = 240
-    Top = 21
+    Left = 276
+    Top = 24
     object MenuItem1: TMenuItem
       Caption = 'Game'
@@ -92 +92 @@
   object TimerEngineTick: TTimer
     Interval = 20
-    OnTimer = TimerEngineTickTimer
-    Left = 125
-    Top = 135
+    Left = 144
+    Top = 156
   end
   object ActionList1: TActionList
-    Left = 375
-    Top = 42
+    Left = 432
+    Top = 48
     object AFullScreen: TAction
       Caption = 'Fullscreen mode'
@@ -132 +131 @@
     RootName = 'CONFIG'
     ReadOnly = False
-    Left = 129
-    Top = 313
+    Left = 149
+    Top = 361
   end
   object AboutDialog1: TAboutDialog
@@ -139 +138 @@
     ThemeManager = Core.ThemeManager1
     ApplicationInfo = Core.ApplicationInfo
-    Left = 267
-    Top = 157
+    Left = 308
+    Top = 181
   end
 end

trunk/Forms/UFormMain.pas

@@ -51 +51 @@
     procedure Image1Resize(Sender: TObject);
     procedure TimerDrawTimer(Sender: TObject);
-    procedure TimerEngineTickTimer(Sender: TObject);
   private
     StartTime: TDateTime;
@@ -58 +57 @@
     procedure LoadConfig;
     procedure SaveConfig;
+    procedure UpdateInterface;
   public
     PersistentForm: TPersistentForm;
@@ -110 +110 @@
 end;
 
-procedure TFormMain.TimerEngineTickTimer(Sender: TObject);
-begin
-  //Engine.Tick;
-end;
-
 procedure TFormMain.LoadConfig;
 begin
@@ -134 +129 @@
   ForceDirectories(ExtractFileDir(XMLConfig1.Filename));
   XMLConfig1.Flush;
+end;
+
+procedure TFormMain.UpdateInterface;
+begin
+  if FullScreenEnabled then Menu := nil
+    else Menu := MainMenu1;
+  {$IFDEF DEBUG}
+  StatusBar1.Visible := not FullScreenEnabled;
+  {$ENDIF}
 end;
 
@@ -169 +173 @@
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
+  TimerDraw.Enabled := False;
   FreeAndNil(PersistentForm);
   FreeAndNil(Engine);
@@ -177 +182 @@
   FullScreenEnabled := not FullScreenEnabled;
   PersistentForm.SetFullScreen(FullScreenEnabled);
+  UpdateInterface;
 end;
 
@@ -238 +244 @@
   PersistentForm.Load(Self, False, True);
   FullScreenEnabled := PersistentForm.FormFullScreen;
-  {$IFDEF DEBUG}
-  StatusBar1.Visible := True;
-  {$ENDIF}
+  UpdateInterface
 end;
 

trunk/Languages/Tunneler.cs.po

@@ -161 +161 @@
 msgstr "Ovládání"
 
+#: uengine.sblue
+msgid "Blue"
+msgstr "Modrá"
+
+#: uengine.scyan
+msgid "Cyan"
+msgstr "Tyrkysová"
+
 #: uengine.sexit
 msgctxt "uengine.sexit"
@@ -166 +174 @@
 msgstr "Odejít"
 
+#: uengine.sgray
+msgid "Gray"
+msgstr "Šedá"
+
+#: uengine.sgreen
+msgid "Green"
+msgstr "Zelená"
+
 #: uengine.sinformation
 msgid "Information"
@@ -173 +189 @@
 msgid "Instructions"
 msgstr "Instrukce"
+
+#: uengine.sorange
+msgid "Orange"
+msgstr "Oranşová"
+
+#: uengine.spink
+msgid "Pink"
+msgstr "Růşová"
 
 #: uengine.splayer
@@ -183 +207 @@
 msgstr "Stiskni ESC pro pokračování"
 
+#: uengine.sred
+msgid "Red"
+msgstr "Červená"
+
 #: uengine.sround
 msgid "Round"
@@ -206 +234 @@
 msgid "World ready"
 msgstr "Svět připraven"
+
+#: uengine.syellow
+msgid "Yellow"
+msgstr "Ŝlutá"
 
 #: uformmain.sround

trunk/Languages/Tunneler.pot

@@ -125 +125 @@
 msgstr ""
 
+#: uengine.sblue
+msgid "Blue"
+msgstr ""
+
+#: uengine.scyan
+msgid "Cyan"
+msgstr ""
+
 #: uengine.sexit
 msgctxt "uengine.sexit"
@@ -130 +138 @@
 msgstr ""
 
+#: uengine.sgray
+msgid "Gray"
+msgstr ""
+
+#: uengine.sgreen
+msgid "Green"
+msgstr ""
+
 #: uengine.sinformation
 msgid "Information"
@@ -138 +154 @@
 msgstr ""
 
+#: uengine.sorange
+msgid "Orange"
+msgstr ""
+
+#: uengine.spink
+msgid "Pink"
+msgstr ""
+
 #: uengine.splayer
 msgid "Player"
@@ -146 +170 @@
 msgstr ""
 
+#: uengine.sred
+msgid "Red"
+msgstr ""
+
 #: uengine.sround
 msgid "Round"
@@ -168 +196 @@
 #: uengine.sworldready
 msgid "World ready"
+msgstr ""
+
+#: uengine.syellow
+msgid "Yellow"
 msgstr ""
 

trunk/UEngine.pas

@@ -276 +276 @@
   SShotsFired = 'Shot fired';
   SWinnerIs = 'The winner is';
+  SGreen = 'Green';
+  SBlue = 'Blue';
+  SRed = 'Red';
+  SPink = 'Pink';
+  SCyan = 'Cyan';
+  SYellow = 'Yellow';
+  SOrange = 'Orange';
+  SGray = 'Gray';
 
 { TTanks }
@@ -1209 +1217 @@
         Text := Name + ': ' + IntToStr(Score);
         TextOut((Bitmap.Width - TextWidth(Text)) div 2, Bitmap.Height div 5 * 2 + Y, Text);
-        Inc(Y, 50);
+        Inc(Y, 60);
       end;
     end;
@@ -1339 +1347 @@
   PlayerPool.Clear;
   with PlayerPool.AddNew do begin
+    Name := SGreen;
     Keys.Left := 65;
     Keys.Down := 83;
@@ -1349 +1358 @@
   end;
   with PlayerPool.AddNew do begin
+    Name := SBlue;
     Keys.Left := 37;
     Keys.Down := 40;
@@ -1359 +1369 @@
   end;
   with PlayerPool.AddNew do begin
+    Name := SRed;
     Keys.Left := 76;
     Keys.Down := 147;
@@ -1368 +1379 @@
   end;
   with PlayerPool.AddNew do begin
+    Name := SPink;
     Keys.Left := 100;
     Keys.Down := 98;
@@ -1377 +1389 @@
   end;
   with PlayerPool.AddNew do begin
+    Name := SCyan;
     Keys.Left := 0;
     Keys.Down := 0;
@@ -1386 +1399 @@
   end;
   with PlayerPool.AddNew do begin
+    Name := SYellow;
     Keys.Left := 0;
     Keys.Down := 0;
@@ -1395 +1409 @@
   end;
   with PlayerPool.AddNew do begin
+    Name := SOrange;
     Keys.Left := 0;
     Keys.Down := 0;
@@ -1404 +1419 @@
   end;
   with PlayerPool.AddNew do begin
+    Name := SGray;
     Keys.Left := 0;
     Keys.Down := 0;
@@ -1417 +1433 @@
     Id := I;
     InitTanks;
-    Name := SPlayer + ' ' + IntToStr(I + 1);
     if I < 2 then Enabled := True;
   end;
@@ -1559 +1574 @@
     FBitmapLower.Count := OldCount;
 
-    if FClearBackground then FBitmapLower.FillAll(clNavy);
+    if FClearBackground then FBitmapLower.FillAll(World.Matters[Integer(miBorder)].Color);
     for I := 0 to Players.Count - 1 do
     if Players[I].Enabled then begin

trunk/UMatter.pas

@@ -11 +11 @@
 
   TMatterIndex = (miSpace, miDirt1, miDirt2, miRock, miBullet1, miBullet2, miBorder,
-      miPlayer1Cannon, miPlayer1Home, miPlayer1TankBody, miPlayer1TankBody2,
-      miPlayer2Cannon, miPlayer2Home, miPlayer2TankBody, miPlayer2TankBody2,
-      miPlayer3Cannon, miPlayer3Home, miPlayer3TankBody, miPlayer3TankBody2,
-      miPlayer4Cannon, miPlayer4Home, miPlayer4TankBody, miPlayer4TankBody2,
-      miPlayer5Cannon, miPlayer5Home, miPlayer5TankBody, miPlayer5TankBody2,
-      miPlayer6Cannon, miPlayer6Home, miPlayer6TankBody, miPlayer6TankBody2,
-      miPlayer7Cannon, miPlayer7Home, miPlayer7TankBody, miPlayer7TankBody2,
-      miPlayer8Cannon, miPlayer8Home, miPlayer8TankBody, miPlayer8TankBody2);
+    miPlayer1Cannon, miPlayer1Home, miPlayer1TankBody, miPlayer1TankBody2,
+    miPlayer2Cannon, miPlayer2Home, miPlayer2TankBody, miPlayer2TankBody2,
+    miPlayer3Cannon, miPlayer3Home, miPlayer3TankBody, miPlayer3TankBody2,
+    miPlayer4Cannon, miPlayer4Home, miPlayer4TankBody, miPlayer4TankBody2,
+    miPlayer5Cannon, miPlayer5Home, miPlayer5TankBody, miPlayer5TankBody2,
+    miPlayer6Cannon, miPlayer6Home, miPlayer6TankBody, miPlayer6TankBody2,
+    miPlayer7Cannon, miPlayer7Home, miPlayer7TankBody, miPlayer7TankBody2,
+    miPlayer8Cannon, miPlayer8Home, miPlayer8TankBody, miPlayer8TankBody2);
 
   { TMatter }

trunk/UWorld.pas

@@ -89 +89 @@
   with Matters.AddNew do begin
     Kind := mkBorder;
-    Color := clNavy;
+    Color := clBlack;
     Player := -1;
   end;

trunk/tunneler.lpi

@@ -203 +203 @@
     <Linking>
       <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
         <UseHeaptrc Value="True"/>
         <UseExternalDbgSyms Value="True"/>