TAG003 2020/03/26

core ・Cコマンドの初期値を128に修正・Cコマンドが一つ目の音符の前に指定されている時、その値が有効にならないバグを修正
kuma4649 · Mar 26, 2020 · 1e4aa8d · 1e4aa8d
1 parent 3992e01
commit 1e4aa8d
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 5 deletions.
diff --git a/CHANGE.txt b/CHANGE.txt
@@ -1,4 +1,9 @@
 �X�V����
+TAG003 2020/03/26
+  core
+  �EC�R�}���h�̏����l��128�ɏC��
+  �EC�R�}���h����ڂ̉����̑O�Ɏw�肳��Ă��鎞�A���̒l���L���ɂȂ�Ȃ��o�O���C��
+
 TAG002 2020/03/22
   core
   �Epgrp�ǉ�

diff --git a/M98/M98DotNETconsole.csproj.user b/M98/M98DotNETconsole.csproj.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>"C:\temp\ssgtest.muc" "C:\temp\ssgtest.out.muc"</StartArguments>
+    <StartArguments>"C:\temp\kichigai_0.muc" "C:\temp\kichigai_0.out.muc"</StartArguments>
   </PropertyGroup>
 </Project>
diff --git a/M98/bin/Debug/M98DotNETcore.dll b/M98/bin/Debug/M98DotNETcore.dll
diff --git a/M98/bin/Debug/M98DotNETcore.pdb b/M98/bin/Debug/M98DotNETcore.pdb
diff --git a/M98/bin/Release/musicDriverInterface.dll b/M98/bin/Release/musicDriverInterface.dll
diff --git a/M98/obj/Debug/M98DotNETconsole.csprojAssemblyReference.cache b/M98/obj/Debug/M98DotNETconsole.csprojAssemblyReference.cache
diff --git a/M98/obj/Release/M98DotNETconsole.csprojAssemblyReference.cache b/M98/obj/Release/M98DotNETconsole.csprojAssemblyReference.cache
diff --git a/M98DotNETcore/M98.cs b/M98DotNETcore/M98.cs
@@ -893,7 +893,8 @@ private int schtone(string adr, int adrPtr, int tnm)
 							break;
 						case 'C':
 							adrPtr++;
-							gWork.wk.clk = getpara(adr, ref adrPtr);
+							clk = getpara(adr, ref adrPtr);
+							gWork.wk.clk = clk;
 							break;
 						case 'o':
 							adrPtr++;
@@ -2580,7 +2581,7 @@ private void newrpan(int i)
 		{
 			int pan1;
 			int pan2;
-			int clk = Math.Max(Math.Min(gWork.wk.clk, 255), 1);
+			int clk = 255;// Math.Max(Math.Min(gWork.wk.clk, 255), 1);
 
 			if (i != 0 && gWork.rp.c_pan != 0)
 			{
@@ -2607,7 +2608,7 @@ private void newrpan(int i)
 			}
 
 			pan1 = rndfil(6) + 1;// 1 ～ 6
-			pan2 = (pan1 > 3 && pan1 < 7) ? (rndfil(clk - 1) + 1) : DEF.EMPTY;
+			pan2 = (pan1 > 3 && pan1 < 7) ? (rndfil(clk - 1) + 1) : DEF.EMPTY;//1～255
 			gWork.cpyt[i].putpan(0, pan1);
 			gWork.cpyt[i].putpan(1, pan2);
 			gWork.rp.s_rep();

diff --git a/M98DotNETcore/bin/Debug/netstandard2.0/M98DotNETcore.dll b/M98DotNETcore/bin/Debug/netstandard2.0/M98DotNETcore.dll
diff --git a/M98DotNETcore/bin/Debug/netstandard2.0/M98DotNETcore.pdb b/M98DotNETcore/bin/Debug/netstandard2.0/M98DotNETcore.pdb
diff --git a/M98DotNETcore/bin/Release/netstandard2.0/musicDriverInterface.dll b/M98DotNETcore/bin/Release/netstandard2.0/musicDriverInterface.dll
diff --git a/M98DotNETcore/compw.cs b/M98DotNETcore/compw.cs
@@ -39,7 +39,7 @@ public void initcwk()
             nte = 0;
             oct = 4;
             len = 6;
-            clk = 96;
+            clk = 128;
             msl = 255;
             qtz = DEF.EMPTY;
             vol = DEF.EMPTY;

diff --git a/M98DotNETcore/obj/Debug/netstandard2.0/M98DotNETcore.dll b/M98DotNETcore/obj/Debug/netstandard2.0/M98DotNETcore.dll
diff --git a/M98DotNETcore/obj/Debug/netstandard2.0/M98DotNETcore.pdb b/M98DotNETcore/obj/Debug/netstandard2.0/M98DotNETcore.pdb