Preparation for namestyle fixing: fixed ambiguous name
This commit is contained in:
Flamefire committed
1 parent
b0b3c09ab4
commit
498cb09dd2
14 files changed
+145
-127
No files matched your search
@@ -192,17 +192,17 @@ namespace VocaluxeLib.PartyModes.Challenge
|
||||
|
||||
public override void DataFromScreen(string ScreenName, Object Data)
|
||||
{
|
||||
DataFromScreen data = new DataFromScreen();
|
||||
DataFromScreen dataFrom = new DataFromScreen();
|
||||
switch (ScreenName)
|
||||
{
|
||||
case "PartyScreenChallengeConfig":
|
||||
|
||||
try
|
||||
{
|
||||
data = (DataFromScreen)Data;
|
||||
GameData.NumPlayer = data.ScreenConfig.NumPlayer;
|
||||
GameData.NumPlayerAtOnce = data.ScreenConfig.NumPlayerAtOnce;
|
||||
GameData.NumRounds = data.ScreenConfig.NumRounds;
|
||||
dataFrom = (DataFromScreen)Data;
|
||||
GameData.NumPlayer = dataFrom.ScreenConfig.NumPlayer;
|
||||
GameData.NumPlayerAtOnce = dataFrom.ScreenConfig.NumPlayerAtOnce;
|
||||
GameData.NumRounds = dataFrom.ScreenConfig.NumRounds;
|
||||
|
||||
_Stage = EStage.Config;
|
||||
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
|
||||
@@ -216,12 +216,12 @@ namespace VocaluxeLib.PartyModes.Challenge
|
||||
case "PartyScreenChallengeNames":
|
||||
try
|
||||
{
|
||||
data = (DataFromScreen)Data;
|
||||
if (data.ScreenNames.FadeToConfig)
|
||||
dataFrom = (DataFromScreen)Data;
|
||||
if (dataFrom.ScreenNames.FadeToConfig)
|
||||
_Stage = EStage.NotStarted;
|
||||
else
|
||||
{
|
||||
GameData.ProfileIDs = data.ScreenNames.ProfileIDs;
|
||||
GameData.ProfileIDs = dataFrom.ScreenNames.ProfileIDs;
|
||||
_Stage = EStage.Names;
|
||||
}
|
||||
|
||||
@@ -236,10 +236,10 @@ namespace VocaluxeLib.PartyModes.Challenge
|
||||
case "PartyScreenChallengeMain":
|
||||
try
|
||||
{
|
||||
data = (DataFromScreen)Data;
|
||||
if (data.ScreenMain.FadeToSongSelection)
|
||||
dataFrom = (DataFromScreen)Data;
|
||||
if (dataFrom.ScreenMain.FadeToSongSelection)
|
||||
_Stage = EStage.Singing;
|
||||
if (data.ScreenMain.FadeToNameSelection)
|
||||
if (dataFrom.ScreenMain.FadeToNameSelection)
|
||||
_Stage = EStage.Config;
|
||||
}
|
||||
catch (Exception e)
|
||||
|
||||
@@ -197,17 +197,17 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
|
||||
|
||||
public override void DataFromScreen(string ScreenName, Object Data)
|
||||
{
|
||||
DataFromScreen data = new DataFromScreen();
|
||||
DataFromScreen dataFrom = new DataFromScreen();
|
||||
switch (ScreenName)
|
||||
{
|
||||
case "PartyScreenChallengeMedleyConfig":
|
||||
|
||||
try
|
||||
{
|
||||
data = (DataFromScreen)Data;
|
||||
GameData.NumPlayer = data.ScreenConfig.NumPlayer;
|
||||
GameData.NumPlayerAtOnce = data.ScreenConfig.NumPlayerAtOnce;
|
||||
GameData.NumRounds = data.ScreenConfig.NumRounds;
|
||||
dataFrom = (DataFromScreen)Data;
|
||||
GameData.NumPlayer = dataFrom.ScreenConfig.NumPlayer;
|
||||
GameData.NumPlayerAtOnce = dataFrom.ScreenConfig.NumPlayerAtOnce;
|
||||
GameData.NumRounds = dataFrom.ScreenConfig.NumRounds;
|
||||
|
||||
_Stage = EStage.Config;
|
||||
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
|
||||
@@ -221,12 +221,12 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
|
||||
case "PartyScreenChallengeMedleyNames":
|
||||
try
|
||||
{
|
||||
data = (DataFromScreen)Data;
|
||||
if (data.ScreenNames.FadeToConfig)
|
||||
dataFrom = (DataFromScreen)Data;
|
||||
if (dataFrom.ScreenNames.FadeToConfig)
|
||||
_Stage = EStage.NotStarted;
|
||||
else
|
||||
{
|
||||
GameData.ProfileIDs = data.ScreenNames.ProfileIDs;
|
||||
GameData.ProfileIDs = dataFrom.ScreenNames.ProfileIDs;
|
||||
_Stage = EStage.Names;
|
||||
}
|
||||
|
||||
@@ -241,10 +241,10 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
|
||||
case "PartyScreenChallengeMedleyMain":
|
||||
try
|
||||
{
|
||||
data = (DataFromScreen)Data;
|
||||
if (data.ScreenMain.FadeToSongSelection)
|
||||
dataFrom = (DataFromScreen)Data;
|
||||
if (dataFrom.ScreenMain.FadeToSongSelection)
|
||||
_Stage = EStage.Singing;
|
||||
if (data.ScreenMain.FadeToNameSelection)
|
||||
if (dataFrom.ScreenMain.FadeToNameSelection)
|
||||
_Stage = EStage.Config;
|
||||
}
|
||||
catch (Exception e)
|
||||
|
||||
@@ -225,21 +225,21 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
|
||||
public override void DataFromScreen(string ScreenName, Object Data)
|
||||
{
|
||||
DataFromScreen data = new DataFromScreen();
|
||||
DataFromScreen dataFrom = new DataFromScreen();
|
||||
switch (ScreenName)
|
||||
{
|
||||
case "PartyScreenTicTacToeConfig":
|
||||
|
||||
try
|
||||
{
|
||||
data = (DataFromScreen)Data;
|
||||
GameData.NumPlayerTeam1 = data.ScreenConfig.NumPlayerTeam1;
|
||||
GameData.NumPlayerTeam2 = data.ScreenConfig.NumPlayerTeam2;
|
||||
GameData.NumFields = data.ScreenConfig.NumFields;
|
||||
GameData.SongSource = data.ScreenConfig.SongSource;
|
||||
GameData.CategoryID = data.ScreenConfig.CategoryID;
|
||||
GameData.PlaylistID = data.ScreenConfig.PlaylistID;
|
||||
GameData.GameMode = data.ScreenConfig.GameMode;
|
||||
dataFrom = (DataFromScreen)Data;
|
||||
GameData.NumPlayerTeam1 = dataFrom.ScreenConfig.NumPlayerTeam1;
|
||||
GameData.NumPlayerTeam2 = dataFrom.ScreenConfig.NumPlayerTeam2;
|
||||
GameData.NumFields = dataFrom.ScreenConfig.NumFields;
|
||||
GameData.SongSource = dataFrom.ScreenConfig.SongSource;
|
||||
GameData.CategoryID = dataFrom.ScreenConfig.CategoryID;
|
||||
GameData.PlaylistID = dataFrom.ScreenConfig.PlaylistID;
|
||||
GameData.GameMode = dataFrom.ScreenConfig.GameMode;
|
||||
|
||||
_Stage = EStage.Config;
|
||||
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
|
||||
@@ -253,8 +253,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
case "PartyScreenTicTacToeNames":
|
||||
try
|
||||
{
|
||||
data = (DataFromScreen)Data;
|
||||
if (data.ScreenNames.FadeToConfig)
|
||||
dataFrom = (DataFromScreen)Data;
|
||||
if (dataFrom.ScreenNames.FadeToConfig)
|
||||
_Stage = EStage.NotStarted;
|
||||
else
|
||||
{
|
||||
@@ -262,8 +262,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
GameData.Team = 0;
|
||||
else
|
||||
GameData.Team = 1;
|
||||
GameData.ProfileIDsTeam1 = data.ScreenNames.ProfileIDsTeam1;
|
||||
GameData.ProfileIDsTeam2 = data.ScreenNames.ProfileIDsTeam2;
|
||||
GameData.ProfileIDsTeam1 = dataFrom.ScreenNames.ProfileIDsTeam1;
|
||||
GameData.ProfileIDsTeam2 = dataFrom.ScreenNames.ProfileIDsTeam2;
|
||||
_Stage = EStage.Names;
|
||||
}
|
||||
|
||||
@@ -278,17 +278,17 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
case "PartyScreenTicTacToeMain":
|
||||
try
|
||||
{
|
||||
data = (DataFromScreen)Data;
|
||||
if (data.ScreenMain.FadeToSinging)
|
||||
dataFrom = (DataFromScreen)Data;
|
||||
if (dataFrom.ScreenMain.FadeToSinging)
|
||||
{
|
||||
_Stage = EStage.Singing;
|
||||
GameData.Rounds = data.ScreenMain.Rounds;
|
||||
GameData.SingRoundNr = data.ScreenMain.SingRoundNr;
|
||||
GameData.Songs = data.ScreenMain.Songs;
|
||||
GameData.PlayerTeam1 = data.ScreenMain.PlayerTeam1;
|
||||
GameData.PlayerTeam2 = data.ScreenMain.PlayerTeam2;
|
||||
GameData.Rounds = dataFrom.ScreenMain.Rounds;
|
||||
GameData.SingRoundNr = dataFrom.ScreenMain.SingRoundNr;
|
||||
GameData.Songs = dataFrom.ScreenMain.Songs;
|
||||
GameData.PlayerTeam1 = dataFrom.ScreenMain.PlayerTeam1;
|
||||
GameData.PlayerTeam2 = dataFrom.ScreenMain.PlayerTeam2;
|
||||
}
|
||||
if (data.ScreenMain.FadeToNameSelection)
|
||||
if (dataFrom.ScreenMain.FadeToNameSelection)
|
||||
_Stage = EStage.Config;
|
||||
}
|
||||
catch (Exception e)
|
||||
@@ -298,7 +298,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
|
||||
|
||||
if (_Stage == EStage.Singing)
|
||||
StartRound(data.ScreenMain.SingRoundNr);
|
||||
StartRound(dataFrom.ScreenMain.SingRoundNr);
|
||||
if (_Stage == EStage.Config)
|
||||
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
|
||||
break;
|
||||
|
||||
+19
-1
@@ -1,10 +1,11 @@
|
||||
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||
<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
|
||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitArrayCreation/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SpecifyACultureInStringConversionExplicitly/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEverywhere/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEvident/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Cleanup/@EntryIndexedValue"><?xml version="1.0" encoding="utf-16"?><Profile name="Cleanup"><CSArrangeThisQualifier>True</CSArrangeThisQualifier><CSRemoveCodeRedundancies>True</CSRemoveCodeRedundancies><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSUseVar><BehavourStyle>CAN_CHANGE_TO_EXPLICIT</BehavourStyle><LocalVariableStyle>ALWAYS_EXPLICIT</LocalVariableStyle><ForeachVariableStyle>ALWAYS_EXPLICIT</ForeachVariableStyle></CSUseVar><CSOptimizeUsings><OptimizeUsings>False</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSReformatCode>True</CSReformatCode><CSharpFormatDocComments>True</CSharpFormatDocComments><CSShortenReferences>True</CSShortenReferences><StyleCop.Documentation><SA1600ElementsMustBeDocumented>False</SA1600ElementsMustBeDocumented><SA1604ElementDocumentationMustHaveSummary>False</SA1604ElementDocumentationMustHaveSummary><SA1609PropertyDocumentationMustHaveValueDocumented>False</SA1609PropertyDocumentationMustHaveValueDocumented><SA1611ElementParametersMustBeDocumented>False</SA1611ElementParametersMustBeDocumented><SA1615ElementReturnValueMustBeDocumented>False</SA1615ElementReturnValueMustBeDocumented><SA1617VoidReturnValueMustNotBeDocumented>False</SA1617VoidReturnValueMustNotBeDocumented><SA1618GenericTypeParametersMustBeDocumented>False</SA1618GenericTypeParametersMustBeDocumented><SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes>False</SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes><SA1628DocumentationTextMustBeginWithACapitalLetter>False</SA1628DocumentationTextMustBeginWithACapitalLetter><SA1629DocumentationTextMustEndWithAPeriod>False</SA1629DocumentationTextMustEndWithAPeriod><SA1633SA1641UpdateFileHeader>Ignore</SA1633SA1641UpdateFileHeader><SA1639FileHeaderMustHaveSummary>False</SA1639FileHeaderMustHaveSummary><SA1642ConstructorSummaryDocumentationMustBeginWithStandardText>False</SA1642ConstructorSummaryDocumentationMustBeginWithStandardText><SA1643DestructorSummaryDocumentationMustBeginWithStandardText>False</SA1643DestructorSummaryDocumentationMustBeginWithStandardText><SA1644DocumentationHeadersMustNotContainBlankLines>False</SA1644DocumentationHeadersMustNotContainBlankLines></StyleCop.Documentation><StyleCop.Layout><SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine>False</SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine><SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine>True</SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine><SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine>True</SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine><SA1511WhileDoFooterMustNotBePrecededByBlankLine>True</SA1511WhileDoFooterMustNotBePrecededByBlankLine><SA1512SingleLineCommentsMustNotBeFollowedByBlankLine>True</SA1512SingleLineCommentsMustNotBeFollowedByBlankLine><SA1513ClosingCurlyBracketMustBeFollowedByBlankLine>False</SA1513ClosingCurlyBracketMustBeFollowedByBlankLine><SA1514ElementDocumentationHeaderMustBePrecededByBlankLine>False</SA1514ElementDocumentationHeaderMustBePrecededByBlankLine><SA1515SingleLineCommentMustBeProceededByBlankLine>False</SA1515SingleLineCommentMustBeProceededByBlankLine></StyleCop.Layout><StyleCop.Readability><SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists>True</SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists><SA1106CodeMustNotContainEmptyStatements>True</SA1106CodeMustNotContainEmptyStatements><SA1108BlockStatementsMustNotContainEmbeddedComments>True</SA1108BlockStatementsMustNotContainEmbeddedComments><SA1109BlockStatementsMustNotContainEmbeddedRegions>True</SA1109BlockStatementsMustNotContainEmbeddedRegions><SA1120CommentsMustContainText>False</SA1120CommentsMustContainText><SA1121UseBuiltInTypeAlias>False</SA1121UseBuiltInTypeAlias><SA1122UseStringEmptyForEmptyStrings>False</SA1122UseStringEmptyForEmptyStrings><SA1123DoNotPlaceRegionsWithinElements>False</SA1123DoNotPlaceRegionsWithinElements><SA1124CodeMustNotContainEmptyRegions>True</SA1124CodeMustNotContainEmptyRegions></StyleCop.Readability><StyleCop.Spacing><SA1001CommasMustBeSpacedCorrectly>False</SA1001CommasMustBeSpacedCorrectly><SA1005SingleLineCommentsMustBeginWithSingleSpace>False</SA1005SingleLineCommentsMustBeginWithSingleSpace><SA1006PreprocessorKeywordsMustNotBePrecededBySpaLine truncated
|
||||
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Cleanup/@EntryIndexedValue"><?xml version="1.0" encoding="utf-16"?><Profile name="Cleanup"><CSArrangeThisQualifier>True</CSArrangeThisQualifier><CSRemoveCodeRedundancies>True</CSRemoveCodeRedundancies><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSUseVar><BehavourStyle>CAN_CHANGE_TO_EXPLICIT</BehavourStyle><LocalVariableStyle>ALWAYS_EXPLICIT</LocalVariableStyle><ForeachVariableStyle>ALWAYS_EXPLICIT</ForeachVariableStyle></CSUseVar><CSOptimizeUsings><OptimizeUsings>False</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSReformatCode>True</CSReformatCode><CSharpFormatDocComments>True</CSharpFormatDocComments><CSShortenReferences>True</CSShortenReferences><StyleCop.Documentation><SA1600ElementsMustBeDocumented>False</SA1600ElementsMustBeDocumented><SA1604ElementDocumentationMustHaveSummary>False</SA1604ElementDocumentationMustHaveSummary><SA1609PropertyDocumentationMustHaveValueDocumented>False</SA1609PropertyDocumentationMustHaveValueDocumented><SA1611ElementParametersMustBeDocumented>False</SA1611ElementParametersMustBeDocumented><SA1615ElementReturnValueMustBeDocumented>False</SA1615ElementReturnValueMustBeDocumented><SA1617VoidReturnValueMustNotBeDocumented>False</SA1617VoidReturnValueMustNotBeDocumented><SA1618GenericTypeParametersMustBeDocumented>False</SA1618GenericTypeParametersMustBeDocumented><SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes>False</SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes><SA1628DocumentationTextMustBeginWithACapitalLetter>False</SA1628DocumentationTextMustBeginWithACapitalLetter><SA1629DocumentationTextMustEndWithAPeriod>False</SA1629DocumentationTextMustEndWithAPeriod><SA1633SA1641UpdateFileHeader>Ignore</SA1633SA1641UpdateFileHeader><SA1639FileHeaderMustHaveSummary>False</SA1639FileHeaderMustHaveSummary><SA1642ConstructorSummaryDocumentationMustBeginWithStandardText>False</SA1642ConstructorSummaryDocumentationMustBeginWithStandardText><SA1643DestructorSummaryDocumentationMustBeginWithStandardText>False</SA1643DestructorSummaryDocumentationMustBeginWithStandardText><SA1644DocumentationHeadersMustNotContainBlankLines>False</SA1644DocumentationHeadersMustNotContainBlankLines></StyleCop.Documentation><StyleCop.Layout><SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine>False</SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine><SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine>True</SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine><SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine>True</SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine><SA1511WhileDoFooterMustNotBePrecededByBlankLine>True</SA1511WhileDoFooterMustNotBePrecededByBlankLine><SA1512SingleLineCommentsMustNotBeFollowedByBlankLine>True</SA1512SingleLineCommentsMustNotBeFollowedByBlankLine><SA1513ClosingCurlyBracketMustBeFollowedByBlankLine>False</SA1513ClosingCurlyBracketMustBeFollowedByBlankLine><SA1514ElementDocumentationHeaderMustBePrecededByBlankLine>False</SA1514ElementDocumentationHeaderMustBePrecededByBlankLine><SA1515SingleLineCommentMustBeProceededByBlankLine>False</SA1515SingleLineCommentMustBeProceededByBlankLine></StyleCop.Layout><StyleCop.Readability><SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists>True</SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists><SA1106CodeMustNotContainEmptyStatements>True</SA1106CodeMustNotContainEmptyStatements><SA1108BlockStatementsMustNotContainEmbeddedComments>True</SA1108BlockStatementsMustNotContainEmbeddedComments><SA1109BlockStatementsMustNotContainEmbeddedRegions>True</SA1109BlockStatementsMustNotContainEmbeddedRegions><SA1120CommentsMustContainText>False</SA1120CommentsMustContainText><SA1121UseBuiltInTypeAlias>False</SA1121UseBuiltInTypeAlias><SA1122UseStringEmptyForEmptyStrings>False</SA1122UseStringEmptyForEmptyStrings><SA1123DoNotPlaceRegionsWithinElements>False</SA1123DoNotPlaceRegionsWithinElements><SA1124CodeMustNotContainEmptyRegions>True</SA1124CodeMustNotContainEmptyRegions></StyleCop.Readability><StyleCop.Spacing><SA1001CommasMustBeSpacedCorrectly>False</SA1001CommasMustBeSpacedCorrectly><SA1005SingleLineCommentsMustBeginWithSingleSpace>False</SA1005SingleLineCommentsMustBeginWithSingleSpace><SA1006PreprocessorKeywordsMustNotBePrecededBySpaLine truncated
|
||||
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Simple_0020Reformat/@EntryIndexedValue"><?xml version="1.0" encoding="utf-16"?><Profile name="Simple Reformat"><CSOptimizeUsings><OptimizeUsings>False</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSReformatCode>True</CSReformatCode><StyleCop.Documentation><SA1600ElementsMustBeDocumented>False</SA1600ElementsMustBeDocumented><SA1604ElementDocumentationMustHaveSummary>False</SA1604ElementDocumentationMustHaveSummary><SA1609PropertyDocumentationMustHaveValueDocumented>False</SA1609PropertyDocumentationMustHaveValueDocumented><SA1611ElementParametersMustBeDocumented>False</SA1611ElementParametersMustBeDocumented><SA1615ElementReturnValueMustBeDocumented>False</SA1615ElementReturnValueMustBeDocumented><SA1617VoidReturnValueMustNotBeDocumented>False</SA1617VoidReturnValueMustNotBeDocumented><SA1618GenericTypeParametersMustBeDocumented>False</SA1618GenericTypeParametersMustBeDocumented><SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes>False</SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes><SA1628DocumentationTextMustBeginWithACapitalLetter>False</SA1628DocumentationTextMustBeginWithACapitalLetter><SA1629DocumentationTextMustEndWithAPeriod>False</SA1629DocumentationTextMustEndWithAPeriod><SA1633SA1641UpdateFileHeader>Ignore</SA1633SA1641UpdateFileHeader><SA1639FileHeaderMustHaveSummary>False</SA1639FileHeaderMustHaveSummary><SA1642ConstructorSummaryDocumentationMustBeginWithStandardText>False</SA1642ConstructorSummaryDocumentationMustBeginWithStandardText><SA1643DestructorSummaryDocumentationMustBeginWithStandardText>False</SA1643DestructorSummaryDocumentationMustBeginWithStandardText><SA1644DocumentationHeadersMustNotContainBlankLines>False</SA1644DocumentationHeadersMustNotContainBlankLines></StyleCop.Documentation><StyleCop.Spacing><SA1001CommasMustBeSpacedCorrectly>False</SA1001CommasMustBeSpacedCorrectly><SA1005SingleLineCommentsMustBeginWithSingleSpace>False</SA1005SingleLineCommentsMustBeginWithSingleSpace><SA1006PreprocessorKeywordsMustNotBePrecededBySpace>True</SA1006PreprocessorKeywordsMustNotBePrecededBySpace><SA1021NegativeSignsMustBeSpacedCorrectly>True</SA1021NegativeSignsMustBeSpacedCorrectly><SA1022PositiveSignsMustBeSpacedCorrectly>True</SA1022PositiveSignsMustBeSpacedCorrectly><SA1025CodeMustNotContainMultipleWhitespaceInARow>True</SA1025CodeMustNotContainMultipleWhitespaceInARow></StyleCop.Spacing><StyleCop.Readability><SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists>True</SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists><SA1106CodeMustNotContainEmptyStatements>True</SA1106CodeMustNotContainEmptyStatements><SA1108BlockStatementsMustNotContainEmbeddedComments>True</SA1108BlockStatementsMustNotContainEmbeddedComments><SA1109BlockStatementsMustNotContainEmbeddedRegions>True</SA1109BlockStatementsMustNotContainEmbeddedRegions><SA1120CommentsMustContainText>False</SA1120CommentsMustContainText><SA1121UseBuiltInTypeAlias>False</SA1121UseBuiltInTypeAlias><SA1122UseStringEmptyForEmptyStrings>False</SA1122UseStringEmptyForEmptyStrings><SA1123DoNotPlaceRegionsWithinElements>False</SA1123DoNotPlaceRegionsWithinElements><SA1124CodeMustNotContainEmptyRegions>True</SA1124CodeMustNotContainEmptyRegions></StyleCop.Readability><StyleCop.Layout><SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine>False</SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine><SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine>True</SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine><SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine>True</SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine><SA1511WhileDoFooterMustNotBePrecededByBlankLine>True</SA1511WhileDoFooterMustNotBePrecededByBlankLine><SA1512SingleLineCommentsMustNotBeFollowedByBlankLine>True</SA1512SingleLineCommentsMustNotBeFollowedByBlankLine><SA1513ClosingCurlyBracketMustBeFollowedByBlankLine>False</SA1513ClosingCurlyBracketMustBeFollowedByBlankLine><SA1514ElementDocumentationHeaderMustBePrecededByBlankLine>False</SA1514ElementDocumentationHeaderMustBePrecededByBlankLine><SA1515SingleLineCommentMustBeProceededByBlankLine>False</SA1515SingleLineCommentMustBeProceededByBlankLine></StyleCop.Layout><StyleCop.Ordering><AlphabeticalUsingDirectives>Ignore</AlphabeticalUsingDirectives><ExpandUsingDirectiLine truncated
|
||||
<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Cleanup</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">Simple Reformat</s:String>
|
||||
@@ -32,6 +33,23 @@
|
||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_DECLARATION_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_TERNARY_EXPR_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AllowAlias/@EntryValue">False</s:Boolean>
|
||||
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderRegionName/@EntryValue">license</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">/*
|
||||
This file is part of $SOLUTION$.
|
||||

|
||||
$SOLUTION$ is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||

|
||||
$SOLUTION$ is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||

|
||||
You should have received a copy of the GNU General Public License
|
||||
along with $SOLUTION$. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue"><Policy Inspect="True" Prefix="_" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue"><Policy Inspect="True" Prefix="_" Suffix="" Style="AaBb" /></s:String>
|
||||
|
||||
@@ -189,13 +189,13 @@ namespace Vocaluxe.Base
|
||||
return lastInsertID;
|
||||
}
|
||||
|
||||
public static void LoadScore(ref List<SScores> Score, SPlayer player)
|
||||
public static void LoadScore(ref List<SScores> Scores, SPlayer player)
|
||||
{
|
||||
using (SQLiteConnection connection = new SQLiteConnection())
|
||||
{
|
||||
connection.ConnectionString = "Data Source=" + _HighscoreFilePath;
|
||||
|
||||
Score = new List<SScores>();
|
||||
Scores = new List<SScores>();
|
||||
|
||||
try
|
||||
{
|
||||
@@ -244,7 +244,7 @@ namespace Vocaluxe.Base
|
||||
score.LineNr = reader.GetInt32(4);
|
||||
score.ID = reader.GetInt32(5);
|
||||
|
||||
Score.Add(score);
|
||||
Scores.Add(score);
|
||||
}
|
||||
reader.Dispose();
|
||||
}
|
||||
|
||||
@@ -5,13 +5,13 @@ using System.Text;
|
||||
|
||||
namespace Vocaluxe.Base
|
||||
{
|
||||
class Log : IDisposable
|
||||
class LogFile : IDisposable
|
||||
{
|
||||
private readonly string _LogFileName;
|
||||
private readonly string _LogName;
|
||||
private StreamWriter _LogFile;
|
||||
|
||||
public Log(string FileName, string LogName)
|
||||
public LogFile(string FileName, string LogName)
|
||||
{
|
||||
_LogName = LogName;
|
||||
_LogFileName = FileName;
|
||||
@@ -67,9 +67,9 @@ namespace Vocaluxe.Base
|
||||
{
|
||||
private const int MAXBenchmarks = 10;
|
||||
|
||||
private static Log _ErrorLog;
|
||||
private static Log _PerformanceLog;
|
||||
private static Log _BenchmarkLog;
|
||||
private static LogFile _ErrorLog;
|
||||
private static LogFile _PerformanceLog;
|
||||
private static LogFile _BenchmarkLog;
|
||||
|
||||
private static int _NumErrors;
|
||||
private static Stopwatch[] _BenchmarkTimer;
|
||||
@@ -77,9 +77,9 @@ namespace Vocaluxe.Base
|
||||
|
||||
public static void Init()
|
||||
{
|
||||
_ErrorLog = new Log(CSettings.sFileErrorLog, "ErrorLog");
|
||||
_PerformanceLog = new Log(CSettings.sFilePerformanceLog, "PerformanceLog");
|
||||
_BenchmarkLog = new Log(CSettings.sFileBenchmarkLog, "BenchmarkLog");
|
||||
_ErrorLog = new LogFile(CSettings.sFileErrorLog, "ErrorLog");
|
||||
_PerformanceLog = new LogFile(CSettings.sFilePerformanceLog, "PerformanceLog");
|
||||
_BenchmarkLog = new LogFile(CSettings.sFileBenchmarkLog, "BenchmarkLog");
|
||||
|
||||
_NumErrors = 0;
|
||||
_BenchmarkTimer = new Stopwatch[MAXBenchmarks];
|
||||
|
||||
@@ -330,12 +330,12 @@ namespace Vocaluxe.Base
|
||||
if (files.Length == 0)
|
||||
return null;
|
||||
|
||||
CompilerParameters Params = new CompilerParameters();
|
||||
Params.ReferencedAssemblies.Add("System.Windows.Forms.dll");
|
||||
Params.ReferencedAssemblies.Add("VocaluxeLib.dll");
|
||||
Params.GenerateInMemory = true;
|
||||
CompilerParameters compilerParams = new CompilerParameters();
|
||||
compilerParams.ReferencedAssemblies.Add("System.Windows.Forms.dll");
|
||||
compilerParams.ReferencedAssemblies.Add("VocaluxeLib.dll");
|
||||
compilerParams.GenerateInMemory = true;
|
||||
#if DEBUG
|
||||
Params.IncludeDebugInformation = true;
|
||||
compilerParams.IncludeDebugInformation = true;
|
||||
#endif
|
||||
|
||||
using (CodeDomProvider CDP = CodeDomProvider.CreateProvider("CSharp"))
|
||||
@@ -344,7 +344,7 @@ namespace Vocaluxe.Base
|
||||
|
||||
try
|
||||
{
|
||||
CompileResult = CDP.CompileAssemblyFromFile(Params, files);
|
||||
CompileResult = CDP.CompileAssemblyFromFile(compilerParams, files);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
||||
@@ -148,12 +148,12 @@ namespace Vocaluxe.Lib.Input
|
||||
public static int ReadTimeout(IntPtr Device, out byte[] Data, int length, int milliseconds)
|
||||
{
|
||||
Data = new byte[length];
|
||||
IntPtr data = Marshal.AllocHGlobal(length);
|
||||
IntPtr dataPtr = Marshal.AllocHGlobal(length);
|
||||
|
||||
int result = -1;
|
||||
try
|
||||
{
|
||||
result = hid_read_timeout(Device, data, length, milliseconds);
|
||||
result = hid_read_timeout(Device, dataPtr, length, milliseconds);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -162,11 +162,11 @@ namespace Vocaluxe.Lib.Input
|
||||
}
|
||||
|
||||
if (result != -1)
|
||||
Marshal.Copy(data, Data, 0, result);
|
||||
Marshal.Copy(dataPtr, Data, 0, result);
|
||||
else
|
||||
Data = null;
|
||||
|
||||
Marshal.FreeHGlobal(data);
|
||||
Marshal.FreeHGlobal(dataPtr);
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -176,12 +176,12 @@ namespace Vocaluxe.Lib.Input
|
||||
public static int Read(IntPtr Device, out byte[] Data, int length)
|
||||
{
|
||||
Data = new byte[length];
|
||||
IntPtr data = Marshal.AllocHGlobal(length);
|
||||
IntPtr dataPtr = Marshal.AllocHGlobal(length);
|
||||
|
||||
int result = -1;
|
||||
try
|
||||
{
|
||||
result = hid_read(Device, data, length);
|
||||
result = hid_read(Device, dataPtr, length);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -190,11 +190,11 @@ namespace Vocaluxe.Lib.Input
|
||||
}
|
||||
|
||||
if (result != -1)
|
||||
Marshal.Copy(data, Data, 0, result);
|
||||
Marshal.Copy(dataPtr, Data, 0, result);
|
||||
else
|
||||
Data = null;
|
||||
|
||||
Marshal.FreeHGlobal(data);
|
||||
Marshal.FreeHGlobal(dataPtr);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@@ -250,7 +250,7 @@ namespace Vocaluxe.Lib.Sound
|
||||
{
|
||||
private volatile bool running;
|
||||
private readonly int bufferSize;
|
||||
private CaptureBuffer buffer;
|
||||
private CaptureBuffer CaptureBuffer;
|
||||
private CaptureBufferDescription bufferDescription;
|
||||
private DirectSoundCapture captureDevice;
|
||||
private readonly WaveFormat waveFormat;
|
||||
@@ -310,9 +310,9 @@ namespace Vocaluxe.Lib.Sound
|
||||
bufferDescription.Format = waveFormat;
|
||||
bufferDescription.WaveMapped = false;
|
||||
|
||||
buffer = new CaptureBuffer(captureDevice, bufferDescription);
|
||||
CaptureBuffer = new CaptureBuffer(captureDevice, bufferDescription);
|
||||
|
||||
bufferPortionSize = buffer.SizeInBytes / bufferPortionCount;
|
||||
bufferPortionSize = CaptureBuffer.SizeInBytes / bufferPortionCount;
|
||||
notifications = new List<NotificationPosition>();
|
||||
|
||||
for (int i = 0; i < bufferPortionCount; i++)
|
||||
@@ -323,13 +323,13 @@ namespace Vocaluxe.Lib.Sound
|
||||
notifications.Add(notification);
|
||||
}
|
||||
|
||||
buffer.SetNotificationPositions(notifications.ToArray());
|
||||
CaptureBuffer.SetNotificationPositions(notifications.ToArray());
|
||||
waitHandles = new WaitHandle[notifications.Count];
|
||||
|
||||
for (int i = 0; i < notifications.Count; i++)
|
||||
waitHandles[i] = notifications[i].Event;
|
||||
|
||||
captureThread = new Thread(CaptureThread);
|
||||
captureThread = new Thread(DoCapture);
|
||||
captureThread.IsBackground = true;
|
||||
|
||||
running = true;
|
||||
@@ -346,10 +346,10 @@ namespace Vocaluxe.Lib.Sound
|
||||
captureThread = null;
|
||||
}
|
||||
|
||||
if (buffer != null)
|
||||
if (CaptureBuffer != null)
|
||||
{
|
||||
buffer.Dispose();
|
||||
buffer = null;
|
||||
CaptureBuffer.Dispose();
|
||||
CaptureBuffer = null;
|
||||
}
|
||||
|
||||
if (notifications != null)
|
||||
@@ -368,7 +368,7 @@ namespace Vocaluxe.Lib.Sound
|
||||
Start();
|
||||
}
|
||||
|
||||
private void CaptureThread()
|
||||
private void DoCapture()
|
||||
{
|
||||
int bufferPortionSamples = bufferPortionSize / sizeof(byte);
|
||||
|
||||
@@ -376,13 +376,13 @@ namespace Vocaluxe.Lib.Sound
|
||||
byte[] bufferPortion = new byte[bufferPortionSamples];
|
||||
int bufferPortionIndex;
|
||||
|
||||
buffer.Start(true);
|
||||
CaptureBuffer.Start(true);
|
||||
|
||||
while (running)
|
||||
{
|
||||
bufferPortionIndex = WaitHandle.WaitAny(waitHandles);
|
||||
|
||||
buffer.Read(
|
||||
CaptureBuffer.Read(
|
||||
bufferPortion,
|
||||
0,
|
||||
bufferPortionSamples,
|
||||
@@ -391,7 +391,7 @@ namespace Vocaluxe.Lib.Sound
|
||||
SampleDataReady(this, new SampleDataEventArgs(bufferPortion, guid));
|
||||
}
|
||||
|
||||
buffer.Stop();
|
||||
CaptureBuffer.Stop();
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
|
||||
@@ -61,10 +61,10 @@ namespace Vocaluxe.Lib.Video
|
||||
|
||||
public bool GetFrame(int StreamID, ref STexture Frame, float Time, ref float VideoTime)
|
||||
{
|
||||
ManagedFrame frame = CGstreamerVideoWrapper.GetFrame(StreamID, Time);
|
||||
VideoTime = frame.Videotime;
|
||||
ManagedFrame managedFrame = CGstreamerVideoWrapper.GetFrame(StreamID, Time);
|
||||
VideoTime = managedFrame.Videotime;
|
||||
|
||||
UploadNewFrame(ref Frame, ref frame.buffer, frame.Width, frame.Height);
|
||||
UploadNewFrame(ref Frame, ref managedFrame.buffer, managedFrame.Width, managedFrame.Height);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -27,15 +27,15 @@ namespace Vocaluxe.Screens
|
||||
private const string ButtonToBackgroundVideo = "ButtonToBackgroundVideo";
|
||||
|
||||
private const string TextCurrentSong = "TextCurrentSong";
|
||||
private bool _VideoPreview;
|
||||
private bool _VideoPreviewInt;
|
||||
|
||||
private bool VideoPreview
|
||||
{
|
||||
get { return _VideoPreview; }
|
||||
get { return _VideoPreviewInt; }
|
||||
set
|
||||
{
|
||||
_VideoPreview = value;
|
||||
if (!_VideoPreview && !VideoBackground)
|
||||
_VideoPreviewInt = value;
|
||||
if (!_VideoPreviewInt && !VideoBackground)
|
||||
CBackgroundMusic.VideoEnabled = false;
|
||||
else
|
||||
CBackgroundMusic.VideoEnabled = true;
|
||||
@@ -52,7 +52,7 @@ namespace Vocaluxe.Screens
|
||||
if (CConfig.VideosToBackground == EOffOn.TR_CONFIG_ON)
|
||||
{
|
||||
CConfig.VideosToBackground = EOffOn.TR_CONFIG_OFF;
|
||||
if (!_VideoPreview)
|
||||
if (!_VideoPreviewInt)
|
||||
CBackgroundMusic.VideoEnabled = false;
|
||||
}
|
||||
}
|
||||
@@ -165,9 +165,9 @@ namespace Vocaluxe.Screens
|
||||
|
||||
public override bool UpdateGame()
|
||||
{
|
||||
Statics[StaticCover].Visible = !_VideoPreview || !CBackgroundMusic.SongHasVideo;
|
||||
Statics[StaticCover].Visible = !_VideoPreviewInt || !CBackgroundMusic.SongHasVideo;
|
||||
Buttons[ButtonToBackgroundVideo].Pressed = VideoBackground;
|
||||
Buttons[ButtonShowVideo].Pressed = _VideoPreview;
|
||||
Buttons[ButtonShowVideo].Pressed = _VideoPreviewInt;
|
||||
Buttons[ButtonRepeat].Pressed = CBackgroundMusic.RepeatSong;
|
||||
Buttons[ButtonSing].Visible = CBackgroundMusic.CanSing && CParty.CurrentPartyModeID == -1;
|
||||
return true;
|
||||
|
||||
@@ -463,9 +463,9 @@ namespace VocaluxeLib.Menu
|
||||
return new CStatic(_PartyModeID);
|
||||
}
|
||||
|
||||
public CStatic GetNewStatic(CStatic Static)
|
||||
public CStatic GetNewStatic(CStatic oldStatic)
|
||||
{
|
||||
return new CStatic(Static);
|
||||
return new CStatic(oldStatic);
|
||||
}
|
||||
|
||||
public CStatic GetNewStatic(STexture Texture, SColorF Color, SRectF Rect)
|
||||
@@ -1962,22 +1962,22 @@ namespace VocaluxeLib.Menu
|
||||
}
|
||||
}
|
||||
|
||||
private bool CheckVersion(int Version, CXMLReader xmlReader)
|
||||
private bool CheckVersion(int reqVersion, CXMLReader xmlReader)
|
||||
{
|
||||
int version = 0;
|
||||
xmlReader.TryGetIntValue("//root/" + ThemeName + "/ScreenVersion", ref version);
|
||||
int actualVersion = 0;
|
||||
xmlReader.TryGetIntValue("//root/" + ThemeName + "/ScreenVersion", ref actualVersion);
|
||||
|
||||
if (version == Version)
|
||||
if (actualVersion == reqVersion)
|
||||
return true;
|
||||
else
|
||||
{
|
||||
string msg = "Can't load screen file of screen \"" + ThemeName + "\", ";
|
||||
if (version < Version)
|
||||
if (actualVersion < reqVersion)
|
||||
msg += "the file ist outdated! ";
|
||||
else
|
||||
msg += "the file is for newer program versions! ";
|
||||
|
||||
msg += "Current screen version is " + Version.ToString();
|
||||
msg += "Current screen version is " + reqVersion.ToString();
|
||||
CBase.Log.LogError(msg);
|
||||
}
|
||||
return false;
|
||||
|
||||
+13
-13
@@ -810,17 +810,17 @@ namespace VocaluxeLib.Menu
|
||||
{
|
||||
private readonly SPlayer[,] _Rounds;
|
||||
|
||||
public CPoints(int NumRounds, SPlayer[] Player)
|
||||
public CPoints(int NumRounds, SPlayer[] Players)
|
||||
{
|
||||
_Rounds = new SPlayer[NumRounds,Player.Length];
|
||||
_Rounds = new SPlayer[NumRounds,Players.Length];
|
||||
|
||||
for (int round = 0; round < NumRounds; round++)
|
||||
{
|
||||
for (int player = 0; player < Player.Length; player++)
|
||||
for (int player = 0; player < Players.Length; player++)
|
||||
{
|
||||
_Rounds[round, player].ProfileID = Player[player].ProfileID;
|
||||
_Rounds[round, player].Name = Player[player].Name;
|
||||
_Rounds[round, player].Difficulty = Player[player].Difficulty;
|
||||
_Rounds[round, player].ProfileID = Players[player].ProfileID;
|
||||
_Rounds[round, player].Name = Players[player].Name;
|
||||
_Rounds[round, player].Difficulty = Players[player].Difficulty;
|
||||
_Rounds[round, player].Points = 0f;
|
||||
_Rounds[round, player].PointsGoldenNotes = 0f;
|
||||
_Rounds[round, player].PointsLineBonus = 0f;
|
||||
@@ -832,21 +832,21 @@ namespace VocaluxeLib.Menu
|
||||
}
|
||||
}
|
||||
|
||||
public void SetPoints(int Round, int SongID, SPlayer[] Player, bool Medley, bool Duet, bool ShortSong)
|
||||
public void SetPoints(int Round, int SongID, SPlayer[] Players, bool Medley, bool Duet, bool ShortSong)
|
||||
{
|
||||
long DateTicks = DateTime.Now.Ticks;
|
||||
for (int player = 0; player < Player.Length; player++)
|
||||
for (int player = 0; player < Players.Length; player++)
|
||||
{
|
||||
_Rounds[Round, player].SongID = SongID;
|
||||
_Rounds[Round, player].LineNr = Player[player].LineNr;
|
||||
_Rounds[Round, player].Points = Player[player].Points;
|
||||
_Rounds[Round, player].PointsGoldenNotes = Player[player].PointsGoldenNotes;
|
||||
_Rounds[Round, player].PointsLineBonus = Player[player].PointsLineBonus;
|
||||
_Rounds[Round, player].LineNr = Players[player].LineNr;
|
||||
_Rounds[Round, player].Points = Players[player].Points;
|
||||
_Rounds[Round, player].PointsGoldenNotes = Players[player].PointsGoldenNotes;
|
||||
_Rounds[Round, player].PointsLineBonus = Players[player].PointsLineBonus;
|
||||
_Rounds[Round, player].Medley = Medley;
|
||||
_Rounds[Round, player].Duet = Duet;
|
||||
_Rounds[Round, player].ShortSong = ShortSong;
|
||||
_Rounds[Round, player].DateTicks = DateTicks;
|
||||
_Rounds[Round, player].SongFinished = Player[player].SongFinished;
|
||||
_Rounds[Round, player].SongFinished = Players[player].SongFinished;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -674,7 +674,7 @@ namespace VocaluxeLib.Menu.SingNotes
|
||||
{
|
||||
int TonePlayer = CBase.Record.GetToneAbs(_PlayerNotes[n].PlayerNr);
|
||||
|
||||
SRectF Rect = _PlayerNotes[n].Rect;
|
||||
SRectF noteBounds = _PlayerNotes[n].Rect;
|
||||
|
||||
while (TonePlayer - BaseLine < 0)
|
||||
TonePlayer += 12;
|
||||
@@ -685,16 +685,16 @@ namespace VocaluxeLib.Menu.SingNotes
|
||||
if (XOffset < 0f)
|
||||
XOffset = 0f;
|
||||
|
||||
if (XOffset > Rect.W)
|
||||
XOffset = Rect.W;
|
||||
if (XOffset > noteBounds.W)
|
||||
XOffset = noteBounds.W;
|
||||
|
||||
float dy = Rect.H / CBase.Settings.GetNumNoteLines();
|
||||
SRectF rect = new SRectF(
|
||||
Rect.X - dy + XOffset,
|
||||
Rect.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f),
|
||||
float dy = noteBounds.H / CBase.Settings.GetNumNoteLines();
|
||||
SRectF drawRect = new SRectF(
|
||||
noteBounds.X - dy + XOffset,
|
||||
noteBounds.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f),
|
||||
dy,
|
||||
dy,
|
||||
Rect.Z
|
||||
noteBounds.Z
|
||||
);
|
||||
|
||||
SColorF color = new SColorF(
|
||||
@@ -704,7 +704,7 @@ namespace VocaluxeLib.Menu.SingNotes
|
||||
_PlayerNotes[n].Color.A * _PlayerNotes[n].Alpha);
|
||||
|
||||
STexture ToneHelper = CBase.Theme.GetSkinTexture(_Theme.SkinToneHelperName, _PartyModeID);
|
||||
CBase.Drawing.DrawTexture(ToneHelper, rect, color);
|
||||
CBase.Drawing.DrawTexture(ToneHelper, drawRect, color);
|
||||
|
||||
|
||||
while (TonePlayer - BaseLine < 12)
|
||||
@@ -713,15 +713,15 @@ namespace VocaluxeLib.Menu.SingNotes
|
||||
while (TonePlayer - BaseLine > 24)
|
||||
TonePlayer -= 12;
|
||||
|
||||
rect = new SRectF(
|
||||
Rect.X - dy + XOffset,
|
||||
Rect.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f),
|
||||
drawRect = new SRectF(
|
||||
noteBounds.X - dy + XOffset,
|
||||
noteBounds.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f),
|
||||
dy,
|
||||
dy,
|
||||
Rect.Z
|
||||
noteBounds.Z
|
||||
);
|
||||
|
||||
CBase.Drawing.DrawTexture(ToneHelper, rect, color);
|
||||
CBase.Drawing.DrawTexture(ToneHelper, drawRect, color);
|
||||
}
|
||||
|
||||
#region ThemeEdit
|
||||
|
||||
Reference in new issue
Block a user