Skip to content

Commit

Permalink
TAG183 2022/07/04
Browse files Browse the repository at this point in the history
  Compiler
    未対応のドライバーが指定されたとき強制的にDotNETに変更しコンパイルするよう修正
  • Loading branch information
kumatan committed Jul 5, 2022
1 parent 1192027 commit 64066b3
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 0 deletions.
Binary file modified Player64/lib/MDSound.dll
Binary file not shown.
1 change: 1 addition & 0 deletions mucomDotNETCompiler/lang/mucomDotNETmessage.ja-JP.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ W0413=!!注意!! timer-Bの設定値に253以上255以下の値を設定して
W0414=ポルタメントで、クロック129以上が指定されています。(値:{0})
W0415='p'パンコマンドで、値1(リズムの場合は上位4bit)が1-3の場合はwait値は不要です。(値1:{0})
W0416=']'で使用できる値の範囲(0-255)を超えました。(値1:{0})
W0417=未対応のドライバ({0})が指定されました。強制的にDriverをDotNETに変更しコンパイルします。
E0400=未定義のマクロを呼び出そうとしています。
E0401=マクロ行から復帰できませんでした。(アドレスオーバー)
E0402=マクロ行から復帰できませんでした。(アドレス未定義)
Expand Down
1 change: 1 addition & 0 deletions mucomDotNETCompiler/lang/mucomDotNETmessage.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ W0413=!!Caution!! The timer-B setting value is 253 to 255 or less. (Driver hang
W0414=Portamento specifies a clock of 129 or higher. (Value:{0})
W0415=If the value1 (upper 4 bits for rhythm) is 1-3 with the 'p' pan command, no wait value is required.(value:{0})
W0416=']' command value range is exceeding $01~$ff.(Value:{0})
W0417=An unsupported driver ({0}) was specified. Compile by forcibly changing Driver to DotNET.
E0400=Trying to call undefined macro!
E0401=Unable to return from macro line.(Address Exceeded)
E0402=Unable to return from macro line.(Address Undefined)
Expand Down
8 changes: 8 additions & 0 deletions mucomDotNETCompiler/muc88.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4066,6 +4066,7 @@ internal int COMPIL()
work.currentPartType = "FM";

INIT();

if (work.LINCFG != 0)
{
return COMPI3();
Expand Down Expand Up @@ -4813,6 +4814,13 @@ public void INIT()
{
work.pcmInvert = true;
}

if (mucInfo.DriverType != MUCInfo.enmDriverType.normal && mucInfo.DriverType != MUCInfo.enmDriverType.DotNet)
{
WriteWarning(string.Format(msg.get("W0417"), mucInfo.DriverType.ToString()), mucInfo.row, mucInfo.col);
mucInfo.DriverType = MUCInfo.enmDriverType.DotNet;
}

work.quantize = 0;//KUMA: ポルタメントむけq値保存
work.rhythmRelMode = false;

Expand Down
Binary file modified mucomDotNETPlayer/lib/MDSound.dll
Binary file not shown.

0 comments on commit 64066b3

Please sign in to comment.