Changeset 215 for trunk

Timestamp:

May 25, 2018, 8:30:06 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Exceptions if game should be loaded from the file which doesn't exist.
• Fixed: New game creation after application start if it isn't loaded from file.

Location:

trunk

Files:

• Forms/UFormClient.pas (modified) (1 diff)
• Languages/xtactics.cs.po (modified) (1 diff)
• UCore.pas (modified) (2 diffs)
• UGame.pas (modified) (1 diff)
• UGameProtocol.pas (modified) (2 diffs)

trunk/Forms/UFormClient.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  UGame, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM, UCommPin,
+  UGame, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM,
   UGeometry, UGameClient, UGameProtocol, UThreading;
 

trunk/Languages/xtactics.cs.po

@@ -1026 +1026 @@
 msgid "64-bit UInt read overflow."
 msgstr "Přetečení při čtení 64-bit UInt"
+

trunk/UCore.pas

@@ -8 +8 @@
   Classes, SysUtils, XMLConf, FileUtil, ActnList, Controls, Dialogs, Forms,
   UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator,
-  URegistry, ULastOpenedList, Registry, Menus, UGeometry, UFormClient,
-  UGameServer, UGameClient, fgl, UServerList, UGameProtocol;
+  URegistry, ULastOpenedList, Registry, Menus, UFormClient,
+  UGameServer, UGameClient, fgl, UServerList;
 
 type
@@ -615 +615 @@
 
     CommandLineParams;
-    if not GameLoaded and ReopenLastFile and (LastOpenedList1.Items.Count > 0) then
+    if not GameLoaded and ReopenLastFile and (LastOpenedList1.Items.Count > 0) and
+      FileExists(LastOpenedList1.Items[0]) then
       LoadGame(LastOpenedList1.Items[0]);
     FormClientActions;
 
-    if Game.FileName = '' then StartNewGame;
+    if Game.FileName = '' then begin
+      Game.Assign(GameSettings);
+      StartNewGame;
+    end;
   end;
 end;

trunk/UGame.pas

@@ -3046 +3046 @@
   I: Integer;
 begin
+  ReadXMLFile(Doc, FileName);
   Self.FileName := FileName;
   Clear;
-  ReadXMLFile(Doc, FileName);
   with Doc do try
     if Doc.DocumentElement.NodeName <> 'XtacticsGame' then

trunk/UGameProtocol.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UGame, UVarBlockSerializer, UCommPin, SpecializedList,
-  UCommFrame;
+  Classes, SysUtils, UGame, UVarBlockSerializer, UCommPin, SpecializedList;
 
 type
@@ -50 +49 @@
     FOnSurrender: TNotifyEvent;
     FOnTurnEnd: TNotifyEvent;
-    CommFrame: TCommFrame;
     procedure Receive(Sender: TCommPin; Stream: TListByte);
     procedure SendCmd(Command: TCommand);