Skip to content

Commit

Permalink
TAG004 2020/05/02 3rd
Browse files Browse the repository at this point in the history
  Compiler
    ・FFファイルが読み込めないとき警告がでるように修正
  • Loading branch information
kumatan committed May 2, 2020
1 parent 0995b73 commit 5053305
Show file tree
Hide file tree
Showing 5 changed files with 158 additions and 12 deletions.
4 changes: 4 additions & 0 deletions CHANGE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
�X�V����

TAG004 2020/05/02 3rd
Compiler
�EFF�t�@�C�����ǂݍ��߂Ȃ��Ƃ��x�����ł�悤�ɏC��

TAG003 2020/05/02 2nd
Compiler
�EFF�t�@�C�����ǂݍ��߂Ȃ��Ă��R���p�C�����i�ނ悤�ɏC��
Expand Down
11 changes: 6 additions & 5 deletions PMDDotNETCompiler/mc.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1821,16 +1821,17 @@ private void read_fffile()
}
catch
{
if (voice_seg.voice_buf == null) voice_seg.voice_buf = new byte[8192];
print_mes(mml_seg.warning_mes);
print_mes(mml_seg.ff_readerr_mes);
return;
}

if (voice_seg.voice_buf == null)
{
voice_seg.voice_buf = new byte[8192];
print_mes(mml_seg.warning_mes + mml_seg.ff_readerr_mes);
}

#if !hyouka
mml_seg.prg_flg |= 1;
#endif
if (voice_seg.voice_buf == null) voice_seg.voice_buf = new byte[8192];
}


Expand Down
12 changes: 6 additions & 6 deletions PMDDotNETCompiler/mml_seg.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ public class mml_seg
//;==============================================================================
//; Work Area
//;==============================================================================
public string warning_mes = "Warning " + mc.eof;
public string not_ff_mes = ": 音色ファイル名が指定されていません." + mc.cr + mc.lf + mc.eof;
public string ff_readerr_mes = ": 音色ファイルが読み込めません." + mc.cr + mc.lf + mc.eof;
public string not_pmd_mes = ": PMDが常駐していません." + mc.cr + mc.lf + mc.eof;
public string loop_err_mes = " : ループ終了記号 ] が足りません。" + mc.cr + mc.lf + mc.eof;
public string mcopt_err_mes = ": 環境変数 MCOPT の記述に誤りがあります。" + (char)13 + (char)10 + mc.eof;
public string warning_mes = "Warning ";
public string not_ff_mes = ": 音色ファイル名が指定されていません.";
public string ff_readerr_mes = ": 音色ファイルが読み込めません.";
public string not_pmd_mes = ": PMDが常駐していません.";
public string loop_err_mes = " : ループ終了記号 ] が足りません。";
public string mcopt_err_mes = ": 環境変数 MCOPT の記述に誤りがあります。";

#if efc
public string usames = "Usage: EFC [/option] filename[.EML] [filename[.FF]]" + mc.cr + mc.lf + mc.cr + mc.lf
Expand Down
2 changes: 1 addition & 1 deletion PMDDotNETConsole/Properties/launchSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"profiles": {
"PMDDotNETConsole": {
"commandName": "Project",
"commandLineArgs": "/v C:\\Users\\kuma\\Desktop\\pmd\\work.mml C:\\Users\\kuma\\Desktop\\pmd\\v5.ff"
"commandLineArgs": "/v C:\\Users\\kuma\\Desktop\\pmd\\work.mml "
}
}
}
141 changes: 141 additions & 0 deletions PMDDotNETDriver/PW.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,146 @@ public class PW
public int vsync = 0;//1の時VSyncを止める
public string resmes = "PMD ver." + ver;

public int pmdvector = 0x60;//PMD用の割り込みベクトル
public int ppsdrv = 0x64;//ppsdrvの割り込みベクトル
public int ppz_vec = 0x7f;//ppz8の割り込みベクトル



//;==============================================================================
//; MS-DOSコールのマクロ
//;==============================================================================

private void resident_exit()
{
//特に何もしない
}

private void resident_cut()
{
//特に何もしない
}

//get_psp macro
// mov ah,51h
// int 21h
// endm

//msdos_exit macro
// mov ax,4c00h
// int 21h
// endm

//error_exit macro qq
// mov ax,4c00h+qq
// int 21h
// endm

//print_mes macro qq
// if va
// push si
// lea si,qq
// mov dh,80h
// mov ah,02h
// int 83h
// pop si
// else
// mov dx, offset qq
// mov ah,09h
// int 21h
// endif
// endm

//print_dx macro
// if va
// push si
// mov si,dx
// mov dh,80h
// mov ah,02h
// int 83h
// pop si
// else
// mov ah,09h
// int 21h
// endif
// endm

//debug macro qq
// push es
// push ax
// mov ax,0a000h
// mov es,ax
// inc byte ptr es:[qq*2]
// pop ax
// pop es
// endm

//debug2 macro q1, q2
// push es
// push ax
// mov ax,0a000h
// mov es,ax
// mov byte ptr es:[q1*2],q2
//pop ax
//pop es
//endm

//debug_pcm macro qq
//local zzzz
// push ax
// push dx
// mov dx,0a468h
// in al,dx
// test al,10h
// jz zzzz
// debug qq
//zzzz: pop dx
// pop ax
// endm

//_wait macro
// mov cx,[wait_clock]
// loop $
// endm

//_waitP macro
// push cx
// mov cx,[wait_clock]
// loop $
// pop cx
// endm

//_rwait macro ;リズム連続出力用wait
// push cx
// mov cx,[wait_clock]
// add cx, cx
// add cx, cx
// add cx, cx
// add cx, cx
// add cx, cx; x32
//loop $
// pop cx
// endm

//rdychk macro ;Address out時用 break:ax
//local loop
// in al,dx ;無駄読み
//loop: in al,dx
// test al,al
// js loop
// endm

//_ppz macro
//local exit
//if ppz
// cmp[ppz_call_seg],2
// jc exit
// call dword ptr[ppz_call_ofs]
//exit:
//endif
// endm



}
}

0 comments on commit 5053305

Please sign in to comment.