Changeset 106 for trunk

Timestamp:

Jan 17, 2015, 8:22:44 PM (10 years ago)

Author:

chronos

Message:

• Added: Check for some configuration values loaded as integers to enumeration type.

Location:

trunk

Files:

• UGame.pas (modified) (2 diffs)
• xtactics.lpi (modified) (1 diff)

trunk/UGame.pas

@@ -2637 +2637 @@
 
 procedure TGame.LoadConfig(Config: TXmlConfig; Path: string);
+var
+  Value: Integer;
 begin
   with Config do begin
@@ -2647 +2649 @@
     Map.Size := Point(GetValue(Path + '/MapSizeX', 10),
       GetValue(Path + '/MapSizeY', 10));
-    Map.Shape := TMapShape(GetValue(Path + '/MapShape', 0));
+    Value := GetValue(Path + '/MapShape', 0);
+    if (Value >= Integer(Low(TMapShape))) and (Value <= Integer(High(TMapShape))) then
+      Map.Shape := TMapShape(Value) else Map.Shape := Low(TMapShape);
     CityEnabled := GetValue(Path + '/CityEnabled', False);
     CityPercentage := GetValue(Path + '/CityPercentage', 10);
     BridgeEnabled := GetValue(Path + '/BridgeEnabled', True);
-    GrowAmount := TGrowAmount(GetValue(Path + '/GrowAmount', Integer(gaBySquareRoot)));
-    GrowCells := TGrowCells(GetValue(Path + '/GrowCells', Integer(gcPlayerAll)));
-    WinObjective := TWinObjective(GetValue(Path + '/WinObjective', Integer(woDefeatAllOponents)));
+    Value := GetValue(Path + '/GrowAmount', Integer(gaBySquareRoot));
+    if (Value >= Integer(Low(TGrowAmount))) and (Value <= Integer(High(TGrowAmount))) then
+      GrowAmount := TGrowAmount(Value) else GrowAmount := Low(TGrowAmount);
+    Value := GetValue(Path + '/GrowCells', Integer(gcPlayerAll));
+    if (Value >= Integer(Low(TGrowCells))) and (Value <= Integer(High(TGrowCells))) then
+      GrowCells := TGrowCells(Value) else GrowCells := Low(TGrowCells);
+    Value := GetValue(Path + '/WinObjective', Integer(woDefeatAllOponents));
+    if (Value >= Integer(Low(TWinObjective))) and (Value <= Integer(High(TWinObjective))) then
+      WinObjective := TWinObjective(Value) else WinObjective := Low(TWinObjective);
   end;
 end;

trunk/xtactics.lpi

@@ -151 +151 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+        <UnitName Value="UFormNew"/>
       </Unit7>
       <Unit8>