Changeset 29 for trunk/LocalPlayer/Term.pas

Timestamp:

Jan 8, 2017, 10:20:03 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Use DirectorySeparator in directory path for platform independence.
• Fixed: Some warining about incorrect pointer arithmetic.
• Added: Support for multi-platform AI library name and location.

Location:

trunk

Files:

• . (modified) (1 prop)
• LocalPlayer/Term.pas (modified) (5 diffs)

trunk

@@ -11 +11 @@
 lib
 heaptrclog.trc
+c-evo

@@ -11 +11 @@
 lib
 heaptrclog.trc
+c-evo

trunk/LocalPlayer/Term.pas

@@ -10 +10 @@
   Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
 
-  LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, Menus,
+  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms, Menus,
   ExtCtrls, dateutils, Platform,
-  ButtonB, ButtonC, EOTButton, Area;
+  ButtonA, ButtonB, ButtonC, EOTButton, Area;
 
 const
@@ -3417 +3417 @@
       doinit := false;
       OpenKey('SOFTWARE\cevo\RegVer9', false);
-      try
-        if ValueExists('TileWidth') then xxt := ReadInteger('TileWidth') div 2;
-        if ValueExists('TileHeight') then yyt := ReadInteger('TileHeight') div 2;
-        if ValueExists('OptionChecked') then OptionChecked := ReadInteger('OptionChecked');
-        if ValueExists('MapOptionChecked') then MapOptionChecked := ReadInteger('MapOptionChecked');
-        if ValueExists('CityMapMask') then CityRepMask := Cardinal(ReadInteger('CityReport'));
-      except
-        doinit := true;
-      end;
+      if ValueExists('TileWidth') then xxt := ReadInteger('TileWidth') div 2
+        else xxt := 48;
+      if ValueExists('TileHeight') then yyt := ReadInteger('TileHeight') div 2
+        else yyt := 24;
+      if ValueExists('OptionChecked') then OptionChecked := ReadInteger('OptionChecked')
+        else OptionChecked := DefaultOptionChecked;
+      if ValueExists('MapOptionChecked') then MapOptionChecked := ReadInteger('MapOptionChecked')
+        else MapOptionChecked := 1 shl moCityNames;
+      if ValueExists('CityMapMask') then CityRepMask := Cardinal(ReadInteger('CityReport'))
+        else CityRepMask := Cardinal(not chPopIncrease and not chNoGrowthWarning and
+        not chCaptured);
       CloseKey;
       if OptionChecked and (7 shl 16) = 0 then
@@ -3431 +3433 @@
       // old regver with no scrolling
     end;
-    Reg.free;
-    if doinit then
-    begin
-      xxt := 48;
-      yyt := 24;
-      OptionChecked := DefaultOptionChecked;
-      MapOptionChecked := 1 shl moCityNames;
-      CityRepMask := Cardinal(not chPopIncrease and not chNoGrowthWarning and
-        not chCaptured);
-    end;
-
-    if FullScreen then
-    begin
+    Reg.Free;
+
+    if FullScreen then begin
       p.Style := $87000000;
       BorderStyle := bsNone;
@@ -3454 +3446 @@
       SoundMode := smOnAlt
     else
-      SoundMode := smOn
+      SoundMode := smOn;
   end;
 
@@ -4978 +4970 @@
     GotoOnly: boolean;
   begin
-    Dist := 0;
     if ClientMode >= scContact then
       exit;

@@ -11 +11 @@
 lib
 heaptrclog.trc
+c-evo