Skip to content

Commit

Permalink
0.6.0.24 - Remove broken DTX legacy beatline chips processing (0x51) (#…
Browse files Browse the repository at this point in the history
…758)

- Remove broken DTX legacy beatline chips processing (0x51)
  • Loading branch information
IepIweidieng authored Dec 4, 2024
1 parent f209624 commit 043ad6a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 34 deletions.
29 changes: 2 additions & 27 deletions OpenTaiko/src/Songs/CTja.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1388,7 +1388,7 @@ public void t入力_全入力文字列から(string str全入力文字列, strin
startIndex++; // 1つ小さく過ぎているので、戻す
}
for (int j = startIndex; j <= i; j++) {
if (((this.listChip[j].nChannelNo == 0x50) || (this.listChip[j].nChannelNo == 0x51)) &&
if ((this.listChip[j].nChannelNo == 0x50) &&
(this.listChip[j].n整数値 == (36 * 36 - 1))) {
this.listChip[j].bVisible = bShowBeatBarLine;
}
Expand All @@ -1408,7 +1408,7 @@ public void t入力_全入力文字列から(string str全入力文字列, strin
int BGM番号 = 0;

foreach (CChip chip in this.listChip) {
if (chip.nChannelNo == 0x02) { } else if (chip.nChannelNo == 0x01) { } else if (chip.nChannelNo == 0x08) { } else if (chip.nChannelNo >= 0x11 && chip.nChannelNo <= 0x1F) { } else if (chip.nChannelNo == 0x50) { } else if (chip.nChannelNo == 0x51) { } else if (chip.nChannelNo == 0x54) { } else if (chip.nChannelNo == 0x08) { } else if (chip.nChannelNo == 0xF1) { } else if (chip.nChannelNo == 0xF2) { } else if (chip.nChannelNo == 0xFF) { } else if (chip.nChannelNo == 0xDD) { chip.n発声時刻ms = ms + ((int)(((625 * (chip.n発声位置 - n発声位置)) * this.dbBarLength) / bpm)); } else if (chip.nChannelNo == 0xDF) { chip.n発声時刻ms = ms + ((int)(((625 * (chip.n発声位置 - n発声位置)) * this.dbBarLength) / bpm)); } else if (chip.nChannelNo < 0x93)
if (chip.nChannelNo == 0x02) { } else if (chip.nChannelNo == 0x01) { } else if (chip.nChannelNo == 0x08) { } else if (chip.nChannelNo >= 0x11 && chip.nChannelNo <= 0x1F) { } else if (chip.nChannelNo == 0x50) { } else if (chip.nChannelNo == 0x54) { } else if (chip.nChannelNo == 0x08) { } else if (chip.nChannelNo == 0xF1) { } else if (chip.nChannelNo == 0xF2) { } else if (chip.nChannelNo == 0xFF) { } else if (chip.nChannelNo == 0xDD) { chip.n発声時刻ms = ms + ((int)(((625 * (chip.n発声位置 - n発声位置)) * this.dbBarLength) / bpm)); } else if (chip.nChannelNo == 0xDF) { chip.n発声時刻ms = ms + ((int)(((625 * (chip.n発声位置 - n発声位置)) * this.dbBarLength) / bpm)); } else if (chip.nChannelNo < 0x93)
chip.n発声時刻ms = ms + ((int)(((625 * (chip.n発声位置 - n発声位置)) * this.dbBarLength) / bpm));
else if ((chip.nChannelNo > 0x9F && chip.nChannelNo < 0xA0) || (chip.nChannelNo >= 0xF0 && chip.nChannelNo < 0xFE))
chip.n発声時刻ms = ms + ((int)(((625 * (chip.n発声位置 - n発声位置)) * this.dbBarLength) / bpm));
Expand Down Expand Up @@ -4849,31 +4849,6 @@ private void t入力_行解析譜面_V4(string InputText) {

this.dbLastTime = this.dbNowTime;
this.b小節線を挿入している = true;

#region[ 拍線チップテスト ]
//1拍の時間を計算
double db1拍 = (60.0 / this.dbNowBPM) / 4.0;
//forループ(拍数)
for (int measure = 1; measure < this.fNow_Measure_s; measure++) {
CChip hakusen = new CChip();
hakusen.n発声位置 = ((this.n現在の小節数) * 384);
hakusen.n発声時刻ms = (int)(this.dbNowTime + (((db1拍 * 4.0)) * measure) * 1000.0);
hakusen.nChannelNo = 0x51;
hakusen.fBMSCROLLTime = this.dbNowBMScollTime;
hakusen.n整数値_内部番号 = this.n現在の小節数;
hakusen.n整数値 = 0;
hakusen.dbBPM = this.dbNowBPM;
hakusen.dbSCROLL = this.dbNowScroll;
hakusen.fNow_Measure_m = this.fNow_Measure_m;
hakusen.fNow_Measure_s = this.fNow_Measure_s;
hakusen.dbSCROLL_Y = this.dbNowScrollY;
hakusen.nBranch = n現在のコース;
hakusen.eScrollMode = eScrollMode;
this.listChip.Add(hakusen);
}

#endregion

}

for (int n = 0; n < InputText.Length; n++) {
Expand Down
7 changes: 0 additions & 7 deletions OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3187,13 +3187,6 @@ protected bool t進行描画_チップ(EInstrumentPad ePlayMode, int nPlayer) {
break;
}
#endregion
#region [ 51: 拍線 ]
case 0x51: // 拍線
if (!pChip.bHit && time < 0) {
pChip.bHit = true;
}
break;
#endregion
#region [ 54: 動画再生 ]
case 0x54: // 動画再生
if (!pChip.bHit && time < 0) {
Expand Down

0 comments on commit 043ad6a

Please sign in to comment.