diff options
| author | b1indy <b1indy@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-09-07 21:09:02 +0000 |
|---|---|---|
| committer | b1indy <b1indy@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-09-07 21:09:02 +0000 |
| commit | 247cbdca4eb8af228fa1753f1185e85077b5befa (patch) | |
| tree | 22b670adb1ab675521904be290a60d9cc166dda8 /Game/Code/Menu | |
| parent | addda3536d0d82714e826994b3a10c6b468c3252 (diff) | |
| download | usdx-247cbdca4eb8af228fa1753f1185e85077b5befa.tar.gz usdx-247cbdca4eb8af228fa1753f1185e85077b5befa.tar.xz usdx-247cbdca4eb8af228fa1753f1185e85077b5befa.zip | |
UScreenSing.pas, UScreenSingModi.pas: removed Uffmpeg and USmpeg, added UVideo
UGraphic.pas: prepared for possible loading animation
UGraphicClasses.pas, ULCD.pas, ULight.pas, UMain.pas, USkins.pas, UDisplay.pas, UMenuButton.pas, UMenuSelect.pas, UMenuSelectSlide.pas, UMenuStatic.pas, UScreenCredits.pas, UScreenEditSub.pas, UScreenOpen.pas, UScreenPopup.pas: some fixes to get rid of some compiler infos/warnings
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@374 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
| -rw-r--r-- | Game/Code/Menu/UDisplay.pas | 2 | ||||
| -rw-r--r-- | Game/Code/Menu/UMenuButton.pas | 9 | ||||
| -rw-r--r-- | Game/Code/Menu/UMenuSelect.pas | 4 | ||||
| -rw-r--r-- | Game/Code/Menu/UMenuSelectSlide.pas | 6 | ||||
| -rw-r--r-- | Game/Code/Menu/UMenuStatic.pas | 2 |
5 files changed, 11 insertions, 12 deletions
diff --git a/Game/Code/Menu/UDisplay.pas b/Game/Code/Menu/UDisplay.pas index 70e678fb..82b4acc7 100644 --- a/Game/Code/Menu/UDisplay.pas +++ b/Game/Code/Menu/UDisplay.pas @@ -40,7 +40,7 @@ type procedure PrintScreen;
constructor Create;
// fade mod
- destructor Destroy;
+ destructor Destroy; override;
// end
procedure ScreenShot;
diff --git a/Game/Code/Menu/UMenuButton.pas b/Game/Code/Menu/UMenuButton.pas index cb343cf8..f3b00830 100644 --- a/Game/Code/Menu/UMenuButton.pas +++ b/Game/Code/Menu/UMenuButton.pas @@ -87,9 +87,9 @@ implementation uses UDrawTexture, SysUtils, windows;
procedure TButton.SetX(Value: real);
-var
+{var
dx: real;
- T: integer; // text
+ T: integer; // text}
begin
{dY := Value - Texture.y;
@@ -105,9 +105,9 @@ begin end;
procedure TButton.SetY(Value: real);
-var
+{var
dY: real;
- T: integer; // text
+ T: integer; // text}
begin
{dY := Value - PosY;
@@ -276,6 +276,7 @@ var begin
if Visible then begin
//Fade Mod
+ T:=0;
if Fade then
begin
if (FadeProgress < 1) and (FadeProgress > 0) then
diff --git a/Game/Code/Menu/UMenuSelect.pas b/Game/Code/Menu/UMenuSelect.pas index f7bb871f..72141a27 100644 --- a/Game/Code/Menu/UMenuSelect.pas +++ b/Game/Code/Menu/UMenuSelect.pas @@ -99,8 +99,8 @@ begin end;
procedure TSelect.SetSelect(Value: boolean);
-var
- SO: integer;
+{var
+ SO: integer;}
begin // default 1, 0.4
SelectBool := Value;
if Value then begin
diff --git a/Game/Code/Menu/UMenuSelectSlide.pas b/Game/Code/Menu/UMenuSelectSlide.pas index c1ccad6d..3659c00d 100644 --- a/Game/Code/Menu/UMenuSelectSlide.pas +++ b/Game/Code/Menu/UMenuSelectSlide.pas @@ -117,9 +117,9 @@ begin end;
procedure TSelectSlide.SetSelect(Value: boolean);
-var
+{var
SO: integer;
- I: integer;
+ I: integer;}
begin
SelectBool := Value;
if Value then begin
@@ -187,7 +187,7 @@ procedure DoSelection(Sel: Cardinal); TextOpt[I].ColB := STDColB;
TextOpt[I].Int := STDInt;
end;
- if (Sel <= high(TextOpt)) then
+ if (integer(Sel) <= high(TextOpt)) then
begin
TextOpt[Sel].ColR := STColR;
TextOpt[Sel].ColG := STColG;
diff --git a/Game/Code/Menu/UMenuStatic.pas b/Game/Code/Menu/UMenuStatic.pas index 5f19fbf3..cfa4a596 100644 --- a/Game/Code/Menu/UMenuStatic.pas +++ b/Game/Code/Menu/UMenuStatic.pas @@ -21,8 +21,6 @@ implementation uses UDrawTexture;
procedure TStatic.Draw;
-var
- Pet: integer;
begin
if Visible then
begin
|