Changeset 207


Ignore:
Timestamp:
May 8, 2020, 6:28:51 PM (21 months ago)
Author:
chronos
Message:
  • Fixed: Removed more compiler hints and warnings.
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Database.pas

    r186 r207  
    1111const
    1212  // additional test flags
    13   FastContact = false; { extra small world with railroad everywhere }
     13  //{$DEFINE FastContact} { extra small world with railroad everywhere }
    1414
    1515  neumax = 4096;
     
    16571657  i, p, p1, uix, Loc1: integer;
    16581658begin
    1659   if FastContact then { Railroad everywhere }
     1659  {$IFDEF FastContact}
     1660    { Railroad everywhere }
    16601661    for Loc1 := 0 to MapSize - 1 do
    16611662      if RealMap[Loc1] and fTerrain >= fGrass then
    16621663        RealMap[Loc1] := RealMap[Loc1] or fRR;
     1664  {$ENDIF}
    16631665
    16641666  { !!!for Loc1:=0 to MapSize-1 do
  • trunk/GameServer.pas

    r205 r207  
    13691369  LogFileName := FileName;
    13701370  MapFileName := Map;
    1371   if FastContact then
    1372   begin
     1371  {$IFDEF FastContact}
    13731372    lx := 24;
    13741373    ly := 42;
    1375   end
    1376   else
    1377   begin
     1374  {$ELSE}
    13781375    lx := Newlx;
    1379     ly := Newly
    1380   end;
     1376    ly := Newly;
     1377  {$ENDIF}
    13811378  MapSize := lx * ly;
    13821379  if MapFileName <> '' then
  • trunk/Integrated.lpr

    r189 r207  
    33
    44uses
    5   Forms, Interfaces, SysUtils,
    6   Protocol in 'Protocol.pas',
    7   CmdList in 'CmdList.pas',
    8   Database in 'Database.pas',
    9   GameServer in 'GameServer.pas',
    10   CityProcessing in 'CityProcessing.pas',
    11   UnitProcessing in 'UnitProcessing.pas',
    12   Direct in 'Direct.pas' {DirectDlg} ,
    13   Start in 'Start.pas' {StartDlg} ,
    14   Messg in 'Messg.pas' {MessgDlg} ,
    15   Inp in 'Inp.pas' {InputDlg} ,
    16   Back in 'Back.pas' {Background} ,
    17   Log in 'Log.pas' {LogDlg} ,
    18   PVSB in 'LocalPlayer\PVSB.pas',
    19   LocalPlayer in 'LocalPlayer\LocalPlayer.pas',
    20   ClientTools in 'LocalPlayer\ClientTools.pas',
    21   Diplomacy in 'LocalPlayer\Diplomacy.pas',
    22   Tribes in 'LocalPlayer\Tribes.pas',
    23   IsoEngine in 'LocalPlayer\IsoEngine.pas',
    24   Term in 'LocalPlayer\Term.pas' {MainScreen} ,
    25   MessgEx in 'LocalPlayer\MessgEx.pas' {MessgExDlg} ,
    26   Help in 'LocalPlayer\Help.pas' {HelpDlg} ,
    27   Select in 'LocalPlayer\Select.pas' {ListDlg} ,
    28   CityScreen in 'LocalPlayer\CityScreen.pas' {CityDlg} ,
    29   UnitStat in 'LocalPlayer\UnitStat.pas' {UnitStatDlg} ,
    30   Draft in 'LocalPlayer\Draft.pas' {DraftDlg} ,
    31   NatStat in 'LocalPlayer\NatStat.pas' {NatStatDlg} ,
    32   Diagram in 'LocalPlayer\Diagram.pas' {DiaDlg} ,
    33   Wonders in 'LocalPlayer\Wonders.pas' {WonderDlg} ,
    34   Nego in 'LocalPlayer\Nego.pas' {NegoDlg} ,
    35   CityType in 'LocalPlayer\CityType.pas' {CityTypeDlg} ,
    36   Enhance in 'LocalPlayer\Enhance.pas' {EnhanceDlg} ,
    37   NoTerm in 'NoTerm.pas' {NoTermDlg} ,
    38   Battle in 'LocalPlayer\Battle.pas' {BattleDlg} ,
    39   Rates in 'LocalPlayer\Rates.pas' {RatesDlg} ,
    40   TechTree in 'LocalPlayer\TechTree.pas' {TechTreeDlg},
    41   ScreenTools, Directories;
     5  Forms, Interfaces, SysUtils, Protocol, GameServer, Direct, Start, Messg, Inp,
     6  Back, Log, LocalPlayer, ClientTools, Tribes, IsoEngine, Term, CityScreen, Nego,
     7  NoTerm, ScreenTools, Directories;
    428
    439{$if declared(UseHeapTrace)}
  • trunk/LocalPlayer/Term.pas

    r206 r207  
    41564156function ScrollDC(Canvas: TCanvas; dx: longint; dy: longint; const lprcScroll:TRect; const lprcClip:TRect; hrgnUpdate:HRGN; lprcUpdate: PRect):Boolean;
    41574157begin
    4158   BitBltCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
     4158  Result := BitBltCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
    41594159    Canvas, lprcScroll.Left, lprcScroll.Top);
    41604160end;
  • trunk/Packages/CevoComponents/Sound.pas

    r205 r207  
    77  StringTables, Directories
    88  {$IFDEF WINDOWS}, MMSystem, Windows{$ENDIF}
    9   {$IFDEF LINUX}, Messages, Process, AsyncProcess{$ENDIF};
     9  {$IFDEF LINUX}, Process, AsyncProcess{$ENDIF};
    1010
    1111type
     
    107107  FreeAndNil(SoundPlayerAsyncProcess);
    108108  {$ENDIF}
    109   inherited Destroy;
     109  inherited;
    110110end;
    111111
  • trunk/Platform.pas

    r17 r207  
    77uses
    88  {$IFDEF Windows}Windows,{$ENDIF}
    9   {$IFDEF Linux}BaseUnix, UnixUtil, Unix,{$ENDIF}
     9  {$IFDEF Linux}Unix,{$ENDIF}
    1010  Classes, SysUtils, DateUtils, SyncObjs;
    1111
    1212function NowPrecise: TDateTime;
    13 function GetLogicalProcessorCount: Integer;
    1413
    1514implementation
     
    5049end;
    5150
    52 function GetLogicalProcessorCount: Integer;
    53 {$IFDEF Windows}
    54 var
    55   SystemInfo: _SYSTEM_INFO;
    56   {$ENDIF}
    57 begin
    58   {$IFDEF Windows}
    59   GetSystemInfo(SystemInfo);
    60   Result := SystemInfo.dwNumberOfProcessors;
    61   {$ENDIF}
    62 end;
    63 
    6451initialization
    6552
Note: See TracChangeset for help on using the changeset viewer.