small fixes for lazarus build.

cleanup on some code.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@445 b956fd51-792f-4845-bead-9b4dfca2ff2c

4 files changed, 266 insertions, 255 deletions

diff --git a/Game/Code/Classes/UCovers.pas b/Game/Code/Classes/UCovers.pas
index 094fe43c..966277cd 100644
--- a/Game/Code/Classes/UCovers.pas
+++ b/Game/Code/Classes/UCovers.pas
@@ -1,248 +1,263 @@
-unit UCovers;
-
-interface
-
-{$IFDEF FPC}
-  {$MODE Delphi}
-{$ENDIF}
-
-uses OpenGL12,
-     {$IFDEF win32}
-     windows,
-     {$ENDIF}
-     Math,
-     Classes,
-     SysUtils,
-     {$IFNDEF FPC}
-     Graphics,
-     {$ENDIF}
-     UThemes,
-     UTexture;
-
-type
-  TCover = record
-    Name:       string;
-    W:          word;
-    H:          word;
-    Size:       integer;
-    Position:   integer; // position of picture in the cache file
-//    Data:       array of byte;
-  end;
-
-  TCovers = class
-    Cover:      array of TCover;
-    W:          word;
-    H:          word;
-    Size:       integer;
-    Data:       array of byte;
-    WritetoFile: Boolean;
-
-    constructor Create;
-    procedure Load;
-    procedure Save;
-    procedure AddCover(Name: string);
-    function CoverExists(Name: string): boolean;
-    function CoverNumber(Name: string): integer;
-    procedure PrepareData(Name: string);
-  end;
-
-var
-  Covers:     TCovers;
-
-implementation
-
-uses UMain,
-     // UFiles,
-     ULog,
-     DateUtils;
-
-constructor TCovers.Create;
-begin
-  W := 128;
-  H := 128;
-  Size := W*H*3;
-  Load;
-  WritetoFile := True;
-end;
-
-procedure TCovers.Load;
-var
-  F:      File;
-  C:      integer; // cover number
-  W:      word;
-  H:      word;
-  Bits:   byte;
-  NLen:   word;
-  Name:   string;
-//  Data:   array of byte;
-begin
-  if FileExists(GamePath + 'covers.cache') then
-  begin
-    AssignFile(F, GamePath + 'covers.cache');
-    Reset(F, 1);
-
-    WritetoFile := not FileIsReadOnly(GamePath + 'covers.cache');
-
-    SetLength(Cover, 0);
-
-    while not EOF(F) do
-    begin
-      SetLength(Cover, Length(Cover)+1);
-
-      BlockRead(F, W, 2);
-      Cover[High(Cover)].W := W;
-
-      BlockRead(F, H, 2);
-      Cover[High(Cover)].H := H;
-
-      BlockRead(F, Bits, 1);
-
-      Cover[High(Cover)].Size := W * H * (Bits div 8);
-
-      // test
-  //    W := 128;
-  //    H := 128;
-  //    Bits := 24;
-  //    Seek(F, FilePos(F) + 3);
-
-      BlockRead(F, NLen, 2);
-      SetLength(Name, NLen);
-
-      BlockRead(F, Name[1], NLen);
-      Cover[High(Cover)].Name := Name;
-
-      Cover[High(Cover)].Position := FilePos(F);
-      Seek(F, FilePos(F) + W*H*(Bits div 8));
-
-  //    SetLength(Cover[High(Cover)].Data, W*H*(Bits div 8));
-  //    BlockRead(F, Cover[High(Cover)].Data[0], W*H*(Bits div 8));
-
-    end; // While
-
-    CloseFile(F);
-  end; // fileexists
-end;
-
-procedure TCovers.Save;
-var
-  F:      File;
-  C:      integer; // cover number
-  W:      word;
-  H:      word;
-  NLen:   word;
-  Bits:   byte;
-begin
-{  AssignFile(F, GamePath + 'covers.cache');
-  Rewrite(F, 1);
-
-  Bits := 24;
-  for C := 0 to High(Cover) do begin
-    W := Cover[C].W;
-    H := Cover[C].H;
-
-    BlockWrite(F, W, 2);
-    BlockWrite(F, H, 2);
-    BlockWrite(F, Bits, 1);
-
-    NLen := Length(Cover[C].Name);
-    BlockWrite(F, NLen, 2);
-    BlockWrite(F, Cover[C].Name[1], NLen);
-    BlockWrite(F, Cover[C].Data[0], W*H*(Bits div 8));
-  end;
-
-  CloseFile(F);}
-end;
-
-procedure TCovers.AddCover(Name: string);
-var
-  B:      integer;
-  F:      File;
-  C:      integer; // cover number
-  NLen:   word;
-  Bits:   byte;
-begin
-  if not CoverExists(Name) then begin
-    SetLength(Cover, Length(Cover)+1);
-    Cover[High(Cover)].Name := Name;
-
-    Cover[High(Cover)].W := W;
-    Cover[High(Cover)].H := H;
-    Cover[High(Cover)].Size := Size;
-
-    // do not copy data. write them directly to file
-//    SetLength(Cover[High(Cover)].Data, Size);
-//    for B := 0 to Size-1 do
-//      Cover[High(Cover)].Data[B] := CacheMipmap[B];
-
-    if WritetoFile then
-    begin
-      AssignFile(F, GamePath + 'covers.cache');
-      if FileExists(GamePath + 'covers.cache') then begin
-        Reset(F, 1);
-        Seek(F, FileSize(F));
-      end else
-        Rewrite(F, 1);
-
-        Bits := 24;
-
-        BlockWrite(F, W, 2);
-        BlockWrite(F, H, 2);
-        BlockWrite(F, Bits, 1);
-
-        NLen := Length(Name);
-        BlockWrite(F, NLen, 2);
-        BlockWrite(F, Name[1], NLen);
-
-        Cover[High(Cover)].Position := FilePos(F);
-        BlockWrite(F, CacheMipmap[0], W*H*(Bits div 8));
-
-        CloseFile(F);
-      end;
-  end
-  else
-    Cover[High(Cover)].Position := 0;
-end;
-
-function TCovers.CoverExists(Name: string): boolean;
-var
-  C:    integer; // cover
-begin
-  Result := false;
-  C := 0;
-  while (C <= High(Cover)) and (Result = false) do begin
-    if Cover[C].Name = Name then Result := true;
-    Inc(C);
-  end;
-end;
-
-function TCovers.CoverNumber(Name: string): integer;
-var
-  C:    integer;
-begin
-  Result := -1;
-  C := 0;
-  while (C <= High(Cover)) and (Result = -1) do begin
-    if Cover[C].Name = Name then Result := C;
-    Inc(C);
-  end;
-end;
-
-procedure TCovers.PrepareData(Name: string);
-var
-  F:  File;
-  C:  integer;
-begin
-  if FileExists(GamePath + 'covers.cache') then begin
-    AssignFile(F, GamePath + 'covers.cache');
-    Reset(F, 1);
-
-    C := CoverNumber(Name);
-    SetLength(Data, Cover[C].Size);
-    if Length(Data) < 6 then beep;
-    Seek(F, Cover[C].Position);
-    BlockRead(F, Data[0], Cover[C].Size);
-    CloseFile(F);
-  end;
-end;
-
-end.
+unit UCovers;

+

+interface

+

+{$IFDEF FPC}

+  {$MODE Delphi}

+{$ENDIF}

+

+uses OpenGL12,

+     {$IFDEF win32}

+     windows,

+     {$ENDIF}

+     Math,

+     Classes,

+     SysUtils,

+     {$IFNDEF FPC}

+     Graphics,

+     {$ENDIF}

+     UThemes,

+     UTexture;

+

+type

+  TCover = record

+    Name:       string;

+    W:          word;

+    H:          word;

+    Size:       integer;

+    Position:   integer; // position of picture in the cache file

+//    Data:       array of byte;

+  end;

+

+  TCovers = class

+    Cover:      array of TCover;

+    W:          word;

+    H:          word;

+    Size:       integer;

+    Data:       array of byte;

+    WritetoFile: Boolean;

+

+    constructor Create;

+    procedure Load;

+    procedure Save;

+    procedure AddCover(Name: string);

+    function CoverExists(Name: string): boolean;

+    function CoverNumber(Name: string): integer;

+    procedure PrepareData(Name: string);

+  end;

+

+var

+  Covers:     TCovers;

+

+implementation

+

+uses UMain,

+     // UFiles,

+     ULog,

+     DateUtils;

+

+constructor TCovers.Create;

+begin

+  W := 128;

+  H := 128;

+  Size := W*H*3;

+  Load;

+  WritetoFile := True;

+end;

+

+procedure TCovers.Load;

+var

+  F:      File;

+  C:      integer; // cover number

+  W:      word;

+  H:      word;

+  Bits:   byte;

+  NLen:   word;

+  Name:   string;

+//  Data:   array of byte;

+begin

+  if FileExists(GamePath + 'covers.cache') then

+  begin

+    AssignFile(F, GamePath + 'covers.cache');

+    Reset(F, 1);

+

+    WritetoFile := not FileIsReadOnly(GamePath + 'covers.cache');

+

+    SetLength(Cover, 0);

+

+    while not EOF(F) do

+    begin

+      SetLength(Cover, Length(Cover)+1);

+

+      BlockRead(F, W, 2);

+      Cover[High(Cover)].W := W;

+

+      BlockRead(F, H, 2);

+      Cover[High(Cover)].H := H;

+

+      BlockRead(F, Bits, 1);

+

+      Cover[High(Cover)].Size := W * H * (Bits div 8);

+

+      // test

+  //    W := 128;

+  //    H := 128;

+  //    Bits := 24;

+  //    Seek(F, FilePos(F) + 3);

+

+      BlockRead(F, NLen, 2);

+      SetLength(Name, NLen);

+

+      BlockRead(F, Name[1], NLen);

+      Cover[High(Cover)].Name := Name;

+

+      Cover[High(Cover)].Position := FilePos(F);

+      Seek(F, FilePos(F) + W*H*(Bits div 8));

+

+  //    SetLength(Cover[High(Cover)].Data, W*H*(Bits div 8));

+  //    BlockRead(F, Cover[High(Cover)].Data[0], W*H*(Bits div 8));

+

+    end; // While

+

+    CloseFile(F);

+  end; // fileexists

+end;

+

+procedure TCovers.Save;

+var

+  F:      File;

+  C:      integer; // cover number

+  W:      word;

+  H:      word;

+  NLen:   word;

+  Bits:   byte;

+begin

+{  AssignFile(F, GamePath + 'covers.cache');

+  Rewrite(F, 1);

+

+  Bits := 24;

+  for C := 0 to High(Cover) do begin

+    W := Cover[C].W;

+    H := Cover[C].H;

+

+    BlockWrite(F, W, 2);

+    BlockWrite(F, H, 2);

+    BlockWrite(F, Bits, 1);

+

+    NLen := Length(Cover[C].Name);

+    BlockWrite(F, NLen, 2);

+    BlockWrite(F, Cover[C].Name[1], NLen);

+    BlockWrite(F, Cover[C].Data[0], W*H*(Bits div 8));

+  end;

+

+  CloseFile(F);}

+end;

+

+procedure TCovers.AddCover(Name: string);

+var

+  B:      integer;

+  F:      File;

+  C:      integer; // cover number

+  NLen:   word;

+  Bits:   byte;

+begin

+  if not CoverExists(Name) then

+  begin

+    SetLength(Cover, Length(Cover)+1);

+    Cover[High(Cover)].Name := Name;

+

+    Cover[High(Cover)].W := W;

+    Cover[High(Cover)].H := H;

+    Cover[High(Cover)].Size := Size;

+

+    // do not copy data. write them directly to file

+//    SetLength(Cover[High(Cover)].Data, Size);

+//    for B := 0 to Size-1 do

+//      Cover[High(Cover)].Data[B] := CacheMipmap[B];

+

+    if WritetoFile then

+    begin

+      AssignFile(F, GamePath + 'covers.cache');

+      

+      if FileExists(GamePath + 'covers.cache') then

+      begin

+        Reset(F, 1);

+        Seek(F, FileSize(F));

+      end

+      else

+      begin

+        Rewrite(F, 1);

+      end;

+

+      Bits := 24;

+

+      BlockWrite(F, W, 2);

+      BlockWrite(F, H, 2);

+      BlockWrite(F, Bits, 1);

+

+      NLen := Length(Name);

+      BlockWrite(F, NLen, 2);

+      BlockWrite(F, Name[1], NLen);

+

+      Cover[High(Cover)].Position := FilePos(F);

+      BlockWrite(F, CacheMipmap[0], W*H*(Bits div 8));

+

+      CloseFile(F);

+    end;

+  end

+  else

+    Cover[High(Cover)].Position := 0;

+end;

+

+function TCovers.CoverExists(Name: string): boolean;

+var

+  C:    integer; // cover

+begin

+  Result := false;

+  C      := 0;

+  

+  while (C <= High(Cover)) and (Result = false) do

+  begin

+    if Cover[C].Name = Name then

+      Result := true;

+      

+    Inc(C);

+  end;

+end;

+

+function TCovers.CoverNumber(Name: string): integer;

+var

+  C:    integer;

+begin

+  Result := -1;

+  C      := 0;

+  

+  while (C <= High(Cover)) and (Result = -1) do

+  begin

+    if Cover[C].Name = Name then

+      Result := C;

+      

+    Inc(C);

+  end;

+end;

+

+procedure TCovers.PrepareData(Name: string);

+var

+  F:  File;

+  C:  integer;

+begin

+  if FileExists(GamePath + 'covers.cache') then

+  begin

+    AssignFile(F, GamePath + 'covers.cache');

+    Reset(F, 1);

+

+    C := CoverNumber(Name);

+    SetLength(Data, Cover[C].Size);

+    if Length(Data) < 6 then beep;

+    Seek(F, Cover[C].Position);

+    BlockRead(F, Data[0], Cover[C].Size);

+    CloseFile(F);

+  end;

+end;

+

+end.

diff --git a/Game/Code/Classes/UGraphic.pas b/Game/Code/Classes/UGraphic.pas
index 6ea89c0f..44c068a0 100644
--- a/Game/Code/Classes/UGraphic.pas
+++ b/Game/Code/Classes/UGraphic.pas
@@ -312,9 +312,6 @@ begin
 

   Log.LogStatus('Loading Textures - C', 'LoadTextures');

 

-  {$IFNDEF FPC}

-  // TODO : jb_FPC  why does this cause lazarus build, to have runtime error..

-  // TODO : jb_FPC - START HERE !!

   //Line Bonus PopUp

   for P := 0 to 8 do

     begin

@@ -357,8 +354,6 @@ begin
     Tex_ScoreBG[P] := Texture.LoadTexture(pchar(Skin.GetTextureFileName('ScoreBG')),  'PNG', 'Colorized', Col);

   end;

 

-  {$ENDIF}

-

   Log.LogStatus('Loading Textures - D', 'LoadTextures');

 end;

 

diff --git a/Game/Code/Classes/UMusic.pas b/Game/Code/Classes/UMusic.pas
index b9ed47b4..b9f93b29 100644
--- a/Game/Code/Classes/UMusic.pas
+++ b/Game/Code/Classes/UMusic.pas
@@ -233,7 +233,7 @@ begin
   if not BASS_Init(1, 44100, 0, fHWND, nil) then

   begin

     {$IFNDEF FPC}

-    // TODO : JB_lazarus find a way to do this nice..

+    // TODO : JB_linux find a way to do this nice..

     Application.MessageBox ('Could not initialize BASS', 'Error');

     {$ENDIF}

     Exit;

diff --git a/Game/Code/Classes/UTexture.pas b/Game/Code/Classes/UTexture.pas
index 76eab676..eb01b4c4 100644
--- a/Game/Code/Classes/UTexture.pas
+++ b/Game/Code/Classes/UTexture.pas
@@ -980,7 +980,8 @@ begin
     // use cache texture

     C := Covers.CoverNumber(Name);

 

-    if TextureDatabase.Texture[T].TextureCache.TexNum = -1 then begin

+    if TextureDatabase.Texture[T].TextureCache.TexNum = -1 then

+    begin

       // load texture

       Covers.PrepareData(Name);

       TextureDatabase.Texture[T].TextureCache := CreateTexture(Covers.Data, Name, Covers.Cover[C].W, Covers.Cover[C].H, 24);