Changeset 363

Timestamp:

Apr 12, 2021, 3:01:58 PM (3 years ago)

Author:

chronos

Message:

• Modified: TBrain class moved to separate UBrain unit.

Location:

trunk

Files:

• GameServer.pas (modified) (6 diffs)
• Integrated.lpi (modified) (2 diffs)
• LocalPlayer/Select.pas (modified) (1 diff)
• Start.pas (modified) (3 diffs)
• UBrain.pas (added)

trunk/GameServer.pas

@@ -8 +8 @@
 uses
   Protocol, Database, dynlibs, Platform, dateutils, fgl, LazFileUtils,
-  Graphics;
+  Graphics, UBrain;
 
 const
@@ -14 +14 @@
   FirstAICompatibleVersion = $000D00;
   FirstBookCompatibleVersion = $010103;
-
-  // module flags
-  fMultiple = $10000000;
-  fDotNet = $20000000;
-  fUsed = $40000000;
 
   maxBrain = 255;
@@ -52 +47 @@
   TNotifyFunction = procedure(ID: TNotify; Index: Integer = 0);
 
-  TBrainType = (btNoTerm, btSuperVirtual, btTerm, btRandom, btAI);
-
-  { TBrain }
-
-  TBrain = class
-    FileName: string;
-    DLLName: string;
-    Name: string;
-    Credits: string; { filename and full name }
-    hm: TLibHandle; { module handle }
-    Flags: Integer;
-    ServerVersion: Integer;
-    DataVersion: Integer;
-    DataSize: Integer;
-    Client: TClientCall; { client function address }
-    Initialized: Boolean;
-    Kind: TBrainType;
-    Picture: TBitmap;
-    procedure LoadFromFile(AIFileName: string);
-    constructor Create;
-    destructor Destroy; override;
-  end;
-
-  { TBrains }
-
-  TBrains = class(TFPGObjectList<TBrain>)
-    function AddNew: TBrain;
-    function GetKindCount(Kind: TBrainType): Integer;
-    procedure GetByKind(Kind: TBrainType; Brains: TBrains);
-  end;
-
 var
   // PARAMETERS
@@ -98 +62 @@
   BrainTerm: TBrain;
   BrainRandom: TBrain;
-  BrainBeginner: TBrain; // AI to use for beginner level
 
 procedure Init(NotifyFunction: TNotifyFunction);
@@ -254 +217 @@
   BrainRandom.Initialized := false;
   BrainRandom.Kind := btRandom;
-
-  BrainBeginner := nil;
 
   if FindFirst(GetAiDir + DirectorySeparator + '*', faDirectory or faArchive or faReadOnly, f) = 0 then
@@ -4522 +4483 @@
 end;
 
-{ TBrain }
-
-procedure TBrain.LoadFromFile(AIFileName: string);
-var
-  T: Text;
-  Key: string;
-  Value: string;
-  S: string;
-  BasePath: string;
-  I: Integer;
-begin
-  BasePath := ExtractFileDir(AIFileName);
-  FileName := ExtractFileName(ExtractFileNameWithoutExt(ExtractFileNameWithoutExt(AIFileName)));
-  Name := FileName;
-  DLLName := BasePath + DirectorySeparator + Name + '.dll';
-  Credits := '';
-  Flags := fMultiple;
-  Client := nil;
-  Initialized := false;
-  ServerVersion := 0;
-  if not FileExists(AIFileName) then
-    raise Exception.Create(Format('AI specification file %s not found', [AIFileName]));
-  AssignFile(T, AIFileName);
-  Reset(T);
-  while not EOF(T) do
-  begin
-    ReadLn(T, s);
-    s := trim(s);
-    if Pos(' ', S) > 0 then begin
-      Key := Copy(S, 1, Pos(' ', S) - 1);
-      Value := Trim(Copy(S, Pos(' ', S) + 1, Length(S)));
-    end else begin
-      Key := S;
-      Value := '';
-    end;
-    if Key = '#NAME' then
-      Name := Value
-    else if Key = '#.NET' then
-      Flags := Flags or fDotNet
-    else if Key = '#BEGINNER' then
-      BrainBeginner := Self
-    else if Key = '#PATH' then
-      DLLName := BasePath + DirectorySeparator + Value
-    {$IFDEF WINDOWS}{$IFDEF CPU32}
-    else if Key = '#PATH_WIN32' then
-      DLLName := BasePath + DirectorySeparator + Value
-    {$ENDIF}{$ENDIF}
-    {$IFDEF WINDOWS}{$IFDEF CPU64}
-    else if Key = '#PATH_WIN64' then
-      DLLName := BasePath + DirectorySeparator + Value
-    {$ENDIF}{$ENDIF}
-    {$IFDEF LINUX}{$IFDEF CPU32}
-    else if Key = '#PATH_LINUX32' then
-      DLLName := BasePath + DirectorySeparator + Value
-    {$ENDIF}{$ENDIF}
-    {$IFDEF LINUX}{$IFDEF CPU64}
-    else if Key = '#PATH_LINUX64' then
-      DLLName := BasePath + DirectorySeparator + Value
-    {$ENDIF}{$ENDIF}
-    else if Key = '#GAMEVERSION' then
-      for i := 1 to Length(Value) do
-        case Value[i] of
-          '0' .. '9':
-            ServerVersion := ServerVersion and $FFFF00 + ServerVersion and
-              $FF * 10 + ord(Value[i]) - 48;
-          '.':
-          ServerVersion := ServerVersion shl 8;
-      end
-    else if Key = '#CREDITS' then
-      Credits := Value;
-  end;
-  CloseFile(T);
-end;
-
-constructor TBrain.Create;
-begin
-  Picture := TBitmap.Create;
-  Picture.SetSize(64, 64);
-end;
-
-destructor TBrain.Destroy;
-begin
-  FreeAndNil(Picture);
-  inherited;
-end;
-
-{ TBrains }
-
-function TBrains.AddNew: TBrain;
-begin
-  Result := TBrain.Create;
-  Add(Result);
-end;
-
-function TBrains.GetKindCount(Kind: TBrainType): Integer;
-var
-  I: Integer;
-begin
-  Result := 0;
-  for I := 0 to Count - 1 do
-    if Items[I].Kind = Kind then Inc(Result);
-end;
-
-procedure TBrains.GetByKind(Kind: TBrainType; Brains: TBrains);
-var
-  I: Integer;
-begin
-  Brains.Clear;
-  for I := 0 to Count - 1 do
-    if Items[I].Kind = Kind then Brains.Add(Items[I]);
-end;
 
 initialization

trunk/Integrated.lpi

@@ -95 +95 @@
       </Item2>
     </RequiredPackages>
-    <Units Count="43">
+    <Units Count="44">
       <Unit0>
         <Filename Value="Integrated.lpr"/>
@@ -340 +340 @@
         <IsPartOfProject Value="True"/>
       </Unit42>
+      <Unit43>
+        <Filename Value="UBrain.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit43>
     </Units>
   </ProjectOptions>

trunk/LocalPlayer/Select.pas

@@ -1568 +1568 @@
       DispLines := MaxLines;
     InnerHeight := LineDistance * (DispLines + 1) + 24;
-    ClientHeight := InnerHeight + TitleHeight + WideFrame
+    ClientHeight := InnerHeight + TitleHeight + WideFrame;
   end
   else

trunk/Start.pas

@@ -7 +7 @@
   GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area, Types,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls,
-  Menus, Registry,  DrawDlg, fgl, Protocol, UMiniMap;
+  Menus, Registry,  DrawDlg, fgl, Protocol, UMiniMap, UBrain;
 
 type
@@ -750 +750 @@
         yMain + 164 { y0Mini-77 } , Phrases.Lookup('STARTCONTROLS', 16));
       if AutoDiff = 1 then
-        FrameImage(Canvas, BrainBeginner.Picture, xDefault, yDefault, 64,
+        FrameImage(Canvas, Brains.GetBeginner.Picture, xDefault, yDefault, 64,
           64, 0, 0, false)
       else
@@ -977 +977 @@
               if (Page = pgStartRandom) and (I <= AutoEnemies) or
                 (Page = pgStartMap) and (I < nMapStartPositions) then begin
-                if AutoDiff = 1 then PlayersBrain[I] := BrainBeginner
+                if AutoDiff = 1 then PlayersBrain[I] := Brains.GetBeginner
                   else PlayersBrain[I] := BrainDefault;
                 Difficulty[I] := EnemyAutoDiff[AutoDiff];