Changeset 335 for trunk

Timestamp:

Sep 7, 2024, 11:53:58 AM (3 months ago)

Author:

chronos

Message:

• Modified: End turn with space key.
• Modified: Code cleanup.

Location:

trunk

Files:

• Core.lfm (modified) (3 diffs)
• Core.lrj (modified) (2 diffs)
• Forms/FormClient.lfm (modified) (2 diffs)
• Player.pas (modified) (3 diffs)

trunk/Core.lfm

@@ -43 +43 @@
       ShortCut = 16466
     end
-    object ASettings: TAction
-      Caption = 'Settings'
-      Hint = 'Application settings'
-      ImageIndex = 6
-      OnExecute = ASettingsExecute
-      ShortCut = 120
+    object AGameSave: TAction
+      Category = 'Game'
+      Caption = 'Save'
+      ImageIndex = 11
+      OnExecute = AGameSaveExecute
     end
     object AGameSaveAs: TAction
@@ -63 +62 @@
       OnExecute = AGameLoadExecute
       ShortCut = 16463
+    end
+    object ASettings: TAction
+      Caption = 'Settings'
+      Hint = 'Application settings'
+      ImageIndex = 6
+      OnExecute = ASettingsExecute
+      ShortCut = 120
     end
     object AAbout: TAction
@@ -90 +96 @@
       ImageIndex = 15
       OnExecute = APlayersStatsExecute
-    end
-    object AGameSave: TAction
-      Category = 'Game'
-      Caption = 'Save'
-      ImageIndex = 11
-      OnExecute = AGameSaveExecute
     end
     object AShowKeyShortcuts: TAction

trunk/Core.lrj

@@ -8 +8 @@
 {"hash":147499204,"name":"tcore.agamerestart.caption","sourcebytes":[82,101,115,116,97,114,116],"value":"Restart"},
 {"hash":216694453,"name":"tcore.agamerestart.hint","sourcebytes":[82,101,115,116,97,114,116,32,103,97,109,101],"value":"Restart game"},
+{"hash":366789,"name":"tcore.agamesave.caption","sourcebytes":[83,97,118,101],"value":"Save"},
+{"hash":124639694,"name":"tcore.agamesaveas.caption","sourcebytes":[83,97,118,101,32,97,115,46,46,46],"value":"Save as..."},
+{"hash":341364,"name":"tcore.agameload.caption","sourcebytes":[76,111,97,100],"value":"Load"},
 {"hash":213582195,"name":"tcore.asettings.caption","sourcebytes":[83,101,116,116,105,110,103,115],"value":"Settings"},
 {"hash":19013235,"name":"tcore.asettings.hint","sourcebytes":[65,112,112,108,105,99,97,116,105,111,110,32,115,101,116,116,105,110,103,115],"value":"Application settings"},
-{"hash":124639694,"name":"tcore.agamesaveas.caption","sourcebytes":[83,97,118,101,32,97,115,46,46,46],"value":"Save as..."},
-{"hash":341364,"name":"tcore.agameload.caption","sourcebytes":[76,111,97,100],"value":"Load"},
 {"hash":4691652,"name":"tcore.aabout.caption","sourcebytes":[65,98,111,117,116],"value":"About"},
 {"hash":322608,"name":"tcore.ahelp.caption","sourcebytes":[72,101,108,112],"value":"Help"},
@@ -18 +19 @@
 {"hash":12447716,"name":"tcore.anewspectatorclient.caption","sourcebytes":[78,101,119,32,115,112,101,99,116,97,116,111,114,32,99,108,105,101,110,116],"value":"New spectator client"},
 {"hash":120556259,"name":"tcore.aplayersstats.caption","sourcebytes":[80,108,97,121,101,114,115,32,115,116,97,116,105,115,116,105,99,115],"value":"Players statistics"},
-{"hash":366789,"name":"tcore.agamesave.caption","sourcebytes":[83,97,118,101],"value":"Save"},
 {"hash":122803571,"name":"tcore.ashowkeyshortcuts.caption","sourcebytes":[75,101,121,32,115,104,111,114,116,99,117,116,115],"value":"Key shortcuts"},
 {"hash":91608562,"name":"tcore.atogglefogofwar.caption","sourcebytes":[84,111,103,103,108,101,32,102,111,103,32,111,102,32,119,97,114],"value":"Toggle fog of war"},

trunk/Forms/FormClient.lfm

@@ -1 +1 @@
 object FormClient: TFormClient
-  Left = 887
+  Left = 882
   Height = 621
-  Top = 404
+  Top = 399
   Width = 775
   Caption = 'Client'
@@ -143 +143 @@
       ImageIndex = 0
       OnExecute = AGameEndTurnExecute
-      ShortCut = 16468
+      ShortCut = 32
     end
     object ASurrender: TAction

trunk/Player.pas

@@ -584 +584 @@
   I: Integer;
 begin
+  Result := Default(TPlayerArray);
   SetLength(Result, 0);
   for I := 0 to Count - 1 do
@@ -596 +597 @@
   I: Integer;
 begin
+  Result := Default(TPlayerArray);
   SetLength(Result, 0);
   for I := 0 to Count - 1 do
@@ -642 +644 @@
     NewNode := Node.OwnerDocument.CreateElement('UnitMove');
     Node.AppendChild(NewNode);
-    TUnitMove(Items[I]).SaveToNode(NewNode);
+    Items[I].SaveToNode(NewNode);
   end;
 end;