From 94cefdb78044e0f9996e3032de34b690de98b708 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 23 Jul 2009 12:34:07 +0000
Subject: - revert to 1777 - Ocean.ini and SVN properties are not reverted

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1854 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 unicode/src/screens/UScreenTop5.pas | 38 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

(limited to 'unicode/src/screens/UScreenTop5.pas')

diff --git a/unicode/src/screens/UScreenTop5.pas b/unicode/src/screens/UScreenTop5.pas
index eeec8ed7..eaa90ab1 100644
--- a/unicode/src/screens/UScreenTop5.pas
+++ b/unicode/src/screens/UScreenTop5.pas
@@ -57,7 +57,6 @@ type
 
       constructor Create; override;
       function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
-      function ParseMouse(MouseButton: integer; BtnDown: boolean; X, Y: integer): boolean; override;
       procedure onShow; override;
       function Draw: boolean; override;
   end;
@@ -72,12 +71,10 @@ uses
   UNote,
   UUnicodeUtils;
 
-function TScreenTop5.ParseInput(PressedKey: cardinal;
-                                CharCode: UCS4Char;
-				PressedDown: boolean): boolean;
+function TScreenTop5.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
   Result := true;
-  if PressedDown then
+  if (PressedDown) then
   begin
     // check normal keys
     case UCS4UpperCase(CharCode) of
@@ -95,7 +92,7 @@ begin
       SDLK_RETURN:
         begin
           if (not Fadeout) then
-          begin
+	  begin
             FadeTo(@ScreenSong);
             Fadeout := true;
           end;
@@ -108,16 +105,6 @@ begin
   end;
 end;
 
-function TScreenTop5.ParseMouse(MouseButton: integer;
-                                BtnDown: boolean;
-				X, Y: integer): boolean;
-begin
-  Result := true;
-  if (MouseButton = SDL_BUTTON_LEFT) and BtnDown then
-    //left-click anywhere sends return
-    ParseInput(SDLK_RETURN, 0, true);
-end;
-
 constructor TScreenTop5.Create;
 var
   I: integer;
@@ -126,16 +113,19 @@ begin
 
   LoadFromTheme(Theme.Top5);
 
-  TextLevel       := AddText(Theme.Top5.TextLevel);
+
+  TextLevel := AddText(Theme.Top5.TextLevel);
   TextArtistTitle := AddText(Theme.Top5.TextArtistTitle);
 
   for I := 0 to 4 do
-  begin
-    StaticNumber[I+1] := AddStatic(Theme.Top5.StaticNumber[I]);
-    TextNumber[I+1]   := AddText  (Theme.Top5.TextNumber[I]);
-    TextName[I+1]     := AddText  (Theme.Top5.TextName[I]);
-    TextScore[I+1]    := AddText  (Theme.Top5.TextScore[I]);
-  end;
+    StaticNumber[I+1] := AddStatic( Theme.Top5.StaticNumber[I] );
+
+  for I := 0 to 4 do
+    TextNumber[I+1] := AddText(Theme.Top5.TextNumber[I]);
+  for I := 0 to 4 do
+    TextName[I+1] := AddText(Theme.Top5.TextName[I]);
+  for I := 0 to 4 do
+    TextScore[I+1] := AddText(Theme.Top5.TextScore[I]);
 
 end;
 
@@ -172,7 +162,7 @@ begin
     Text[TextScore[I]].Text := IntToStr(CurrentSong.Score[Ini.Difficulty, I-1].Score);
   end;
 
-  for I := Length(CurrentSong.Score[Ini.Difficulty]) + 1 to 5 do
+  for I := Length(CurrentSong.Score[Ini.Difficulty])+1 to 5 do
   begin
     Static[StaticNumber[I]].Visible := false;
     Text[TextNumber[I]].Visible := false;
-- 
cgit v1.2.3