- 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

8 files changed, 466 insertions, 688 deletions

diff --git a/unicode/plugins/5000Points/Until5000.dpr b/unicode/plugins/5000Points/Until5000.dpr
index 83bc1007..df79bfe2 100644
--- a/unicode/plugins/5000Points/Until5000.dpr
+++ b/unicode/plugins/5000Points/Until5000.dpr
@@ -7,87 +7,81 @@ library Until5000;
 uses
   ModiSDK in '..\SDK\ModiSDK.pas';
 
-// give the plugin's info
+//Gave the Plugins Info
 procedure PluginInfo (var Info: TPluginInfo); {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 begin
-  Info.Name       := 'PLUGIN_UNTIL5000_NAME';
+  Info.Name    := 'PLUGIN_UNTIL5000_NAME';
 
   Info.Creator    := 'Whiteshark';
   Info.PluginDesc := 'PLUGIN_UNTIL5000_DESC';
 
-  // set to party modus plugin
-  Info.Typ        := 8;
+  //Set to Party Modi Plugin
+  Info.Typ := 8;
 
   Info.NumPlayers := 31;
-  // options
-  Info.LoadSong   := true; // whether or not a song should be loaded
-  // only when song is loaded:
-  Info.ShowScore  := true; // whether or not the score should be shown
-  Info.ShowNotes  := true; // whether the note lines should be displayed
-  Info.LoadVideo  := true; // should the video be loaded?
-  Info.LoadBack   := true; // should the background be loaded?
-
-  Info.BGShowFull    := false; // whether the background or the video should be shown full size
-  Info.BGShowFull_O  := true;  // whether the background or the video should be shown full size
-
-  Info.ShowRateBar   := true;  // whether the bar that shows how good the player was should be displayed
-  Info.ShowRateBar_O := true;  // load from ini whether the bar should be displayed
-
-  Info.EnLineBonus   := false; // whether line bonus should be enabled
-  Info.EnLineBonus_O := true;  // load from ini whether line bonus should be enabled
-
-  // options even when song is not loaded
-  Info.ShowBars      := false; // whether the white bars on top and bottom should be drawn
-  Info.TeamModeOnly  := false; // if true the plugin can only be played in team mode
-  Info.GetSoundData  := false; // if true the rdata procedure is called when new sound data is available
-  Info.Dummy         := false; // should be set to false... for updateing plugin interface
+  //Options
+  Info.LoadSong := True;  //Whether or not a Song should be Loaded
+  //Only When Song is Loaded:
+  Info.ShowScore := True; //Whether or not the Score should be shown
+  Info.ShowNotes := True; //Whether the Note Lines should be displayed
+  Info.LoadVideo := True; //Should the Video be loaded ?
+  Info.LoadBack  := True; //Should the Background be loaded ?
+
+  Info.BGShowFull := False;   //Whether the Background or the Video should be shown Fullsize
+  Info.BGShowFull_O := True;  //Whether the Background or the Video should be shown Fullsize
+
+  Info.ShowRateBar:= True;   //Whether the Bar that shows how good the player was sould be displayed
+  Info.ShowRateBar_O := True; //Load from Ini whether the Bar should be Displayed
+
+  Info.EnLineBonus := False;  //Whether LineBonus Should be enabled
+  Info.EnLineBonus_O := True; //Load from Ini whether LineBonus Should be enabled
+
+  //Options even when song is Not loaded
+  Info.ShowBars := False; //Whether the White Bars on Top and Bottom should be Drawn
+  Info.TeamModeOnly := False;  //If True the Plugin can only be Played in Team Mode
+  Info.GetSoundData := False;  //If True the RData Procedure is called when new SoundData is available
+  Info.Dummy := False;         //Should be Set to False... for Updateing Plugin Interface
 end;
 
-// executed on game start; if true game begins, else failure
-function Init (const TeamInfo:   TTeamInfo;
-               var   Playerinfo: TPlayerinfo;
-	       const Sentences:  TSentences;
-	       const Methods:    TMethodRec)
-	      : boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+//Executed on Game Start //If True Game begins, else Failure
+function Init (const TeamInfo: TTeamInfo; var Playerinfo: TPlayerinfo; const Sentences: TSentences; const Methods: TMethodRec): boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 begin
-  Result := true;
+Result := True;
 end;
 
-// executed everytime the screen is drawn; if false the game finishes
-function Draw (var   Playerinfo:  TPlayerinfo; 
-               const CurSentence: cardinal)
-	      : boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+//Executed everytime the Screen is Drawed //If False The Game finishes
+function Draw (var Playerinfo: TPlayerinfo; const CurSentence: Cardinal): boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 var
-  Index: integer;
+I: Integer;
 begin
-  Result := false;
-  for Index := 0 to PlayerInfo.NumPlayers-1 do
+Result := False;
+  for I := 0 to PlayerInfo.NumPlayers-1 do
   begin
-    PlayerInfo.Playerinfo[Index].Bar := PlayerInfo.Playerinfo[Index].Score div 50;
-    PlayerInfo.Playerinfo[Index].Percentage := PlayerInfo.Playerinfo[Index].Bar;
-    if (PlayerInfo.Playerinfo[Index].Score >= 5000) then
+    PlayerInfo.Playerinfo[I].Bar := PlayerInfo.Playerinfo[I].Score div 50;
+    PlayerInfo.Playerinfo[I].Percentage := PlayerInfo.Playerinfo[I].Bar;
+    if (PlayerInfo.Playerinfo[I].Score >=5000) then
       Exit;
   end;
-  Result := true;
+Result := True;
 end;
 
-// is executed on finish, returns the player number of the winner
+//Is Executed on Finish, Returns the Playernum of the Winner
 function Finish (var Playerinfo: TPlayerinfo): byte; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 var
-  Index: integer;
+  I:Integer;
 begin
-  Result := 0;
-  for Index := 0 to PlayerInfo.NumPlayers-1 do
+Result := 0;
+for I := 0 to PlayerInfo.NumPlayers-1 do
   begin
-    if (PlayerInfo.Playerinfo[Index].Score >= 5000) then
+    if (PlayerInfo.Playerinfo[I].Score >=5000) then
     begin
-      case Index of
-        0: Result := Result or  1;
-        1: Result := Result or  2;
-        2: Result := Result or  4;
-        3: Result := Result or  8;
-        4: Result := Result or 16;
-        5: Result := Result or 32;
+      Case I of
+        0: Result := Result OR 1;
+        1: Result := Result OR 2;
+        2: Result := Result OR 4;
+        3: Result := Result OR 8;
+        4: Result := Result OR 16;
+        5: Result := Result OR 32;
       end;
     end;
   end;
diff --git a/unicode/plugins/Blind/Blind.dpr b/unicode/plugins/Blind/Blind.dpr
index 3c68374c..d2824587 100644
--- a/unicode/plugins/Blind/Blind.dpr
+++ b/unicode/plugins/Blind/Blind.dpr
@@ -7,75 +7,72 @@ library Blind;
 uses
   ModiSDK in '..\SDK\ModiSDK.pas';
 
-// give the plugin's info
-procedure PluginInfo (var Info: TPluginInfo); {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+//Gave the Plugins Info
+procedure PluginInfo (var Info: TPluginInfo); stdcall;
 begin
-  Info.Name       := 'PLUGIN_BLIND_NAME';
+  Info.Name    := 'PLUGIN_BLIND_NAME';
+
   Info.Creator    := 'Whiteshark';
   Info.PluginDesc := 'PLUGIN_BLIND_DESC';
 
-  // set to party modus plugin
-  Info.Typ        := 8;
+  //Set to Party Modi Plugin
+  Info.Typ := 8;
 
   Info.NumPlayers := 31;
 
-  // options
-  Info.LoadSong  := true;  // whether or not a song should be loaded
-  // only when song is loaded:
-  Info.ShowScore := true;  // whether or not the score should be shown
-  Info.ShowNotes := false; // whether the note lines should be displayed
-  Info.LoadVideo := true;  // should the video be loaded?
-  Info.LoadBack  := true;  // should the background be loaded?
+  //Options
+  Info.LoadSong := True;  //Whether or not a Song should be Loaded
+  //Only When Song is Loaded:
+  Info.ShowScore := True; //Whether or not the Score should be shown
+  Info.ShowNotes := False; //Whether the Note Lines should be displayed
+  Info.LoadVideo := True; //Should the Video be loaded ?
+  Info.LoadBack  := True; //Should the Background be loaded ?
 
-  Info.BGShowFull   := false;  // whether the background or the video should be shown in full size
-  Info.BGShowFull_O := true;   // whether the background or the video should be shown in full size
+  Info.BGShowFull := False;   //Whether the Background or the Video should be shown Fullsize
+  Info.BGShowFull_O := True;  //Whether the Background or the Video should be shown Fullsize
 
-  Info.ShowRateBar   := false; // whether the bar that shows how good the player was should be displayed
-  Info.ShowRateBar_O := true;  // load from ini whether the bar should be displayed
+  Info.ShowRateBar:= False;   //Whether the Bar that shows how good the player was sould be displayed
+  Info.ShowRateBar_O := True; //Load from Ini whether the Bar should be Displayed
 
-  Info.EnLineBonus   := false; // whether line bonus should be enabled
-  Info.EnLineBonus_O := true;  // load from ini whether line bonus should be enabled
+  Info.EnLineBonus := False;  //Whether LineBonus Should be enabled
+  Info.EnLineBonus_O := True; //Load from Ini whether LineBonus Should be enabled
 
-  //  options even when song is not loaded
-  Info.ShowBars     := false;  // whether the white bars on top and bottom should be drawn
-  Info.TeamModeOnly := false;  // if true the plugin can only be played in team mode
-  Info.GetSoundData := false;  // if true the rdata procedure is called when new sound data is available
-  Info.Dummy        := false;  // should be set to false... for updating plugin interface
+  //Options even when song is Not loaded
+  Info.ShowBars := False; //Whether the White Bars on Top and Bottom should be Drawn
+  Info.TeamModeOnly := False;  //If True the Plugin can only be Played in Team Mode
+  Info.GetSoundData := False;  //If True the RData Procedure is called when new SoundData is available
+  Info.Dummy := False;         //Should be Set to False... for Updateing Plugin Interface
 end;
 
-// executed on game start. if true game begins, else failure
-function Init (const TeamInfo:   TTeamInfo;
-               var   Playerinfo: TPlayerinfo;
-	       const Sentences:  TSentences;
-	       const Methods:    TMethodRec)
-	      : boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+//Executed on Game Start //If True Game begins, else Failure
+function Init (const TeamInfo: TTeamInfo; var Playerinfo: TPlayerinfo; const Sentences: TSentences; const Methods: TMethodRec): boolean; stdcall;
 begin
-  Result := true;
+Result := True;
 end;
 
-// executed every time the screen is drawn. if false the game finishes
-function Draw (var   Playerinfo:  TPlayerinfo; 
-               const CurSentence: cardinal)
-	      : boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+//Executed everytime the Screen is Drawed //If False The Game finishes
+function Draw (var Playerinfo: TPlayerinfo; const CurSentence: Cardinal): boolean; stdcall;
+var
+I: Integer;
 begin
-  Result := true;
+Result := True;
 end;
 
-// is executed on finish, returns the player number of the winner
-function Finish (var Playerinfo: TPlayerinfo): byte; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+//Is Executed on Finish, Returns the Playernum of the Winner
+function Finish (var Playerinfo: TPlayerinfo): byte; stdcall;
 var
-  Index:    integer;
-  MaxScore: word;
+  I:Integer;
+  MaxScore: Word;
 begin
-  Result   := 0;
+  Result := 0;
   MaxScore := 0;
-  for Index := 0 to PlayerInfo.NumPlayers - 1 do
+  for I := 0 to PlayerInfo.NumPlayers-1 do
   begin
-    PlayerInfo.Playerinfo[Index].Percentage := PlayerInfo.Playerinfo[Index].Score div 9999;
-    if (PlayerInfo.Playerinfo[Index].Score > MaxScore) then
+    PlayerInfo.Playerinfo[I].Percentage := PlayerInfo.Playerinfo[I].Score div 9999;
+    if (PlayerInfo.Playerinfo[I].Score > MaxScore) then
     begin
-      MaxScore := PlayerInfo.Playerinfo[Index].Score;
-      case Index of
+      MaxScore := PlayerInfo.Playerinfo[I].Score;
+      Case I of
         0: Result :=  1;
         1: Result :=  2;
         2: Result :=  4;
@@ -84,20 +81,20 @@ begin
         5: Result := 32;
       end;
     end
-    else if (PlayerInfo.Playerinfo[Index].Score = MaxScore) and (PlayerInfo.Playerinfo[Index].Score <> 0) then
+    else if (PlayerInfo.Playerinfo[I].Score = MaxScore) AND (PlayerInfo.Playerinfo[I].Score <> 0) then
     begin
-      case Index of
-        0: Result := Result or 1;
-        1: Result := Result or 2;
-        2: Result := Result or 4;
-        3: Result := Result or 8;
-        4: Result := Result or 16;
-        5: Result := Result or 32;
+      Case I of
+        0: Result := Result OR 1;
+        1: Result := Result OR 2;
+        2: Result := Result OR 4;
+        3: Result := Result OR 8;
+        4: Result := Result OR 16;
+        5: Result := Result OR 32;
       end;
     end;
   end;
-  // if everybody has 0 points nobody wins
-  if (MaxScore = 0) then
+  //If everybody has 0 Points nobody Wins
+  If (MaxScore = 0) then
     Result := 0;
 end;
 
diff --git a/unicode/plugins/Don't_Get_Worse/Hold_The_Line.dpr b/unicode/plugins/Don't_Get_Worse/Hold_The_Line.dpr
index a7828f8e..8bfb292c 100644
--- a/unicode/plugins/Don't_Get_Worse/Hold_The_Line.dpr
+++ b/unicode/plugins/Don't_Get_Worse/Hold_The_Line.dpr
@@ -5,74 +5,67 @@ library Hold_The_Line;
 {$ENDIF}
 
 uses
-  SysUtils,
-  ModiSDK in '..\SDK\ModiSDK.pas',
-  gl      in '..\..\src\lib\JEDI-SDL\OpenGL\Pas\gl.pas';
+  ModiSDK  in '..\SDK\ModiSDK.pas',
+  StrUtils in '..\SDK\StrUtils.pas',
+  sdl          in '..\..\src\lib\JEDI-SDL\SDL\Pas\sdl.pas',
+  moduleloader in '..\..\src\lib\JEDI-SDL\SDL\Pas\moduleloader.pas',
+  gl           in '..\..\src\lib\JEDI-SDL\OpenGL\Pas\gl.pas';
 
 var
-  PointerTex:     TSmallTexture;
-  CountSentences: cardinal;
-  Limit:          byte;
-  MethodRec:      TMethodRec;
-//  Frame:          integer;
-  PlayerTimes:    array[0..5] of integer;
-  LastTick:       cardinal;
-  PointerVisible: boolean;
-
-  DismissedSound: cardinal;
-
-// Give the plugin's info
-procedure PluginInfo (var Info: TPluginInfo); {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+  PointerTex: TSmallTexture;
+  CountSentences: Cardinal;
+  Limit: Byte;
+  MethodRec: TMethodRec;
+  Frame: Integer;
+  PlayerTimes: array[0..5] of Integer;
+  LastTick: Cardinal;
+  PointerVisible: Boolean;
+
+  DismissedSound: Cardinal;
+
+//Gave the Plugins Info
+procedure PluginInfo (var Info: TPluginInfo); stdcall;
 begin
-  Info.Name       := 'PLUGIN_HDL_NAME';
+  Info.Name    := 'PLUGIN_HDL_NAME';
 
   Info.Creator    := 'Whiteshark';
   Info.PluginDesc := 'PLUGIN_HDL_DESC';
 
-  // Set to Party Modi Plugin
-  Info.Typ        := 8;
+  //Set to Party Modi Plugin
+  Info.Typ := 8;
 
   Info.NumPlayers := 31;
-  // Options
-  Info.LoadSong   := true; // Whether or not a song should be loaded
-  // Only when song is loaded:
-  Info.ShowScore  := true; // Whether or not the score should be shown
-  Info.ShowNotes  := true; // Whether the note lines should be displayed
-  Info.LoadVideo  := true; // Should the video be loaded?
-  Info.LoadBack   := true; // Should the background be loaded?
-
-  Info.BGShowFull    := false; // Whether the background or the video should be shown full size
-  Info.BGShowFull_O  := true;  // Whether the Background or the Video should be shown full size
-
-  Info.ShowRateBar   := true;  // Whether the bar that shows how good the player was should be displayed
-  Info.ShowRateBar_O := false; // Load from ini whether the bar should be displayed
-
-  Info.EnLineBonus   := false; // Whether line bonus should be enabled
-  Info.EnLineBonus_O := true;  // Load from ini whether line bonus should be enabled
-
-  // Options even when song is not loaded
-  Info.ShowBars      := false; // Whether the white bars on top and bottom should be drawn
-  Info.TeamModeOnly  := false; // if true the plugin can only be played in team mode
-  Info.GetSoundData  := false; // if true the rdata procedure is called when new sound data is available
-  Info.Dummy         := false; // Should be set to false... for updating plugin interface
+  //Options
+  Info.LoadSong := True;  //Whether or not a Song should be Loaded
+  //Only When Song is Loaded:
+  Info.ShowScore := True; //Whether or not the Score should be shown
+  Info.ShowNotes := True; //Whether the Note Lines should be displayed
+  Info.LoadVideo := True; //Should the Video be loaded ?
+  Info.LoadBack  := True; //Should the Background be loaded ?
+
+  Info.BGShowFull := False;   //Whether the Background or the Video should be shown Fullsize
+  Info.BGShowFull_O := True;  //Whether the Background or the Video should be shown Fullsize
+
+  Info.ShowRateBar:= True;   //Whether the Bar that shows how good the player was sould be displayed
+  Info.ShowRateBar_O := False; //Load from Ini whether the Bar should be Displayed
+
+  Info.EnLineBonus := False;  //Whether LineBonus Should be enabled
+  Info.EnLineBonus_O := True; //Load from Ini whether LineBonus Should be enabled
+
+  //Options even when song is Not loaded
+  Info.ShowBars := False; //Whether the White Bars on Top and Bottom should be Drawn
+  Info.TeamModeOnly := False;  //If True the Plugin can only be Played in Team Mode
+  Info.GetSoundData := False;  //If True the RData Procedure is called when new SoundData is available
+  Info.Dummy := False;         //Should be Set to False... for Updateing Plugin Interface
 end;
 
-// executed on game start. if true game begins, else failure
-function Init (const TeamInfo:   TTeamInfo; 
-               var   Playerinfo: TPlayerinfo;
-	       const Sentences:  TSentences;
-	       const Methods:    TMethodRec)
-	      : boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
-
-const
-  TextureName : PChar = 'HDL_Pointer';
-  SoundName   : PChar = 'dismissed.mp3';
+//Executed on Game Start //If True Game begins, else Failure
+function Init (const TeamInfo: TTeamInfo; var Playerinfo: TPlayerinfo; const Sentences: TSentences; const Methods: TMethodRec): boolean; stdcall;
 var
-  Index:   integer;
-//  Texname: PChar;
+  I: Integer;
+  Texname: PChar;
   TexType: TTextureType;
 begin
-{
   TexName := CreateStr(PChar('HDL_Pointer'));
   TexType := TEXTURE_TYPE_TRANSPARENT;
   PointerTex := Methods.LoadTex(TexName, TexType);
@@ -82,56 +75,50 @@ begin
   TexName := CreateStr(PChar('dismissed.mp3'));
   DismissedSound := Methods.LoadSound (TexName);
   FreeStr(TexName);
-}
-  TexType := TEXTURE_TYPE_TRANSPARENT;
-  PointerTex := Methods.LoadTex(TextureName, TexType);
-
-  DismissedSound := Methods.LoadSound (SoundName);
 
   CountSentences := Sentences.High;
   Limit := 0;
-//  Frame := 0;
+  Frame := 0;
 
   MethodRec := Methods;
 
-  for Index := 0 to PlayerInfo.NumPlayers-1 do
+  for I := 0 to PlayerInfo.NumPlayers-1 do
   begin
-    PlayerInfo.Playerinfo[Index].Enabled := true;
-    PlayerInfo.Playerinfo[Index].Percentage := 100;
-    PlayerTimes[Index] := 0;
+    PlayerInfo.Playerinfo[I].Enabled := True;
+    PlayerInfo.Playerinfo[I].Percentage := 100;
+    PlayerTimes[I] := 0;
   end;
 
-  Result := true;
+  Result := True;
 end;
 
-function Draw (var   Playerinfo:  TPlayerinfo; 
-               const CurSentence: cardinal)
-	      : boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
-const
-  SoundName : PChar = 'PARTY_DISMISSED';
+//Executed everytime the Screen is Drawed //If False The Game finishes
+function Draw (var Playerinfo: TPlayerinfo; const CurSentence: Cardinal): boolean; stdcall;
 var
-  Index: integer;
-  L:     byte;
-  C:     byte;
-  Tick:  cardinal;
+  I: Integer;
+  L: Byte;
+  C: Byte;
+  Text: PChar;
+  Blink: Boolean;
+  tick: Cardinal;
 begin
-  // activate blink
-  if (CurSentence = CountSentences div 5 * 2 - 1) or (CurSentence = CountSentences div 3 * 2 - 1) then
+  //Aktivate Blink
+  If (CurSentence = CountSentences div 5 * 2 - 1) OR (CurSentence = CountSentences div 3 * 2 - 1) then
   begin
-    Tick := round(TimeStampToMSecs(DateTimeToTimeStamp(Now))) div 400;
-    if (Tick <> LastTick) then
+    Tick := SDL_GetTicks() div 400;
+    If (Tick <> LastTick) then
     begin
       LastTick := Tick;
-      PointerVisible := not PointerVisible;
+      PointerVisible := Not PointerVisible;
     end;
   end
   else
-    PointerVisible := true;
+    PointerVisible := True;
 
-  // inc limit
-  if (Limit = 0) and  (CurSentence >= CountSentences div 5 * 2) then
+  //Inc Limit
+  if (Limit = 0) And  (CurSentence >= CountSentences div 5 * 2) then
     Inc(Limit)
-  else if (Limit = 1) and  (CurSentence >= CountSentences div 3 * 2) then
+  else if (Limit = 1) And  (CurSentence >= CountSentences div 3 * 2) then
     Inc(Limit);
 
   case Limit of
@@ -142,22 +129,22 @@ begin
 
   C:= 0;
 
-  Result := true;
+  Result := True;
 
-  for Index := 0 to PlayerInfo.NumPlayers-1 do
+  for I := 0 to PlayerInfo.NumPlayers-1 do
   begin
-    if PlayerInfo.Playerinfo[Index].Enabled then
+    if PlayerInfo.Playerinfo[I].Enabled then
     begin
-      if PlayerInfo.Playerinfo[Index].Bar < L then
+      if PlayerInfo.Playerinfo[I].Bar < L then
       begin
-        PlayerInfo.Playerinfo[Index].Enabled := false;
+        PlayerInfo.Playerinfo[I].Enabled := False;
         Inc(C);
-        PlayerTimes[Index] := CurSentence; // Save Time of Dismission
-        // PlaySound
+        PlayerTimes[I] := CurSentence; //Save Time of Dismission
+        //PlaySound
         MethodRec.PlaySound (DismissedSound);
       end;
 
-      // Draw pointer
+      //Draw Pointer
       if (PointerVisible) then
       begin
         glColor4f (0.2, 0.8, 0.1, 1);
@@ -169,10 +156,10 @@ begin
         glBindTexture(GL_TEXTURE_2D, PointerTex.TexNum);
 
         glBegin(GL_QUADS);
-          glTexCoord2f(1/32, 0); glVertex2f(PlayerInfo.Playerinfo[Index].PosX + L - 3, PlayerInfo.Playerinfo[Index].PosY - 4);
-          glTexCoord2f(1/32, 1); glVertex2f(PlayerInfo.Playerinfo[Index].PosX + L - 3, PlayerInfo.Playerinfo[Index].PosY + 12);
-          glTexCoord2f(31/32, 1); glVertex2f(PlayerInfo.Playerinfo[Index].PosX+ L + 3, PlayerInfo.Playerinfo[Index].PosY + 12);
-          glTexCoord2f(31/32, 0); glVertex2f(PlayerInfo.Playerinfo[Index].PosX+ L + 3, PlayerInfo.Playerinfo[Index].PosY - 4);
+          glTexCoord2f(1/32, 0); glVertex2f(PlayerInfo.Playerinfo[I].PosX + L - 3, PlayerInfo.Playerinfo[I].PosY - 4);
+          glTexCoord2f(1/32, 1); glVertex2f(PlayerInfo.Playerinfo[I].PosX + L - 3, PlayerInfo.Playerinfo[I].PosY + 12);
+          glTexCoord2f(31/32, 1); glVertex2f(PlayerInfo.Playerinfo[I].PosX+ L + 3, PlayerInfo.Playerinfo[I].PosY + 12);
+          glTexCoord2f(31/32, 0); glVertex2f(PlayerInfo.Playerinfo[I].PosX+ L + 3, PlayerInfo.Playerinfo[I].PosY - 4);
         glEnd;
 
         glDisable(GL_TEXTURE_2D);
@@ -183,44 +170,45 @@ begin
     else
     begin
       Inc(C);
-      // Draw dismissed
+      //Draw Dismissed
+      Text := CreateStr(PChar('PARTY_DISMISSED'));
+
       glColor4f (0.8, 0.8, 0.8, 1);
-      MethodRec.Print (1, 18, PlayerInfo.Playerinfo[Index].PosX, PlayerInfo.Playerinfo[Index].PosY-8, SoundName);
+
+      MethodRec.Print (1, 18, PlayerInfo.Playerinfo[I].PosX, PlayerInfo.Playerinfo[I].PosY-8, Text);
+      FreeStr(Text);
     end;
   end;
   if (C >= PlayerInfo.NumPlayers-1) then
-    Result := false;
+    Result := False;
 end;
 
-// is executed on finish, returns the player number of the winner
-function Finish (var Playerinfo: TPlayerinfo): byte; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+//Is Executed on Finish, Returns the Playernum of the Winner
+function Finish (var Playerinfo: TPlayerinfo): byte; stdcall;
 var
-  Index: integer;
+  I:Integer;
 begin
-  Result := 0;
-  for Index := 0 to PlayerInfo.NumPlayers-1 do
+Result := 0;
+for I := 0 to PlayerInfo.NumPlayers-1 do
   begin
-  PlayerInfo.Playerinfo[Index].Percentage := (PlayerTimes[Index] * 100) div CountSentences;
-    if (PlayerInfo.Playerinfo[Index].Enabled) then
+  PlayerInfo.Playerinfo[I].Percentage := (PlayerTimes[I] * 100) div CountSentences;
+    if (PlayerInfo.Playerinfo[I].Enabled) then
     begin
-      PlayerInfo.Playerinfo[Index].Percentage := 100;
-      case Index of
-        0: Result := Result or 1;
-        1: Result := Result or 2;
-        2: Result := Result or 4;
-        3: Result := Result or 8;
-        4: Result := Result or 16;
-        5: Result := Result or 32;
+      PlayerInfo.Playerinfo[I].Percentage := 100;
+      Case I of
+        0: Result := Result OR 1;
+        1: Result := Result OR 2;
+        2: Result := Result OR 4;
+        3: Result := Result OR 8;
+        4: Result := Result OR 16;
+        5: Result := Result OR 32;
       end;
     end;
   end;
 end;
 
 exports
-  PluginInfo,
-  Init,
-  Draw,
-  Finish;
+PluginInfo, Init, Draw, Finish;
 
 begin
 
diff --git a/unicode/plugins/Duell/Duell.dpr b/unicode/plugins/Duell/Duell.dpr
index f54edea8..93c87d0e 100644
--- a/unicode/plugins/Duell/Duell.dpr
+++ b/unicode/plugins/Duell/Duell.dpr
@@ -8,56 +8,56 @@ uses
   ModiSDK in '..\SDK\ModiSDK.pas';
 
 //Gave the Plugins Info
-procedure PluginInfo (var Info: TPluginInfo); {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+procedure PluginInfo (var Info: TPluginInfo); stdcall;
 begin
-  Info.Name       := 'PLUGIN_DUELL_NAME';
+  Info.Name    := 'PLUGIN_DUELL_NAME';
 
   Info.Creator    := 'Whiteshark';
   Info.PluginDesc := 'PLUGIN_DUELL_DESC';
 
-  Info.Typ        := 8;
+  Info.Typ := 8;
 
   Info.NumPlayers := 31;
   //Options
-  Info.LoadSong   := True;  //Whether or not a Song should be Loaded
+  Info.LoadSong := True;  //Whether or not a Song should be Loaded
   //Only When Song is Loaded:
-  Info.ShowScore  := True; //Whether or not the Score should be shown
-  Info.ShowNotes  := True; //Whether the Note Lines should be displayed
-  Info.LoadVideo  := True; //Should the Video be loaded ?
-  Info.LoadBack   := True; //Should the Background be loaded ?
+  Info.ShowScore := True; //Whether or not the Score should be shown
+  Info.ShowNotes := True; //Whether the Note Lines should be displayed
+  Info.LoadVideo := True; //Should the Video be loaded ?
+  Info.LoadBack  := True; //Should the Background be loaded ?
 
-  Info.BGShowFull    := False;   //Whether the Background or the Video should be shown Fullsize
-  Info.BGShowFull_O  := True;  //Whether the Background or the Video should be shown Fullsize
+  Info.BGShowFull := False;   //Whether the Background or the Video should be shown Fullsize
+  Info.BGShowFull_O := True;  //Whether the Background or the Video should be shown Fullsize
 
-  Info.ShowRateBar   := False;   //Whether the Bar that shows how good the player was sould be displayed
+  Info.ShowRateBar:= False;   //Whether the Bar that shows how good the player was sould be displayed
   Info.ShowRateBar_O := True; //Load from Ini whether the Bar should be Displayed
 
-  Info.EnLineBonus   := False;  //Whether LineBonus Should be enabled
+  Info.EnLineBonus := False;  //Whether LineBonus Should be enabled
   Info.EnLineBonus_O := True; //Load from Ini whether LineBonus Should be enabled
 
   //Options even when song is Not loaded
-  Info.ShowBars      := False; //Whether the White Bars on Top and Bottom should be Drawn
-  Info.TeamModeOnly  := False;  //If True the Plugin can only be Played in Team Mode
-  Info.GetSoundData  := False;  //If True the RData Procedure is called when new SoundData is available
-  Info.Dummy         := False;         //Should be Set to False... for Updateing Plugin Interface
+  Info.ShowBars := False; //Whether the White Bars on Top and Bottom should be Drawn
+  Info.TeamModeOnly := False;  //If True the Plugin can only be Played in Team Mode
+  Info.GetSoundData := False;  //If True the RData Procedure is called when new SoundData is available
+  Info.Dummy := False;         //Should be Set to False... for Updateing Plugin Interface
 end;
 
 //Executed on Game Start //If True Game begins, else Failure
-function Init (const TeamInfo: TTeamInfo; var Playerinfo: TPlayerinfo; const Sentences: TSentences; const Methods: TMethodRec): boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+function Init (const TeamInfo: TTeamInfo; var Playerinfo: TPlayerinfo; const Sentences: TSentences; const Methods: TMethodRec): boolean; stdcall;
 begin
-  Result := True;
+Result := True;
 end;
 
 //Executed everytime the Screen is Drawed //If False The Game finishes
-function Draw (var Playerinfo: TPlayerinfo; const CurSentence: Cardinal): boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+function Draw (var Playerinfo: TPlayerinfo; const CurSentence: Cardinal): boolean; stdcall;
 begin
-  Result := True;
+Result := True;
 end;
 
 //Is Executed on Finish, Returns the Playernum of the Winner
-function Finish (var Playerinfo: TPlayerinfo): byte; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+function Finish (var Playerinfo: TPlayerinfo): byte; stdcall;
 var
-  I: Integer;
+  I:Integer;
   MaxScore: Word;
 begin
   Result := 0;
diff --git a/unicode/plugins/Makefile.in b/unicode/plugins/Makefile.in
deleted file mode 100644
index 0fc49745..00000000
--- a/unicode/plugins/Makefile.in
+++ /dev/null
@@ -1,146 +0,0 @@
-#################################################
-# @PACKAGE_STRING@
-# @configure_input@
-#################################################
-
-@SET_MAKE@
-SHELL = /bin/sh
-
-#################################################
-# Standard definitions
-#################################################
-
-top_srcdir ?= @top_srcdir@
-srcdir     ?= @srcdir@
-
-#################################################
-# Tools
-#################################################
-
-RM ?= rm -f
-
-#################################################
-# USDX Paths
-#################################################
-
-USDX_SRC_DIR   := $(top_srcdir)/src
-USDX_BUILD_DIR := $(top_srcdir)/build
-USDX_LIB_DIR   := $(USDX_SRC_DIR)/lib
-
-#################################################
-# FPC config
-#################################################
-
-# Free Pascal compiler binary
-PPC := @PPC@
-# FPC target platform and processor
-PPLATFORM  := @FPC_PLATFORM@
-PPROCESSOR := @FPC_PROCESSOR@
-
-# Directories added to the unit path
-PUNIT_FLAGS := -FE../game/plugins -Fu../build/fpc-$(PPROCESSOR)-$(PPLATFORM)
-
-# Directory where compiled units (.ppu, .o and library files) are stored
-PCUNIT_DIR   := $(USDX_BUILD_DIR)/fpc-$(PPROCESSOR)-$(PPLATFORM)
-PCUNIT_FLAGS := -FU$(PCUNIT_DIR)
-
-##
-# PFLAGS
-##
-
-# Defined on debug mode
-ENABLE_DEBUG := @ENABLE_DEBUG@
-
-# Note: 
-#   - PFLAGS/PFLAGS_* defaults to $(PFLAGS_XYZ_DEFAULT) if not set by the user
-#   - if PFLAGS is defined, PFLAGS_* will be ignored on "make all"
-PFLAGS         ?= @PFLAGS@
-PFLAGS_BASE    ?= @PFLAGS_BASE@
-PFLAGS_DEBUG   ?= @PFLAGS_DEBUG@
-PFLAGS_RELEASE ?= @PFLAGS_RELEASE@
-
-# Do not overwrite, just add extra flags
-PFLAGS_EXTRA   += @PFLAGS_EXTRA@
-
-# Default PFLAGS, used if PFLAGS/PFLAGS_* was not set by the user 
-# - Do not use -dDEBUG because it will enable unwanted features
-# - Do not strip executable (-Xs, set by fpc.cfg) to be GNU make conformant
-# - Use DEBUG_MODE instead of DEBUG to avoid enabling the fpc.cfg DEBUG preset
-# - The flag -vB appends the full path to filenames
-# - Note that fpc.cfg already defines -vinw, so add -v0 first
-# - The stack check (-Ct) might not work with enabled threading
-# - Do we need -Coi?
-PFLAGS_BASE_DEFAULT    := -Si -Sg- -Sc- -v0Binwe
-PFLAGS_DEBUG_DEFAULT   := -Xs- -g -gl -dDEBUG_MODE
-PFLAGS_RELEASE_DEFAULT := -Xs- -O2
-PFLAGS_EXTRA_DEFAULT   :=
-
-# Debug/Release mode flags
-# Note that flags will overwrite previously specified flags,
-# e.g. "-vinwe -vi-" is the same as "-vnwe"
-PFLAGS_DEBUG_ALL   := $(PFLAGS_BASE) $(PFLAGS_DEBUG) $(PFLAGS_EXTRA)
-PFLAGS_RELEASE_ALL := $(PFLAGS_BASE) $(PFLAGS_RELEASE) $(PFLAGS_EXTRA)
-
-# Choose default PFLAGS, depending on debug mode.
-# Only used if PFLAGS was not set by the user.
-ifdef ENABLE_DEBUG
-PFLAGS_DEFAULT := $(PFLAGS_DEBUG_ALL)
-else
-PFLAGS_DEFAULT := $(PFLAGS_RELEASE_ALL)
-endif
-
-PFLAGS_ALL = $(PFLAGS) $(PDEFINES) $(PINC_FLAGS) $(PUNIT_FLAGS) $(PCUNIT_FLAGS)
-
-.PHONY: all
-all: SDK 5000Points Blind Dont_Get_Worse Duell Team_Duell
-
-.PHONY: SDK
-SDK: clean-SDK
-	$(PPC) $(strip $(PFLAGS_ALL)) SDK/ModiSDK.pas
-
-.PHONY: 5000Points
-5000Points: SDK clean-5000Points
-	$(PPC) $(strip $(PFLAGS_ALL)) 5000Points/Until5000.dpr
-
-.PHONY: Blind
-Blind: SDK clean-Blind
-	$(PPC) $(strip $(PFLAGS_ALL)) Blind/Blind.dpr
-
-.PHONY: Duell
-Duell: SDK clean-Duell
-	$(PPC) $(strip $(PFLAGS_ALL)) Duell/Duell.dpr
-
-.PHONY: Team_Duell
-Team_Duell: SDK clean-Team_Duell
-	$(PPC) $(strip $(PFLAGS_ALL)) Team_Duell/TeamDuell.dpr
-
-.PHONY: Dont_Get_Worse
-Dont_Get_Worse: SDK clean-Dont_Get_Worse
-	$(PPC) $(strip $(PFLAGS_ALL)) Don\'t_Get_Worse/Hold_The_Line.dpr
-
-.PHONY: clean-plugins
-clean-plugins: clean-SDK clean-5000Points clean-Blind clean-Dont_Get_Worse clean-Duell clean-Team_Duell
-
-.PHONY: clean-SDK
-clean-SDK:
-	$(RM) $(PCUNIT_DIR)/ModiSDK.o $(PCUNIT_DIR)/ModiSDK.ppu
-
-.PHONY: clean-5000Points
-clean-5000Points:
-	$(RM) $(PCUNIT_DIR)/Until5000.o $(PCUNIT_DIR)/libUntil5000.*
-
-.PHONY: clean-Blind
-clean-Blind:
-	$(RM) $(PCUNIT_DIR)/Blind.o $(PCUNIT_DIR)/libBlind.*
-
-.PHONY: clean-Duell
-clean-Duell:
-	$(RM) $(PCUNIT_DIR)/Duell.o $(PCUNIT_DIR)/libDuell.*
-
-.PHONY: clean-Team_Duell
-clean-Team_Duell:
-	$(RM) $(PCUNIT_DIR)/TeamDuell.o $(PCUNIT_DIR)/libTeamDuell.*
-
-.PHONY: clean-Dont_Get_Worse
-clean-Dont_Get_Worse:
-	$(RM) $(PCUNIT_DIR)/Hold_The_Line.o $(PCUNIT_DIR)/libHold_The_Line.*
diff --git a/unicode/plugins/README(Plugins Status).txt b/unicode/plugins/README(Plugins Status).txt
deleted file mode 100644
index a6756832..00000000
--- a/unicode/plugins/README(Plugins Status).txt
+++ /dev/null
@@ -1,12 +0,0 @@
-All plugins are cleared off the SDL stuff (basically SDL_GetTicks), the StrUtils and moduleloader unit and should work on all platforms.
-2009-May-23 KMS
-
-Mac OS X: 
-The following plugins can be compiled and used after being put in to the plugins folder: Blind, 5000Points, Duell
-
-2009-Apr-8 KMS
-
-The plugins are currently disabled until the party mode is working again.
-This applies to all platforms supported (Windows, Linux, Mac OS X, FreeBSD).
-
-2009-Jan-20 Karl-Michael Schindler aka Mischi.
diff --git a/unicode/plugins/SDK/ModiSDK.pas b/unicode/plugins/SDK/ModiSDK.pas
index e0b52a81..c0e66387 100644
--- a/unicode/plugins/SDK/ModiSDK.pas
+++ b/unicode/plugins/SDK/ModiSDK.pas
@@ -6,93 +6,94 @@ interface
   {$MODE Delphi}
 {$ENDIF}
 
-type  // PluginInfo, for init
+type  //PluginInfo, for Init
   TPluginInfo = record
-    // Info
-    Name:       array [0..32] of char;   // modus to register for the plugin
-    Creator:    array [0..32] of char;   // name of the author
-    PluginDesc: array [0..64] of char;   // plugin description
+    //Info
+    Name       : Array [0..32] of Char;   //Modi to Register for the Plugin
+    Creator    : Array [0..32] of Char;   //Name of the Author
+    PluginDesc : Array [0..64] of Char;   //Plugin Description
 
-    // plugin type, atm: 8 only for partymode modus
+    //Plugin Typ, atm: 8 only for PartyMode Modi
     Case Typ: byte of
       8: (
-        // Options
-        LoadSong:      boolean; // Whether or not a song should be loaded
-        // Only when song is loaded:
-        ShowNotes:     boolean; // Whether the note lines should be displayed
-        LoadVideo:     boolean; // Should the video be loaded?
-        LoadBack:      boolean; // Should the background be loaded?
-
-        ShowRateBar:   boolean; // Whether the bar that shows how good the player was sould be displayed
-        ShowRateBar_O: boolean; // Load from ini whether the bar should be displayed
-
-        EnLineBonus:   boolean; // Whether line bonus should be enabled
-        EnLineBonus_O: boolean; // Load from ini whether line bonus should be enabled
-
-        BGShowFull:    boolean; // Whether the background or the video should be shown full size
-        BGShowFull_O:  boolean; // Whether the background or the video should be shown full size
-
-        // Options -> everytime
-        ShowScore:     boolean; // Whether or not the score should be shown
-        ShowBars:      boolean; // Whether the white bars on top and bottom should be drawn
-        TeamModeOnly:  boolean; // If true the plugin can only be played in team mode
-        GetSoundData:  boolean; // If true the rdata procedure is called when new sound data is available
-        Dummy:         boolean; // Should be set to false... for updating plugin interface
-
-        NumPlayers: byte   // Number of available players for modus
-        // Set different bits
-        // 1 -> one player
-        // 2 -> two players
-        // 4 -> three players
-        // 8 -> four players
-        // 16-> six players
-        // e.g. : 10 -> playable with 2 and 4 players
+        //Options
+        LoadSong:      boolean; //Whether or not a Song should be Loaded
+        //Only When Song is Loaded:
+        ShowNotes:     boolean; //Whether the Note Lines should be displayed
+        LoadVideo:     boolean; //Should the Video be loaded ?
+        LoadBack:      boolean; //Should the Background be loaded ?
+
+        ShowRateBar:   boolean; //Whether the Bar that shows how good the player was sould be displayed
+        ShowRateBar_O: boolean; //Load from Ini whether the Bar should be Displayed
+
+        EnLineBonus:   boolean; //Whether LineBonus Should be enabled
+        EnLineBonus_O: boolean; //Load from Ini whether LineBonus Should be enabled
+
+        BGShowFull:    boolean; //Whether the Background or the Video should be shown Fullsize
+        BGShowFull_O:  boolean; //Whether the Background or the Video should be shown Fullsize
+
+        //Options -> everytime
+        ShowScore:     boolean; //Whether or not the Score should be shown
+        ShowBars:      boolean; //Whether the White Bars on Top and Bottom should be Drawn
+        TeamModeOnly:  boolean; //If True the Plugin can only be Played in Team Mode
+        GetSoundData:  boolean; //If True the RData Procedure is called when new SoundData is available
+        Dummy:         boolean; //Should be Set to False... for Updateing Plugin Interface
+
+        NumPlayers: Byte   //Number of Available Players for Modi
+        //Set different Bits
+        //1 -> One Player
+        //2 -> Two Players
+        //4 -> Three Players
+        //8 -> Four Players
+        //16-> Six Players
+        //e.g. : 10 -> Playable with 2 and 4 Players
         );
 
   end;
 
   TPlayerInfo = record
-    NumPlayers: byte;
+    NumPlayers: Byte;
     Playerinfo: array[0..5] of record
-      Name:       PChar;   // Name of the player
-      Score:      word;    // Player's score
-      Bar:        byte;    // Percentage of the singbar filled
-      PosX:       real;    // PosX of player's singbar
-      PosY:       real;    // PosY "
-      Enabled:    boolean; // Whether the player could get points
-      Percentage: byte;    // Percentage shown on the score screen
+      Name: PChar; //Name of the Player
+      Score:Word;  //Players Score
+      Bar:  Byte;  //Percentage of the SingBar filled
+      PosX: Real;  //PosX of Players SingBar
+      PosY: Real;  //PosY "
+      Enabled: Boolean; //Whether the Player could get Points
+      Percentage: Byte; //Percentage Shown on the Score Screen
     end;
   end;
 
   TTeamInfo = record
-    NumTeams: byte;
+    NumTeams: Byte;
     Teaminfo: array[0..5] of record
-      Name:       PChar;
-      Score:      word;
-      Joker:      byte;
-      CurPlayer:  byte;
-      NumPlayers: byte;
+      Name:  PChar;
+      Score: Word;
+      Joker: Byte;
+      CurPlayer: Byte;
+      NumPlayers: Byte;
       Playerinfo: array[0..3] of record
-        Name:        PChar;
-        TimesPlayed: byte;
+        Name: PChar;
+        TimesPlayed: Byte;
+        
       end;
     end;
   end;
 
   TsmallTexture = record
-    TexNum: integer;
-    W:      real;
-    H:      real;
+    TexNum:   integer;
+    W:        real;
+    H:        real;
   end;
 
   TSentences = record
-    Current:     integer;      // current part of a line
-    High:        integer;
-    Number:      integer;
-    Resolution:  integer;
-    NotesGAP:    integer;
-    TotalLength: integer;
-    Sentence:    array of record
+    Current:    integer;      // aktualna czesc utworu do rysowania
+    High:       integer;
+    Number:     integer;
+    Resolution: integer;
+    NotesGAP:   integer;
+    TotalLength:integer;
+    Sentence:   array of record
       Start:      integer;
       StartNote:  integer;
       Lyric:      string;
@@ -108,14 +109,14 @@ type  // PluginInfo, for init
         Length:    integer;
         Tone:      integer;
         //Text:      string;
-        FreeStyle: boolean;
-        Typ:      integer;    // normal note x1, golden note x2
+        FreeStyle:  boolean;
+        Typ:    integer;    // zwykla nuta x1, zlota nuta x2
       end;
     end;
   end;
 
-  dword   = longword;
-  hstream = dword;
+  DWORD = Longword;
+  HSTREAM = DWORD;
 
   TTextureType = (
     TEXTURE_TYPE_PLAIN,        // Plain (alpha = 1)
@@ -123,18 +124,12 @@ type  // PluginInfo, for init
     TEXTURE_TYPE_COLORIZED     // Alpha is used; Hue of the HSV color-model will be replaced by a new value
   );
 
-  // Routines to give to the plugin
-  fModi_LoadTex = function (const Name: PChar; Typ: TTextureType): TsmallTexture; // Pointer to texture loader
-    {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
-  //fModi_Translate = function (const Name, Translation: AChar): integer; // Pointer to translator
-  //  {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
-
-  fModi_Print = procedure (const Style, Size: byte; const X, Y: real; const Text: PChar); // Procedure to print text   // Now translated automatically
-    {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
-  fModi_LoadSound = function (const Name: PChar): cardinal; // Procedure that loads a custom sound
-    {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
-  pModi_PlaySound = procedure (const Index: cardinal); // Plays a custom sound
-    {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+  //Routines to gave to the Plugin
+  fModi_LoadTex = function (const Name: PChar; Typ: TTextureType): TsmallTexture; stdcall; //Pointer to Texture Loader
+  //fModi_Translate = function (const Name, Translation: AChar): Integer; stdcall;       //Pointer to Translator
+  fModi_Print = procedure (const Style, Size: Byte; const X, Y: Real; const Text: PChar); stdcall;       //Procedure to Print Text   //Now translated automatically
+  fModi_LoadSound = function (const Name: PChar): Cardinal; stdcall;       //Procedure that loads a Custom Sound
+  pModi_PlaySound = procedure (const Index: Cardinal); stdcall;       //Plays a Custom Sound
 
   TMethodRec = record
     LoadTex:    fModi_LoadTex;
@@ -142,22 +137,17 @@ type  // PluginInfo, for init
     LoadSound:  fModi_LoadSound;
     PlaySound:  pModi_PlaySound;
   end;
-  // DLL functions
-  // Give the plugins info
-  pModi_PluginInfo = procedure (var Info: TPluginInfo);
-    {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
-  // Executed on game start // if true game begins, else failure
-  fModi_Init = function (const TeamInfo: TTeamInfo; var Playerinfo: TPlayerinfo; const Sentences: TSentences; const Methods: TMethodRec): boolean;
-    {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
-  // Executed everytime the screen is drawn // if false the game finishes
-  fModi_Draw = function (var Playerinfo: TPlayerinfo; const CurSentence: cardinal): boolean;
-    {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
-  // Is executed on finish, returns the player num of the winner
-  fModi_Finish = function (var Playerinfo: TPlayerinfo): byte;
-    {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
-  // Procedure called when new sound data is available
-  pModi_RData = procedure (handle: hstream; buffer: pointer; len: dword; user: dword);
-    {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+  //DLL Funktionen
+  //Gave the Plugins Info
+  pModi_PluginInfo = procedure (var Info: TPluginInfo); stdcall;
+  //Executed on Game Start //If True Game begins, else Failure
+  fModi_Init = function (const TeamInfo: TTeamInfo; var Playerinfo: TPlayerinfo; const Sentences: TSentences; const Methods: TMethodRec): boolean; stdcall;
+  //Executed everytime the Screen is Drawed //If False The Game finishes
+  fModi_Draw = function (var Playerinfo: TPlayerinfo; const CurSentence: Cardinal): boolean; stdcall;
+  //Is Executed on Finish, Returns the Playernum of the Winner
+  fModi_Finish = function (var Playerinfo: TPlayerinfo): byte; stdcall;
+  //Procedure called when new Sound Data is available
+  pModi_RData = procedure (handle: HSTREAM; buffer: Pointer; len: DWORD; user: DWORD); stdcall;
 
 implementation
 
diff --git a/unicode/plugins/Team_Duell/TeamDuell.dpr b/unicode/plugins/Team_Duell/TeamDuell.dpr
index 1371c95d..cb0e6349 100644
--- a/unicode/plugins/Team_Duell/TeamDuell.dpr
+++ b/unicode/plugins/Team_Duell/TeamDuell.dpr
@@ -5,236 +5,206 @@ library TeamDuell ;
 {$ENDIF}
 
 uses
-  SysUtils,
-  ModiSDK in '..\SDK\ModiSDK.pas',
-  gl      in '..\..\src\lib\JEDI-SDL\OpenGL\Pas\gl.pas';
+  ModiSDK      in '..\SDK\ModiSDK.pas',
+  StrUtils     in '..\SDK\StrUtils.pas',
+  sdl          in '..\..\src\lib\JEDI-SDL\SDL\Pas\sdl.pas',
+  moduleloader in '..\..\src\lib\JEDI-SDL\SDL\Pas\moduleloader.pas',
+  gl           in '..\..\src\lib\JEDI-SDL\OpenGL\Pas\gl.pas',
+  sysutils;
 
 var
-  TeamPlayer:            array of array of string;
-  StartPoints:           array of integer;
-  CurSinger, NextSinger: array[0..2] of integer;
-  MethodRec:             TMethodRec;
-  SPT, PlayerSelected:   array[0..2] of integer;
-  TimeToNextChange, starttick, endtick, ChangeOnSentence: cardinal;
-  bps, RTimeToNextChange:   double;
-  firsttime, secondtime: boolean;
-
-function GetTicks: cardinal;
-// returns a time stamp in milliseconds
-begin
-  GetTicks := round(TimeStampToMSecs(DateTimeToTimeStamp(Now)));
-end;
-
-// Give the plugin's info
-procedure PluginInfo (var Info: TPluginInfo); {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+ TeamPlayer: array of array of String;
+ StartPoints: array of integer;
+ CurSinger, NextSinger: array[0..2] of Integer;
+ MethodRec: TMethodRec;
+ SPT, PlayerSelected: array[0..2] of Integer;
+ TtoNextChange, starttick, endtick, ChangeOnSentence : Cardinal;
+ bps, RTtoNextChange: Double;
+ firsttime, secondtime: boolean;
+
+
+//Gave the Plugins Info
+procedure PluginInfo (var Info: TPluginInfo); stdcall;
 begin
-  Info.Name       := 'PLUGIN_TEAMDUELL_NAME';
+  Info.Name    := 'PLUGIN_TEAMDUELL_NAME';
 
   Info.Creator    := 'jekatt';
   Info.PluginDesc := 'PLUGIN_TEAMDUELL_DESC';
 
-  Info.Typ        := 8;
+  Info.Typ := 8;
 
   Info.NumPlayers := 31;
-  // Options
-  Info.LoadSong   := true; // Whether or not a song should be loaded
-  // Only when song is loaded:
-  Info.ShowScore  := true; // Whether or not the score should be shown
-  Info.ShowNotes  := true; // Whether the note lines should be displayed
-  Info.LoadVideo  := true; // Should the video be loaded ?
-  Info.LoadBack   := true; // Should the background be loaded ?
-
-  Info.BGShowFull    := false; // Whether the background or the video should be shown full size
-  Info.BGShowFull_O  := true;  // Whether the background or the video should be shown full size
-
-  Info.ShowRateBar   := true;  // Whether the bar that shows how good the player was should be displayed
-  Info.ShowRateBar_O := false; // Load from ini whether the bar should be displayed
-
-  Info.EnLineBonus   := false; // Whether line bonus should be enabled
-  Info.EnLineBonus_O := true;  // Load from ini whether line bonus should be enabled
-
-  // Options even when song is not loaded
-  Info.ShowBars      := false; // Whether the white bars on top and bottom should be drawn
-  Info.TeamModeOnly  := true;  // if true the plugin can only be played in team mode
-  Info.GetSoundData  := false; // if true the rdata procedure is called when new sounddata is available
-  Info.Dummy         := false; // Should be set to false... for updating plugin interface
+  //Options
+  Info.LoadSong := True;  //Whether or not a Song should be Loaded
+  //Only When Song is Loaded:
+  Info.ShowScore := True; //Whether or not the Score should be shown
+  Info.ShowNotes := True; //Whether the Note Lines should be displayed
+  Info.LoadVideo := True; //Should the Video be loaded ?
+  Info.LoadBack  := True; //Should the Background be loaded ?
+
+  Info.BGShowFull := False;   //Whether the Background or the Video should be shown Fullsize
+  Info.BGShowFull_O := True;  //Whether the Background or the Video should be shown Fullsize
+
+  Info.ShowRateBar:= True;   //Whether the Bar that shows how good the player was sould be displayed
+  Info.ShowRateBar_O := false; //Load from Ini whether the Bar should be Displayed
+
+  Info.EnLineBonus := False;  //Whether LineBonus Should be enabled
+  Info.EnLineBonus_O := True; //Load from Ini whether LineBonus Should be enabled
+
+  //Options even when song is Not loaded
+  Info.ShowBars := False; //Whether the White Bars on Top and Bottom should be Drawn
+  Info.TeamModeOnly := True;  //If True the Plugin can only be Played in Team Mode
+  Info.GetSoundData := False;  //If True the RData Procedure is called when new SoundData is available
+  Info.Dummy := False;         //Should be Set to False... for Updateing Plugin Interface
 end;
 
-// executed on game start. if true game begins, else failure
-function Init (const TeamInfo:   TTeamInfo;
-               var   Playerinfo: TPlayerinfo;
-	       const Sentences:  TSentences;
-	       const Methods:    TMethodRec)
-	      : boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+//Executed on Game Start //If True Game begins, else Failure
+function Init (const TeamInfo: TTeamInfo; var Playerinfo: TPlayerinfo; const Sentences: TSentences; const Methods: TMethodRec): boolean; stdcall;
 var
-  Index, J: integer;
+I,J: Integer;
 begin
-// Get beginning of sentences
-  for Index := 0 to Sentences.High do
-  begin
-    SetLength(Startpoints, Index+1);
-    Startpoints[Index]:=Sentences.Sentence[Index].Start;
+  // Get beginning of sentences
+ for I := 0 to Sentences.High do begin
+    SetLength(Startpoints, I+1);
+    Startpoints[I]:=Sentences.Sentence[I].Start;
   end;
-  // Get teams and players
-  for Index := 0 to TeamInfo.NumTeams-1 do
-  begin
-    SetLength(TeamPlayer, Index+1);
-    for J := 0 to TeamInfo.Teaminfo[Index].NumPlayers-1 do
+  // Get Teams and Players
+  for I := 0 to TeamInfo.NumTeams-1 do
     begin
-      SetLength(TeamPlayer[Index], J+1);
-      TeamPlayer[Index,J] := Copy(string(TeamInfo.Teaminfo[Index].Playerinfo[J].Name), 1, 8);
-      if (not(TeamPlayer[Index,J] = (string(TeamInfo.Teaminfo[Index].Playerinfo[J].Name)))) then
-        TeamPlayer[Index,J] := TeamPlayer[Index,J]+'.';
-      SPT[Index]:=J+1;
+      SetLength(TeamPlayer, I+1);
+      for J := 0 to TeamInfo.Teaminfo[I].NumPlayers-1 do
+        begin
+          SetLength(TeamPlayer[I], J+1);
+          TeamPlayer[I,J] := Copy(String(TeamInfo.Teaminfo[I].Playerinfo[J].Name),1,8);
+          If (NOT(TeamPlayer[I,J] = (String(TeamInfo.Teaminfo[I].Playerinfo[J].Name)))) THEN TeamPlayer[I,J] := TeamPlayer[I,J]+'.';
+          SPT[I]:=J+1;
+        end;
+        CurSinger[I] := TeamInfo.Teaminfo[I].CurPlayer;
+        repeat
+            NextSinger[I] := random(SPT[I]);
+        until NOT(NextSinger[I] = CurSinger[I]) OR (SPT[I] = 1) ;
     end;
-    CurSinger[Index] := TeamInfo.Teaminfo[Index].CurPlayer;
-    repeat
-      NextSinger[Index] := random(SPT[Index]);
-    until not(NextSinger[Index] = CurSinger[Index]) or (SPT[Index] = 1);
-  end;
   ChangeOnSentence := 8;
-  starttick := GetTicks;
+  starttick := SDL_GetTicks();
   firsttime := true;
   secondtime := true;
   bps := 1;
   MethodRec := Methods;
-  Result := true;
+  Result := True;
 end;
 
-// Executed every time the screen is drawn; if false the game finishes
-function Draw (var   Playerinfo:  TPlayerinfo;
-               const CurSentence: cardinal)
-	      : boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+//Executed everytime the Screen is Drawed //If False The Game finishes
+function Draw (var Playerinfo: TPlayerinfo; const CurSentence: Cardinal): boolean; stdcall;
 var
-  Index, timeline, x, y: integer;
-  display:    PChar;
-  TimeString: PChar;
-  start:      boolean;
+ I,timeline,x,y: Integer;
+ display: PChar;
+ start: boolean;
 begin
   // TickCount(firstSentence) (not zero!)
-  if (CurSentence = ChangeOnSentence - 7) and (firsttime) then
+  If (CurSentence = ChangeOnSentence - 7) AND (firsttime) then
   begin
     firsttime := false;
-    starttick := GetTicks;
+    starttick := SDL_GetTicks();
   end;
   start := false;
-  // show first singer for 5 sec
-  if  (CurSentence < 1) and ((starttick + 5000) > GetTicks) then
-    start := true;
+  // show first singers for 5sec
+  if  (CurSentence < 1) AND ((starttick + 5000) > SDL_GetTicks()) then begin start := true; end;
 
   // TickCount(thirdSentence)
-  if (CurSentence = 3) and (secondtime) then
+  If (CurSentence = 3) AND (secondtime) then
   begin
     secondtime := false;
     firsttime := true;
-    endtick := GetTicks;
+    endtick := SDL_GetTicks();
     bps :=  (Startpoints[3]-Startpoints[1]) * 1000 / (endtick-starttick); // BeatsPerSecond
   end;
 
-  // Time to next change
-  RTimeToNextChange := ((Startpoints[ChangeOnSentence]-Startpoints[ChangeOnSentence - 7]) / bps) - ((GetTicks - starttick) / 1000);
-  TimeToNextChange := Trunc(RTimeToNextChange) + 1;
+  // Time to next Change
+  RTtoNextChange := ((Startpoints[ChangeOnSentence]-Startpoints[ChangeOnSentence - 7]) / bps) - ((SDL_GetTicks() - starttick) / 1000);
+  TtoNextChange := Trunc(RTtoNextChange) +1;
 
-  // Next singer for team I
-  for Index := 0 to High(TeamPlayer) do
-  begin
-    if (CurSentence = ChangeOnSentence) and not(PlayerSelected[Index] = CurSentence) then
-    begin
-      PlayerSelected[Index] := CurSentence;
-      CurSinger[Index] := NextSinger[Index];
+  // Next Singer for Team I
+  for I := 0 to High(TeamPlayer) do begin
+    if (CurSentence = ChangeOnSentence) AND NOT(PlayerSelected[I] = CurSentence) then begin
+      PlayerSelected[I] := CurSentence;
+      CurSinger[I] := NextSinger[I];
       repeat
-        NextSinger[Index] := random(SPT[Index]);
-      until not(NextSinger[Index] = CurSinger[Index]) or (SPT[Index] = 1) ;
+        NextSinger[I] := random(SPT[I]);
+      until NOT(NextSinger[I] = CurSinger[I]) OR (SPT[I] = 1) ;
     end;
 
-  // display background
+  // display bg
   glColor4f (0.8, 0.8, 0.8, 1);
-  display := PChar(TeamPlayer[Index,CurSinger[Index]]);
-  if (TimeToNextChange <= 11) or (start = true) then
-  begin
-    glEnable(GL_TEXTURE_2D);
-    glDisable(GL_BLEND);
-    glColor4f(0, 0, 0, 1);
-    glBegin(GL_QUADS);
-      glVertex2f(PlayerInfo.Playerinfo[Index].PosX,       PlayerInfo.Playerinfo[Index].PosY +  8);
-      glVertex2f(PlayerInfo.Playerinfo[Index].PosX,       PlayerInfo.Playerinfo[Index].PosY + 30);
-      glVertex2f(PlayerInfo.Playerinfo[Index].PosX + 100, PlayerInfo.Playerinfo[Index].PosY + 30);
-      glVertex2f(PlayerInfo.Playerinfo[Index].PosX + 100, PlayerInfo.Playerinfo[Index].PosY +  8);
-    glEnd;
-    display := 'Next Singer';
+  display := PChar(TeamPlayer[I,CurSinger[I]]);
+  if (TtoNextChange <= 11) OR (start = true) Then begin
+   glEnable(GL_TEXTURE_2D);
+   glDisable(GL_BLEND);
+   glColor4f (0, 0, 0, 1);
+   glBegin(GL_QUADS);
+   glVertex2f(PlayerInfo.Playerinfo[I].PosX, PlayerInfo.Playerinfo[I].PosY+8);
+   glVertex2f(PlayerInfo.Playerinfo[I].PosX, PlayerInfo.Playerinfo[I].PosY + 30);
+   glVertex2f(PlayerInfo.Playerinfo[I].PosX + 100, PlayerInfo.Playerinfo[I].PosY + 30);
+   glVertex2f(PlayerInfo.Playerinfo[I].PosX + 100, PlayerInfo.Playerinfo[I].PosY+8);
+   glEnd;
+   display := 'Next Singer';
 
    // timeline
-    x := 270;
-    y := 472;
-    if (TimeToNextChange <= 5) and (RTimeToNextChange > 0) then
-    begin
-      timeline := Trunc(RTimeToNextChange*50);
-      glColor3f(0, 0, 0);
-      glBegin(GL_QUADS);
-        glVertex2f(x,           y);
-        glVertex2f(x,           y + 18);
-        glVertex2f(x + 6 + 250, y + 18);
-        glVertex2f(x + 6 + 250, y);
-      glEnd;
-      glColor3f(0.2, 0.2, 0.2);
-      glBegin(GL_QUADS);
-        glVertex2f(x + 3,       y +  3);
-        glVertex2f(x + 3,       y + 15);
-        glVertex2f(x + 3 + 250, y + 15);
-        glVertex2f(x + 3 + 250, y +  3);
-      glEnd;
-      glColor3f(0.8, 0.2, 0.2);
-      glBegin(GL_QUADS);
-        glColor3f(0.9, 0,   0);   glVertex2f(x + 3,            y +  3);
-        glColor3f(0.8, 0.3, 0.3); glVertex2f(x + 3,            y + 15);
-        glColor3f(0.8, 0.3, 0.3); glVertex2f(x + 3 + timeline, y + 15);
-        glColor3f(0.9, 0,   0);   glVertex2f(x + 3 + timeline, y +  3);
-      glEnd;
-    end;
-    glDisable(GL_TEXTURE_2D);
+   x:= 270; y:= 472;
+  if (TtoNextChange <= 5) AND (RTtoNextChange > 0) then begin
+   timeline := Trunc(RTtoNextChange*50);
+   glColor3f (0, 0, 0);
+   glBegin(GL_QUADS);
+   glVertex2f(x, y);
+   glVertex2f(x, y+18);
+   glVertex2f(x+6+250, y+18);
+   glVertex2f(x+6+250, y);
+   glEnd;
+   glColor3f (0.2, 0.2, 0.2);
+   glBegin(GL_QUADS);
+   glVertex2f(x+3, y+3);
+   glVertex2f(x+3, y+15);
+   glVertex2f(x+3+250, y+15);
+   glVertex2f(x+3+250, y+3);
+   glEnd;
+   glColor3f (0.8, 0.2, 0.2);
+   glBegin(GL_QUADS);
+   glColor3f (0.9, 0, 0); glVertex2f(x+3, y+3);
+   glColor3f (0.8, 0.3, 0.3); glVertex2f(x+3, y+15);
+   glColor3f (0.8, 0.3, 0.3); glVertex2f(x+3+timeline, y+15);
+   glColor3f (0.9, 0, 0); glVertex2f(x+3+timeline, y+3);
+   glEnd;
+  end;
+  glDisable(GL_TEXTURE_2D);
   end;
 
   // Names, Timer
-  if (TimeToNextChange <= 9) then
-  begin display := PChar(TeamPlayer[Index,NextSinger[Index]]);
-    glColor4f(0.8, 0.1, 0.2, 1);
-// KMS aka Mischi:
-// try to replace the use of the unit USDXStrUtils
-// original:
-//    MethodRec.Print (1, 18, PlayerInfo.Playerinfo[Index].PosX+85, PlayerInfo.Playerinfo[Index].PosY+10, CreateStr(PChar(IntToStr(Trunc(TimeToNextChange)))));
-// replacement: Is this correct?
-    TimeString := PChar(IntToStr(Trunc(TimeToNextChange)));
-    MethodRec.Print (1, 18, PlayerInfo.Playerinfo[Index].PosX+85, PlayerInfo.Playerinfo[Index].PosY+10, TimeString);
-  end;
-  glColor4f(0.8, 0.8, 0.8, 1);
-  if (CurSentence = 0) then
-    display := PChar(TeamPlayer[Index,CurSinger[Index]]);
-  if (TimeToNextChange <= 11) or (start) then
-    MethodRec.Print (1, 18, PlayerInfo.Playerinfo[Index].PosX+5, PlayerInfo.Playerinfo[Index].PosY+10, display);
+  if (TtoNextChange <= 9) Then begin display := PChar(TeamPlayer[I,NextSinger[I]]);
+    glColor4f (0.8, 0.1, 0.2, 1);
+    MethodRec.Print (1, 18, PlayerInfo.Playerinfo[I].PosX+85, PlayerInfo.Playerinfo[I].PosY+10, CreateStr(PChar(IntToStr(Trunc(TtoNextChange)))));
   end;
-  if (CurSentence = ChangeOnSentence) then
-  begin
-    ChangeOnSentence := CurSentence + 7;
-    firsttime := true;
+  glColor4f (0.8, 0.8, 0.8, 1);
+  if (CurSentence = 0) then display := PChar(TeamPlayer[I,CurSinger[I]]);
+  if (TtoNextChange <= 11) OR (start) Then MethodRec.Print (1, 18, PlayerInfo.Playerinfo[I].PosX+5, PlayerInfo.Playerinfo[I].PosY+10, display);
   end;
-  Result := true;
+  if (CurSentence = ChangeOnSentence) then  begin ChangeOnSentence := CurSentence + 7; firsttime := true; end;
+Result := True;
 end;
 
-// is executed on finish, returns the player number of the winner
-function Finish (var Playerinfo: TPlayerinfo): byte; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
+//Is Executed on Finish, Returns the Playernum of the Winner
+function Finish (var Playerinfo: TPlayerinfo): byte; stdcall;
 var
-  Index:    integer;
-  MaxScore: word;
+  I:Integer;
+  MaxScore: Word;
 begin
   Result := 0;
   MaxScore := 0;
-  for Index := 0 to PlayerInfo.NumPlayers-1 do
+  for I := 0 to PlayerInfo.NumPlayers-1 do
   begin
-    PlayerInfo.Playerinfo[Index].Percentage := PlayerInfo.Playerinfo[Index].Score div 9999;
-    if (PlayerInfo.Playerinfo[Index].Score > MaxScore) then
+    PlayerInfo.Playerinfo[I].Percentage := PlayerInfo.Playerinfo[I].Score div 9999;
+    if (PlayerInfo.Playerinfo[I].Score > MaxScore) then
     begin
-      MaxScore := PlayerInfo.Playerinfo[Index].Score;
-      case Index of
+      MaxScore := PlayerInfo.Playerinfo[I].Score;
+      Case I of
         0: Result :=  1;
         1: Result :=  2;
         2: Result :=  4;
@@ -243,29 +213,26 @@ begin
         5: Result := 32;
       end;
     end
-    else if (PlayerInfo.Playerinfo[Index].Score = MaxScore) and (PlayerInfo.Playerinfo[Index].Score <> 0) then
+    else if (PlayerInfo.Playerinfo[I].Score = MaxScore) AND (PlayerInfo.Playerinfo[I].Score <> 0) then
     begin
-      case Index of
-        0: Result := Result or  1;
-        1: Result := Result or  2;
-        2: Result := Result or  4;
-        3: Result := Result or  8;
-        4: Result := Result or 16;
-        5: Result := Result or 32;
+      Case I of
+        0: Result := Result OR 1;
+        1: Result := Result OR 2;
+        2: Result := Result OR 4;
+        3: Result := Result OR 8;
+        4: Result := Result OR 16;
+        5: Result := Result OR 32;
       end;
     end;
   end;
 
-  // When nobody has points -> everybody looses
+  //When nobody has Points -> Everybody loose
   if (MaxScore = 0) then
     Result := 0;
 end;
 
 exports
-  PluginInfo,
-  Init,
-  Draw,
-  Finish;
+PluginInfo, Init, Draw, Finish;
 
 begin