merged trunk into lua branch

plugin loading is disabled atm because of a bug reading the files (lua may be the reason). 
Reading the files in usdx and passing the contents to lua may solve this

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

1 files changed, 22 insertions, 22 deletions

diff --git a/Lua/plugins/Duell/Duell.dpr b/Lua/plugins/Duell/Duell.dpr
index 93c87d0e..f54edea8 100644
--- a/Lua/plugins/Duell/Duell.dpr
+++ b/Lua/plugins/Duell/Duell.dpr
@@ -8,56 +8,56 @@ uses
   ModiSDK in '..\SDK\ModiSDK.pas';
 
 //Gave the Plugins Info
-procedure PluginInfo (var Info: TPluginInfo); stdcall;
+procedure PluginInfo (var Info: TPluginInfo); {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 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; stdcall;
+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 Drawed //If False The Game finishes
-function Draw (var Playerinfo: TPlayerinfo; const CurSentence: Cardinal): boolean; stdcall;
+function Draw (var Playerinfo: TPlayerinfo; const CurSentence: Cardinal): boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 begin
-Result := True;
+  Result := True;
 end;
 
 //Is Executed on Finish, Returns the Playernum of the Winner
-function Finish (var Playerinfo: TPlayerinfo): byte; stdcall;
+function Finish (var Playerinfo: TPlayerinfo): byte; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 var
-  I:Integer;
+  I: Integer;
   MaxScore: Word;
 begin
   Result := 0;