diff options
author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-04-18 08:09:49 +0000 |
---|---|---|
committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-04-18 08:09:49 +0000 |
commit | 34120b83807097ca25af4af5d35ac6023627bee6 (patch) | |
tree | 5dd980df23ea0e7c00f53d8ce7fa82a6c194c1ba | |
parent | aca4ad448dddb2a260cda692ec9eeba415a78852 (diff) | |
download | usdx-34120b83807097ca25af4af5d35ac6023627bee6.tar.gz usdx-34120b83807097ca25af4af5d35ac6023627bee6.tar.xz usdx-34120b83807097ca25af4af5d35ac6023627bee6.zip |
rename StrUtils.pas to USDXStrUtils.pas; should finally be removed anyway. Many text changes in comments
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1675 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r-- | plugins/Blind/Blind.dpr | 2 | ||||
-rw-r--r-- | plugins/Don't_Get_Worse/Hold_The_Line.dpr | 54 | ||||
-rw-r--r-- | plugins/SDK/USDXStrUtils.pas (renamed from plugins/SDK/StrUtils.pas) | 2 | ||||
-rw-r--r-- | plugins/Team_Duell/TeamDuell.dpr | 59 |
4 files changed, 59 insertions, 58 deletions
diff --git a/plugins/Blind/Blind.dpr b/plugins/Blind/Blind.dpr index 534767f3..82721102 100644 --- a/plugins/Blind/Blind.dpr +++ b/plugins/Blind/Blind.dpr @@ -53,7 +53,7 @@ begin Result := true; end; -// executed everytime the screen is drawed. if false the game finishes +// 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} diff --git a/plugins/Don't_Get_Worse/Hold_The_Line.dpr b/plugins/Don't_Get_Worse/Hold_The_Line.dpr index ca59cbdb..2b819609 100644 --- a/plugins/Don't_Get_Worse/Hold_The_Line.dpr +++ b/plugins/Don't_Get_Worse/Hold_The_Line.dpr @@ -6,7 +6,7 @@ library Hold_The_Line; uses ModiSDK in '..\SDK\ModiSDK.pas', - StrUtils in '..\SDK\StrUtils.pas', + USDXStrUtils in '..\SDK\USDXStrUtils.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'; @@ -23,7 +23,7 @@ var DismissedSound: cardinal; -// Gave the Plugins Info +// Give the plugin's info procedure PluginInfo (var Info: TPluginInfo); {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF} begin Info.Name := 'PLUGIN_HDL_NAME'; @@ -36,30 +36,30 @@ begin 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 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 + 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 end; -// Executed on Game Start; if true Game begins, else Failure +// executed on game start. if true game begins, else failure function Init (const TeamInfo: TTeamInfo; var Playerinfo: TPlayerinfo; const Sentences: TSentences; @@ -149,7 +149,7 @@ begin MethodRec.PlaySound (DismissedSound); end; - // Draw Pointer + // Draw pointer if (PointerVisible) then begin glColor4f (0.2, 0.8, 0.1, 1); @@ -175,7 +175,7 @@ begin else begin Inc(C); - // Draw Dismissed + // Draw dismissed Text := CreateStr(PChar('PARTY_DISMISSED')); glColor4f (0.8, 0.8, 0.8, 1); @@ -188,7 +188,7 @@ begin Result := false; end; -// Is Executed on Finish, Returns the Playernum of the Winner +// is executed on finish, returns the player number of the winner function Finish (var Playerinfo: TPlayerinfo): byte; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF} var Index: integer; diff --git a/plugins/SDK/StrUtils.pas b/plugins/SDK/USDXStrUtils.pas index 069c89c3..94e5f65f 100644 --- a/plugins/SDK/StrUtils.pas +++ b/plugins/SDK/USDXStrUtils.pas @@ -1,4 +1,4 @@ -unit StrUtils; +unit USDXStrUtils; interface diff --git a/plugins/Team_Duell/TeamDuell.dpr b/plugins/Team_Duell/TeamDuell.dpr index 6b8f4c30..4588e5ff 100644 --- a/plugins/Team_Duell/TeamDuell.dpr +++ b/plugins/Team_Duell/TeamDuell.dpr @@ -4,9 +4,11 @@ library TeamDuell ; {$MODE Delphi} {$ENDIF} +// compile with fpc -k-U -k_SDL_main TeamDuell.dpr -Fi../../src/lib/JEDI-SDL/SDL/Pas/ + uses ModiSDK in '..\SDK\ModiSDK.pas', - StrUtils in '..\SDK\StrUtils.pas', + USDXStrUtils in '..\SDK\USDXStrUtils.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', @@ -22,8 +24,7 @@ var bps, RTtoNextChange: double; firsttime, secondtime: boolean; - -// Give the Plugin's Info +// Give the plugin's info procedure PluginInfo (var Info: TPluginInfo); {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF} begin Info.Name := 'PLUGIN_TEAMDUELL_NAME'; @@ -35,30 +36,30 @@ begin 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.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.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.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 + 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 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 end; -// Executed on Game Start; if true Game begins, else Failure +// executed on game start. if true game begins, else failure function Init (const TeamInfo: TTeamInfo; var Playerinfo: TPlayerinfo; const Sentences: TSentences; @@ -67,13 +68,13 @@ function Init (const TeamInfo: TTeamInfo; var Index, J: integer; begin - // Get beginning of sentences +// Get beginning of sentences for Index := 0 to Sentences.High do begin SetLength(Startpoints, Index+1); Startpoints[Index]:=Sentences.Sentence[Index].Start; end; - // Get Teams and Players + // Get teams and players for Index := 0 to TeamInfo.NumTeams-1 do begin SetLength(TeamPlayer, Index+1); @@ -99,7 +100,7 @@ begin Result := true; end; -// Executed everytime the Screen is Drawed; if false The Game finishes +// 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} @@ -115,7 +116,7 @@ begin starttick := SDL_GetTicks(); end; start := false; - // show first singers for 5sec + // show first singer for 5 sec if (CurSentence < 1) and ((starttick + 5000) > SDL_GetTicks()) then start := true; @@ -128,11 +129,11 @@ begin bps := (Startpoints[3]-Startpoints[1]) * 1000 / (endtick-starttick); // BeatsPerSecond end; - // Time to next Change + // Time to next change RTtoNextChange := ((Startpoints[ChangeOnSentence]-Startpoints[ChangeOnSentence - 7]) / bps) - ((SDL_GetTicks() - starttick) / 1000); TtoNextChange := Trunc(RTtoNextChange) +1; - // Next Singer for Team I + // Next singer for team I for Index := 0 to High(TeamPlayer) do begin if (CurSentence = ChangeOnSentence) and not(PlayerSelected[Index] = CurSentence) then @@ -144,7 +145,7 @@ begin until not(NextSinger[Index] = CurSinger[Index]) or (SPT[Index] = 1) ; end; - // display bg + // display background glColor4f (0.8, 0.8, 0.8, 1); display := PChar(TeamPlayer[Index,CurSinger[Index]]); if (TtoNextChange <= 11) or (start = true) then @@ -211,7 +212,7 @@ begin Result := true; end; -// Is Executed on Finish, Returns the Playernum of the Winner +// is executed on finish, returns the player number of the winner function Finish (var Playerinfo: TPlayerinfo): byte; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF} var Index: integer; |