From 7ff5648675e396d529686a4a5096812a7972a4ca Mon Sep 17 00:00:00 2001 From: tobigun Date: Sun, 6 Apr 2008 10:54:07 +0000 Subject: Replaced some {-comments with (*-comments to remove nested comments of the same type like: { {} }. Although delphi and FPC can cope with them, some editors (like lazarus) don't like them and erroneously display everything after the comment as commented out. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1004 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Screens/UScreenOptionsSound.pas | 4 ++++ Game/Code/Screens/UScreenSong.pas | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) (limited to 'Game/Code/Screens') diff --git a/Game/Code/Screens/UScreenOptionsSound.pas b/Game/Code/Screens/UScreenOptionsSound.pas index 3cbc65a5..c3ef523b 100644 --- a/Game/Code/Screens/UScreenOptionsSound.pas +++ b/Game/Code/Screens/UScreenOptionsSound.pas @@ -2,6 +2,10 @@ unit UScreenOptionsSound; interface +{$IFDEF FPC} + {$MODE Delphi} +{$ENDIF} + {$I switches.inc} uses diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index 15c18a53..d36fdd48 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -527,6 +527,7 @@ begin //I := CatSongs.VisibleIndex(Interaction); CatSongs.ClickCategoryButton(Interaction); + } {I2 := CatSongs.VisibleIndex(Interaction); SongCurrent := SongCurrent - I + I2; SongTarget := SongTarget - I + I2; } @@ -794,7 +795,8 @@ var Pet: integer; Label CreateSongButtons; begin - {if (length(CatSongs.Song) > 0) then + (* + if (length(CatSongs.Song) > 0) then begin //Set Length of Button Array one Time Instead of one time for every Song SetButtonLength(Length(CatSongs.Song)); @@ -869,7 +871,8 @@ begin if (I <> -1) then GoTo CreateSongButtons; - end; } + end; + *) end; procedure TScreenSong.SetScroll; @@ -1075,7 +1078,7 @@ begin if Interaction = High(Button) then Button[0].X := 300 + 260; end; - + } // kolowe { for B := 0 to High(Button) do begin Wsp := (B - Interaction); // 0 dla srodka, -1 dla lewego, +1 dla prawego itd. @@ -1102,7 +1105,7 @@ begin else Button[B].Visible := True; end; - +} { if Length(Button) >= 3 then begin if Interaction = 0 then Button[High(Button)].X := 300 - 260; @@ -1127,6 +1130,7 @@ var Z, Z2: real; VS: integer; begin +(* {VS := CatSongs.VisibleSongs; // 0.5.0 (I): cached, very important // kolowe @@ -1150,6 +1154,7 @@ begin Button[B].H := Button[B].W; end; end;} +*) end; (* @@ -1245,6 +1250,7 @@ var X: Real; helper: real; begin +(* {VS := CatSongs.VisibleSongs; // cache Visible Songs {Vars Theme.Song.CoverW: Radius des Kreises @@ -1334,6 +1340,7 @@ begin end; end; } +*) end; procedure TScreenSong.SetScroll6; // rotate (slotmachine style) @@ -1347,6 +1354,7 @@ var Wsp: real; Z, Z2: real; begin +(* {VS := CatSongs.VisibleSongs; // cache Visible Songs if VS <=5 then begin // kolowe @@ -1439,6 +1447,7 @@ begin end; end; end; } +*) end; -- cgit v1.2.3