Changeset 207 for trunk

Timestamp:

May 8, 2020, 6:28:51 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Removed more compiler hints and warnings.

Location:

trunk

Files:

• Database.pas (modified) (2 diffs)
• GameServer.pas (modified) (1 diff)
• Integrated.lpr (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (1 diff)
• Packages/CevoComponents/Sound.pas (modified) (2 diffs)
• Platform.pas (modified) (2 diffs)

trunk/Database.pas

@@ -11 +11 @@
 const
   // additional test flags
-  FastContact = false; { extra small world with railroad everywhere }
+  //{$DEFINE FastContact} { extra small world with railroad everywhere }
 
   neumax = 4096;
@@ -1657 +1657 @@
   i, p, p1, uix, Loc1: integer;
 begin
-  if FastContact then { Railroad everywhere }
+  {$IFDEF FastContact}
+    { Railroad everywhere }
     for Loc1 := 0 to MapSize - 1 do
       if RealMap[Loc1] and fTerrain >= fGrass then
         RealMap[Loc1] := RealMap[Loc1] or fRR;
+  {$ENDIF}
 
   { !!!for Loc1:=0 to MapSize-1 do

trunk/GameServer.pas

@@ -1369 +1369 @@
   LogFileName := FileName;
   MapFileName := Map;
-  if FastContact then
-  begin
+  {$IFDEF FastContact}
     lx := 24;
     ly := 42;
-  end
-  else
-  begin
+  {$ELSE}
     lx := Newlx;
-    ly := Newly
-  end;
+    ly := Newly;
+  {$ENDIF}
   MapSize := lx * ly;
   if MapFileName <> '' then

trunk/Integrated.lpr

@@ -3 +3 @@
 
 uses
-  Forms, Interfaces, SysUtils,
-  Protocol in 'Protocol.pas',
-  CmdList in 'CmdList.pas',
-  Database in 'Database.pas',
-  GameServer in 'GameServer.pas',
-  CityProcessing in 'CityProcessing.pas',
-  UnitProcessing in 'UnitProcessing.pas',
-  Direct in 'Direct.pas' {DirectDlg} ,
-  Start in 'Start.pas' {StartDlg} ,
-  Messg in 'Messg.pas' {MessgDlg} ,
-  Inp in 'Inp.pas' {InputDlg} ,
-  Back in 'Back.pas' {Background} ,
-  Log in 'Log.pas' {LogDlg} ,
-  PVSB in 'LocalPlayer\PVSB.pas',
-  LocalPlayer in 'LocalPlayer\LocalPlayer.pas',
-  ClientTools in 'LocalPlayer\ClientTools.pas',
-  Diplomacy in 'LocalPlayer\Diplomacy.pas',
-  Tribes in 'LocalPlayer\Tribes.pas',
-  IsoEngine in 'LocalPlayer\IsoEngine.pas',
-  Term in 'LocalPlayer\Term.pas' {MainScreen} ,
-  MessgEx in 'LocalPlayer\MessgEx.pas' {MessgExDlg} ,
-  Help in 'LocalPlayer\Help.pas' {HelpDlg} ,
-  Select in 'LocalPlayer\Select.pas' {ListDlg} ,
-  CityScreen in 'LocalPlayer\CityScreen.pas' {CityDlg} ,
-  UnitStat in 'LocalPlayer\UnitStat.pas' {UnitStatDlg} ,
-  Draft in 'LocalPlayer\Draft.pas' {DraftDlg} ,
-  NatStat in 'LocalPlayer\NatStat.pas' {NatStatDlg} ,
-  Diagram in 'LocalPlayer\Diagram.pas' {DiaDlg} ,
-  Wonders in 'LocalPlayer\Wonders.pas' {WonderDlg} ,
-  Nego in 'LocalPlayer\Nego.pas' {NegoDlg} ,
-  CityType in 'LocalPlayer\CityType.pas' {CityTypeDlg} ,
-  Enhance in 'LocalPlayer\Enhance.pas' {EnhanceDlg} ,
-  NoTerm in 'NoTerm.pas' {NoTermDlg} ,
-  Battle in 'LocalPlayer\Battle.pas' {BattleDlg} ,
-  Rates in 'LocalPlayer\Rates.pas' {RatesDlg} ,
-  TechTree in 'LocalPlayer\TechTree.pas' {TechTreeDlg},
-  ScreenTools, Directories;
+  Forms, Interfaces, SysUtils, Protocol, GameServer, Direct, Start, Messg, Inp,
+  Back, Log, LocalPlayer, ClientTools, Tribes, IsoEngine, Term, CityScreen, Nego,
+  NoTerm, ScreenTools, Directories;
 
 {$if declared(UseHeapTrace)}

trunk/LocalPlayer/Term.pas

@@ -4156 +4156 @@
 function ScrollDC(Canvas: TCanvas; dx: longint; dy: longint; const lprcScroll:TRect; const lprcClip:TRect; hrgnUpdate:HRGN; lprcUpdate: PRect):Boolean;
 begin
-  BitBltCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
+  Result := BitBltCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
     Canvas, lprcScroll.Left, lprcScroll.Top);
 end;

trunk/Packages/CevoComponents/Sound.pas

@@ -7 +7 @@
   StringTables, Directories
   {$IFDEF WINDOWS}, MMSystem, Windows{$ENDIF}
-  {$IFDEF LINUX}, Messages, Process, AsyncProcess{$ENDIF};
+  {$IFDEF LINUX}, Process, AsyncProcess{$ENDIF};
 
 type
@@ -107 +107 @@
   FreeAndNil(SoundPlayerAsyncProcess);
   {$ENDIF}
-  inherited Destroy;
+  inherited;
 end;
 

trunk/Platform.pas

@@ -7 +7 @@
 uses
   {$IFDEF Windows}Windows,{$ENDIF}
-  {$IFDEF Linux}BaseUnix, UnixUtil, Unix,{$ENDIF}
+  {$IFDEF Linux}Unix,{$ENDIF}
   Classes, SysUtils, DateUtils, SyncObjs;
 
 function NowPrecise: TDateTime;
-function GetLogicalProcessorCount: Integer;
 
 implementation
@@ -50 +49 @@
 end;
 
-function GetLogicalProcessorCount: Integer;
-{$IFDEF Windows}
-var
-  SystemInfo: _SYSTEM_INFO;
-  {$ENDIF}
-begin
-  {$IFDEF Windows}
-  GetSystemInfo(SystemInfo);
-  Result := SystemInfo.dwNumberOfProcessors;
-  {$ENDIF}
-end;
-
 initialization