Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loop combo fix #49

Merged
merged 5 commits into from
Sep 13, 2020
Merged

Loop combo fix #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ff7558
Merge pull request #3 from limyz/master
ericpignet Sep 6, 2020
8f1161b
Merge pull request #4 from limyz/master
ericpignet Sep 6, 2020
4f6c09e
Update FDK19.csproj
ericpignet Sep 7, 2020
f3f3e68
Merge pull request #5 from limyz/master
ericpignet Sep 12, 2020
4d25dab
Fix issue #48 : Game crashes is max combo is higher than total nb of …
ericpignet Sep 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DTXManiaProject/Code/Stage/07.Performance/CActPerfCommonCombo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ protected virtual void tDrawCombo_Drums(int nCombo値, int nジャンプイン
protected virtual void tDrawCombo_Guitar(int nCombo値, int nジャンプインデックス)
{
}
protected virtual void tDrawCombo_Base(int nCombo値, int nジャンプインデックス)
protected virtual void tDrawCombo_Bass(int nCombo値, int nジャンプインデックス)
{
}
protected void tDrawCombo_Guitar(int nCombo値, int nジャンプインデックス, int nコンボx, int nコンボy)
Expand Down Expand Up @@ -500,7 +500,7 @@ protected void tDrawCombo_Guitar(int nCombo値, int nジャンプインデック
#endregion
}
}
protected void tDrawCombo_Base(int nCombo値, int nジャンプインデックス, int nコンボx, int nコンボy)
protected void tDrawCombo_Bass(int nCombo値, int nジャンプインデックス, int nコンボx, int nコンボy)
{
#region [ 事前チェック。]
//-----------------
Expand Down Expand Up @@ -773,7 +773,7 @@ public override int OnUpdateAndDraw()
break;

case 2:
this.tDrawCombo_Base(this.status[i].nCOMBO値, this.status[i].nジャンプインデックス値);
this.tDrawCombo_Bass(this.status[i].nCOMBO値, this.status[i].nジャンプインデックス値);
break;
}
break;
Expand Down
4 changes: 2 additions & 2 deletions DTXManiaProject/Code/Stage/07.Performance/CStagePerfCommonScreen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1994,13 +1994,13 @@ protected void tHandleKeyInput()
else if (CDTXMania.Pad.bPressed(EKeyConfigPart.SYSTEM, EKeyConfigPad.SkipForward))
{
this.bIsTrainingMode = true;
Trace.TraceInformation("HOME CSoundManager.rcPerformanceTimer.nCurrentTime=" + CSoundManager.rcPerformanceTimer.nCurrentTime + ", CDTXMania.Timer.nCurrentTime=" + CDTXMania.Timer.nCurrentTime);
Trace.TraceInformation("SKIP FORWARD CSoundManager.rcPerformanceTimer.nCurrentTime=" + CSoundManager.rcPerformanceTimer.nCurrentTime + ", CDTXMania.Timer.nCurrentTime=" + CDTXMania.Timer.nCurrentTime);
this.tJumpInSong(CSoundManager.rcPerformanceTimer.nCurrentTime + CDTXMania.ConfigIni.nSkipTimeMs);
}
else if (CDTXMania.Pad.bPressed(EKeyConfigPart.SYSTEM, EKeyConfigPad.SkipBackward))
{
this.bIsTrainingMode = true;
Trace.TraceInformation("END CSoundManager.rcPerformanceTimer.nCurrentTime=" + CSoundManager.rcPerformanceTimer.nCurrentTime + ", CDTXMania.Timer.nCurrentTime=" + CDTXMania.Timer.nCurrentTime);
Trace.TraceInformation("SKIP BACKWARD CSoundManager.rcPerformanceTimer.nCurrentTime=" + CSoundManager.rcPerformanceTimer.nCurrentTime + ", CDTXMania.Timer.nCurrentTime=" + CDTXMania.Timer.nCurrentTime);
this.tJumpInSong(Math.Max(0, CSoundManager.rcPerformanceTimer.nCurrentTime - CDTXMania.ConfigIni.nSkipTimeMs));
}
else if (CDTXMania.Pad.bPressed(EKeyConfigPart.SYSTEM, EKeyConfigPad.LoopCreate))
Expand Down
2 changes: 1 addition & 1 deletion DTXManiaProject/Code/Stage/07.Performance/DrumsScreen/CActPerfDrumsComboDGB.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ protected override void tDrawCombo_Drums( int nCombo値, int nジャンプイン
}

}
protected override void tDrawCombo_Base( int nCombo値, int nジャンプインデックス )
protected override void tDrawCombo_Bass( int nCombo値, int nジャンプインデックス )
{
}
}
Expand Down
14 changes: 8 additions & 6 deletions DTXManiaProject/Code/Stage/07.Performance/DrumsScreen/CStagePerfDrumsScreen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,13 +503,15 @@ public override int OnUpdateAndDraw()
{
Trace.TraceInformation("Reached end of loop");
this.tJumpInSong(this.LoopBeginMs == -1 ? 0 : this.LoopBeginMs);

//Reset hit counts and scores, so that the displayed score reflects the looped part only
CDTXMania.stagePerfDrumsScreen.nHitCount_ExclAuto[0].Perfect = 0;
CDTXMania.stagePerfDrumsScreen.nHitCount_ExclAuto[0].Great = 0;
CDTXMania.stagePerfDrumsScreen.nHitCount_ExclAuto[0].Good = 0;
CDTXMania.stagePerfDrumsScreen.nHitCount_ExclAuto[0].Poor = 0;
CDTXMania.stagePerfDrumsScreen.nHitCount_ExclAuto[0].Miss = 0;
CDTXMania.stagePerfDrumsScreen.actCombo.nCurrentCombo.HighestValue[0] = 0;
this.nHitCount_ExclAuto.Drums.Perfect = 0;
this.nHitCount_ExclAuto.Drums.Great = 0;
this.nHitCount_ExclAuto.Drums.Good = 0;
this.nHitCount_ExclAuto.Drums.Poor = 0;
this.nHitCount_ExclAuto.Drums.Miss = 0;
this.actCombo.nCurrentCombo.Drums = 0;
this.actCombo.nCurrentCombo.HighestValue.Drums = 0;
base.actScore.nCurrentTrueScore.Drums = 0;
}

Expand Down
4 changes: 2 additions & 2 deletions DTXManiaProject/Code/Stage/07.Performance/GuitarScreen/CActPerfGuitarCombo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ protected override void tDrawCombo_Guitar( int nCombo値, int nジャンプイ
protected override void tDrawCombo_Drums( int nCombo値, int nジャンプインデックス )
{
}
protected override void tDrawCombo_Base( int nCombo値, int nジャンプインデックス )
protected override void tDrawCombo_Bass( int nCombo値, int nジャンプインデックス )
{
int x = 845;
int y = 220;

base.tDrawCombo_Base(nCombo値, nジャンプインデックス, x, y);
base.tDrawCombo_Bass(nCombo値, nジャンプインデックス, x, y);
}
}
}
19 changes: 12 additions & 7 deletions DTXManiaProject/Code/Stage/07.Performance/GuitarScreen/CStagePerfGuitarScreen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,19 @@ public override int OnUpdateAndDraw()
{
Trace.TraceInformation("Reached end of loop");
this.tJumpInSong(this.LoopBeginMs == -1 ? 0 : this.LoopBeginMs);

//Reset hit counts and scores, so that the displayed score reflects the looped part only
CDTXMania.stagePerfGuitarScreen.nHitCount_ExclAuto[0].Perfect = 0;
CDTXMania.stagePerfGuitarScreen.nHitCount_ExclAuto[0].Great = 0;
CDTXMania.stagePerfGuitarScreen.nHitCount_ExclAuto[0].Good = 0;
CDTXMania.stagePerfGuitarScreen.nHitCount_ExclAuto[0].Poor = 0;
CDTXMania.stagePerfGuitarScreen.nHitCount_ExclAuto[0].Miss = 0;
CDTXMania.stagePerfGuitarScreen.actCombo.nCurrentCombo.HighestValue[0] = 0;
base.actScore.nCurrentTrueScore.Drums = 0;
for (int inst = 1; inst < 3; ++inst)
{
this.nHitCount_ExclAuto[inst].Perfect = 0;
this.nHitCount_ExclAuto[inst].Great = 0;
this.nHitCount_ExclAuto[inst].Good = 0;
this.nHitCount_ExclAuto[inst].Poor = 0;
this.nHitCount_ExclAuto[inst].Miss = 0;
this.actCombo.nCurrentCombo[inst] = 0;
this.actCombo.nCurrentCombo.HighestValue[inst] = 0;
base.actScore.nCurrentTrueScore[inst] = 0;
}
}

// キー入力
Expand Down
4 changes: 2 additions & 2 deletions FDK17Project/FDK19.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -165,4 +165,4 @@
<PostBuildEvent>copy /Y "$(TargetPath)" "$(SolutionDir)..\実行時フォルダ"
copy /Y "$(TargetPath)" "$(SolutionDir)..\実行時フォルダ(DTXCreator)"</PostBuildEvent>
</PropertyGroup>
</Project>
</Project>