renamed Ulyrics.bak.pas hack to Ulyrics_bak.pas for lazarus compatiblity.

minor changes to get code base compiling in Lazarus(win) and Delphi

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

3 files changed, 164 insertions, 143 deletions

diff --git a/Game/Code/Classes/UCommon.pas b/Game/Code/Classes/UCommon.pas
index b7ddd7ba..b572a768 100644
--- a/Game/Code/Classes/UCommon.pas
+++ b/Game/Code/Classes/UCommon.pas
@@ -1,132 +1,136 @@
-unit UCommon;
-
-interface
-
-{$IFDEF FPC}
-  {$MODE Delphi}
-{$ENDIF}
-
-uses
-
-{$IFDEF win32}
-   windows;
-{$ELSE}
-   lcltype,
-   messages;
-{$ENDIF}
-
-{$IFNDEF win32}
-type
-  hStream        = THandle;
-  HGLRC          = THandle;
-  TLargeInteger  = Int64;
-  TWin32FindData = LongInt;
-{$ENDIF}
-
-{$IFDEF FPC}
-
-type
-  TWndMethod = procedure(var Message: TMessage) of object;
-
-function  RandomRange(aMin: Integer; aMax: Integer) : Integer;
-//function  AllocateHWnd(Method: TWndMethod): HWND;
-//procedure DeallocateHWnd(Wnd: HWND);
-
-function MaxValue(const Data: array of Double): Double;
-function MinValue(const Data: array of Double): Double;
-{$ENDIF}
-
-{$IFNDEF win32}
-(*
-  function QueryPerformanceCounter(lpPerformanceCount:TLARGEINTEGER):Bool;
-  function QueryPerformanceFrequency(lpFrequency:TLARGEINTEGER):Bool;
-*)
-  procedure ZeroMemory( Destination: Pointer; Length: DWORD );
-{$ENDIF}
-
-implementation
-
-{$IFNDEF win32}
-procedure ZeroMemory( Destination: Pointer; Length: DWORD );
-begin
-  FillChar( Destination^, Length, 0 );
-end; //ZeroMemory
-
-(*
-function QueryPerformanceCounter(lpPerformanceCount:TLARGEINTEGER):Bool;
-
-  // From http://en.wikipedia.org/wiki/RDTSC
-  function RDTSC: Int64; register;
-  asm
-    rdtsc
-  end;
-
-begin
-  // Use clock_gettime  here maybe ... from libc
-  lpPerformanceCount := RDTSC();
-  result := true;
-end;
-
-function QueryPerformanceFrequency(lpFrequency:TLARGEINTEGER):Bool;
-begin
-  lpFrequency := 0;
-  result := true;
-end;
-*)
-{$ENDIF}
-
-
-{$IFDEF FPC}
-
-function MaxValue(const Data: array of Double): Double;
-var
-  I: Integer;
-begin
-  Result := Data[Low(Data)];
-  for I := Low(Data) + 1 to High(Data) do
-    if Result < Data[I] then
-      Result := Data[I];
-end;
-
-function MinValue(const Data: array of Double): Double;
-var
-  I: Integer;
-begin
-  Result := Data[Low(Data)];
-  for I := Low(Data) + 1 to High(Data) do
-    if Result > Data[I] then
-      Result := Data[I];
-end;
-
-function RandomRange(aMin: Integer; aMax: Integer) : Integer;
-begin
-RandomRange := Random(aMax-aMin) + aMin ;
-end;
-
-
-// NOTE !!!!!!!!!!
-// AllocateHWnd is in lclintfh.inc
-
-{
-// TODO : JB this is dodgey and bad... find a REAL solution !
-function AllocateHWnd(Method: TWndMethod): HWND;
-var
-  TempClass: TWndClass;
-  ClassRegistered: Boolean;
-begin
-  Result := CreateWindowEx(WS_EX_TOOLWINDOW, '', '', WS_POPUP , 0, 0, 0, 0, 0, 0, HInstance, nil);
-end;
-
-procedure DeallocateHWnd(Wnd: HWND);
-var
-  Instance: Pointer;
-begin
-  Instance := Pointer(GetWindowLong(Wnd, GWL_WNDPROC));
-  DestroyWindow(Wnd);
-end;
-}
-
-{$ENDIF}
-
-
-end.
+unit UCommon;

+

+interface

+

+{$IFDEF FPC}

+  {$MODE Delphi}

+{$ENDIF}

+

+uses

+

+{$IFDEF win32}

+   windows;

+{$ELSE}

+   lcltype,

+   messages;

+{$ENDIF}

+

+{$IFNDEF win32}

+type

+  hStream        = THandle;

+  HGLRC          = THandle;

+  TLargeInteger  = Int64;

+  TWin32FindData = LongInt;

+{$ENDIF}

+

+{$IFDEF FPC}

+

+type

+  TWndMethod = procedure(var Message: TMessage) of object;

+

+function  RandomRange(aMin: Integer; aMax: Integer) : Integer;

+

+function MaxValue(const Data: array of Double): Double;

+function MinValue(const Data: array of Double): Double;

+

+{$IFDEF Win32}

+function  AllocateHWnd(Method: TWndMethod): HWND;

+procedure DeallocateHWnd(Wnd: HWND);

+{$ENDIF}

+

+{$ENDIF}

+

+{$IFNDEF win32}

+(*

+  function QueryPerformanceCounter(lpPerformanceCount:TLARGEINTEGER):Bool;

+  function QueryPerformanceFrequency(lpFrequency:TLARGEINTEGER):Bool;

+*)

+  procedure ZeroMemory( Destination: Pointer; Length: DWORD );

+{$ENDIF}

+

+implementation

+

+{$IFNDEF win32}

+procedure ZeroMemory( Destination: Pointer; Length: DWORD );

+begin

+  FillChar( Destination^, Length, 0 );

+end; //ZeroMemory

+

+(*

+function QueryPerformanceCounter(lpPerformanceCount:TLARGEINTEGER):Bool;

+

+  // From http://en.wikipedia.org/wiki/RDTSC

+  function RDTSC: Int64; register;

+  asm

+    rdtsc

+  end;

+

+begin

+  // Use clock_gettime  here maybe ... from libc

+  lpPerformanceCount := RDTSC();

+  result := true;

+end;

+

+function QueryPerformanceFrequency(lpFrequency:TLARGEINTEGER):Bool;

+begin

+  lpFrequency := 0;

+  result := true;

+end;

+*)

+{$ENDIF}

+

+

+{$IFDEF FPC}

+

+function MaxValue(const Data: array of Double): Double;

+var

+  I: Integer;

+begin

+  Result := Data[Low(Data)];

+  for I := Low(Data) + 1 to High(Data) do

+    if Result < Data[I] then

+      Result := Data[I];

+end;

+

+function MinValue(const Data: array of Double): Double;

+var

+  I: Integer;

+begin

+  Result := Data[Low(Data)];

+  for I := Low(Data) + 1 to High(Data) do

+    if Result > Data[I] then

+      Result := Data[I];

+end;

+

+function RandomRange(aMin: Integer; aMax: Integer) : Integer;

+begin

+RandomRange := Random(aMax-aMin) + aMin ;

+end;

+

+

+// NOTE !!!!!!!!!!

+// AllocateHWnd is in lclintfh.inc

+

+{$IFDEF Win32}

+// TODO : JB this is dodgey and bad... find a REAL solution !

+function AllocateHWnd(Method: TWndMethod): HWND;

+var

+  TempClass: TWndClass;

+  ClassRegistered: Boolean;

+begin

+  Result := CreateWindowEx(WS_EX_TOOLWINDOW, '', '', WS_POPUP , 0, 0, 0, 0, 0, 0, HInstance, nil);

+end;

+

+procedure DeallocateHWnd(Wnd: HWND);

+var

+  Instance: Pointer;

+begin

+  Instance := Pointer(GetWindowLong(Wnd, GWL_WNDPROC));

+  DestroyWindow(Wnd);

+end;

+{$ENDIF}

+

+{$ENDIF}

+

+

+end.

diff --git a/Game/Code/Classes/ULyrics.pas b/Game/Code/Classes/ULyrics.pas
index 5cf6114d..1c2795ce 100644
--- a/Game/Code/Classes/ULyrics.pas
+++ b/Game/Code/Classes/ULyrics.pas
@@ -1,6 +1,13 @@
 unit ULyrics;

 

 interface

+

+{$IFDEF FPC}

+  {$MODE DELPHI}

+{$ENDIF}

+

+{$I switches.inc}

+

 uses OpenGL12, UTexture, UThemes, UMusic;

 

 type

diff --git a/Game/Code/Classes/ULyrics.bak.pas b/Game/Code/Classes/ULyrics_bak.pas
index e432f7e5..43fa46f5 100644
--- a/Game/Code/Classes/ULyrics.bak.pas
+++ b/Game/Code/Classes/ULyrics_bak.pas
@@ -1,7 +1,17 @@
-unit ULyrics.bak;

+unit ULyrics_bak;

 

 interface

-uses SysUtils, OpenGL12, UMusic, UTexture;

+

+{$IFDEF FPC}

+  {$MODE DELPHI}

+{$ENDIF}

+

+{$I switches.inc}

+

+uses SysUtils,

+     OpenGL12,

+     UMusic,

+     UTexture;

 

 type

   TWord = record

@@ -74,6 +84,15 @@ type
       Text:     string;   // LCD

 

       constructor Create;

+      

+      procedure AddWord(Text: string);

+      procedure AddCzesc(NrCzesci: integer);

+

+      function SelectedLetter: integer;  // LCD

+      function SelectedLength: integer;  // LCD

+

+      procedure Clear;

+      procedure Draw;

     published

       property X: real write SetX;

       property Y: real write SetY;

@@ -85,15 +104,6 @@ type
       property Scale: real write SetScale;

       property Style: integer write SetStyle;

       property FontStyle: integer write SetFStyle;

-      procedure AddWord(Text: string);

-      procedure AddCzesc(NrCzesci: integer);

-

-      function SelectedLetter: integer;  // LCD

-      function SelectedLength: integer;  // LCD

-

-      procedure Clear;

-      procedure Draw;

-

   end;

 

 var