Changeset 55 for trunk

Timestamp:

Jan 12, 2017, 9:52:50 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Bad allocation memory during loading sound files under 64-bit architecture.
• Added: Ubuntu packaging files.

Location:

trunk

Files:

• AI/StdAI.ai.txt (modified) (1 diff)
• AI/libstdai-amd64.so (added)
• Graphics/c-evo_120x120.png (added)
• Graphics/c-evo_64x64.png (added)
• Install/deb (added)
• Install/deb/build.sh (added)
• Install/deb/c-evo.desktop (added)
• Install/deb/debian (added)
• Install/deb/debian/c-evo.sh (added)
• Install/deb/debian/changelog (added)
• Install/deb/debian/compat (added)
• Install/deb/debian/control (added)
• Install/deb/debian/copyright (added)
• Install/deb/debian/install (added)
• Install/deb/debian/rules (added)
• Install/deb/debian/source (added)
• Install/deb/debian/source/format (added)
• Integrated.ico (added)
• Integrated.lpi (modified) (2 diffs)
• Integrated.lpr (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (1 diff)
• Sound.pas (modified) (4 diffs)

trunk/AI/StdAI.ai.txt

@@ -5 +5 @@
 #PATH_WIN32 StdAI-win32.dll
 #PATH_WIN64 StdAI-win64.dll
-#PATH_LINUX32 libstdai-linux32.so
-#PATH_LINUX64 libstdai-linux64.so
+#PATH_LINUX32 libstdai-i386.so
+#PATH_LINUX64 libstdai-amd64.so
 #CREDITS Standard AI by Steffen Gerlach.

trunk/Integrated.lpi

@@ -15 +15 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
+      <Icon Value="0"/>
     </General>
     <i18n>
@@ -46 +47 @@
           <CodeGeneration>
             <SmartLinkUnit Value="True"/>
-            <TargetCPU Value="i386"/>
-            <TargetOS Value="win32"/>
             <Optimizations>
               <OptimizationLevel Value="3"/>

trunk/Integrated.lpr

@@ -52 +52 @@
 {$ENDIF}
 
+{$R *.res}
+
 begin
   {$IFDEF DEBUG}

trunk/LocalPlayer/Help.pas

@@ -437 +437 @@
   HelpLineInfo: THelpLineInfo;
 begin
-  MainText.SaveToFile('MainText.txt');
   inherited;
   CaptionColor := Colors.Canvas.Pixels[clkMisc, cliPaperCaption];

trunk/Sound.pas

@@ -4 +4 @@
 
 uses
-  Messages, SysUtils, Classes, Graphics, Controls, Forms {$IFDEF WINDOWS}, MMSystem, Windows{$ENDIF};
+  Messages, SysUtils, Classes, Graphics, Controls, Forms, fgl
+  {$IFDEF WINDOWS}, MMSystem, Windows{$ENDIF};
 
 function PrepareSound(FileName: string): integer;
@@ -92 +93 @@
 end;
 
-type
-  TSoundList = array [0 .. 99999] of TSound;
 
 var
-  nSoundList: integer;
   SoundPlayer: TSoundPlayer;
-  SoundList: ^TSoundList;
+  SoundList: TFPGObjectList<TSound>;
   PlayingSound: TSound;
 
@@ -114 +112 @@
 function PrepareSound(FileName: string): integer;
 begin
-  for result := 1 to Length(FileName) do
-    FileName[result] := upcase(FileName[result]);
-  result := 0;
-  while (result < nSoundList) and (SoundList[result].FFileName <> FileName) do
+  Result := 0;
+  while (result < SoundList.Count) and (SoundList[result].FFileName <> FileName) do
     inc(result);
-  if result = nSoundList then
-  begin // first time this sound is played
-    if nSoundList = 0 then
-      ReallocMem(SoundList, 16 * 4)
-    else if (nSoundList >= 16) and (nSoundList and (nSoundList - 1) = 0) then
-      ReallocMem(SoundList, nSoundList * (2 * 4));
-    inc(nSoundList);
-    SoundList[result] := TSound.Create(FileName);
+  if result = SoundList.Count then begin
+    // first time this sound is played
+    SoundList.Add(TSound.Create(FileName));
+    Result := SoundList.Count - 1;
   end;
 end;
@@ -146 +138 @@
   i: integer;
 
+procedure UnitInit;
+begin
+  SoundList := TFPGObjectList<TSound>.Create;
+  PlayingSound := nil;
+  SoundPlayer := nil;
+end;
+
+procedure UnitDone;
+begin
+  if PlayingSound <> nil then begin
+    PlayingSound.Stop;
+    Sleep(222);
+  end;
+  FreeAndNil(SoundList);
+end;
+
 initialization
 
-nSoundList := 0;
-SoundList := nil;
-PlayingSound := nil;
-SoundPlayer := nil;
+UnitInit;
 
 finalization
 
-if PlayingSound <> nil then
-begin
-  PlayingSound.Stop;
-  Sleep(222);
-end;
-for i := 0 to nSoundList - 1 do
-  SoundList[i].Free;
-ReallocMem(SoundList, 0);
+UnitDone;
 
 end.