Merge pull request #21 from onitama/Update2023Dec

Update MUCOM88 Windows to 0.56
onitama · Dec 26, 2023 · 775d6d7 · 775d6d7
2 parents cf4e650 + 6fbbb7b
commit 775d6d7
Show file tree

Hide file tree

Showing 18 changed files with 483 additions and 441 deletions.
diff --git a/hspplugin/en.strmap b/hspplugin/en.strmap
@@ -225,6 +225,8 @@ Change...
 Color...
 &&&&dsmap:16,3431,12601
 Background...
+&&&&dsmap:23,4108,19363
+Explore MUCOM88 information on the Web
 &&&&dsmap:7,4203,4319
 Share
 &&&&dsmap:40,4210,36403

diff --git a/hspplugin/hspmucom.as b/hspplugin/hspmucom.as
@@ -38,6 +38,7 @@
 #func mucomrecord mucomrecord $202
 #func mucomplg_init mucomplg_init $202
 #func mucomplg_notice mucomplg_notice $202
+#func mucomplg_delete mucomplg_delete $202
 
 #func mucomedit_reset mucomedit_reset $202
 #func mucomedit_setfile mucomedit_setfile $202

diff --git a/hspplugin/hspmucom.cpp b/hspplugin/hspmucom.cpp
@@ -479,6 +479,23 @@ EXPORT BOOL WINAPI mucomplg_init(HSPEXINFO *hei, int p1, int p2, int p3)
 }
 
 
+EXPORT BOOL WINAPI mucomplg_delete(HSPEXINFO* hei, int p1, int p2, int p3)
+{
+	//	DLL mucomplg_delete "filename" (type$202)
+	//	MUCOM88プラグインの削除
+	//
+	int res;
+	char* p;
+	p = hei->HspFunc_prm_gets();		// パラメータ1:文字列
+
+	if (mucom) {
+		res = mucom->DeletePlugins(p);
+		if (res) return -1;
+	}
+	return 0;
+}
+
+
 EXPORT BOOL WINAPI mucomplg_notice(HSPEXINFO *hei, int p1, int p2, int p3)
 {
 	//	DLL mucomplg_notice p1,p2,p3 (type$202)

diff --git a/hspplugin/hspmucom.dll b/hspplugin/hspmucom.dll
diff --git a/hspplugin/mucom88win.hsp b/hspplugin/mucom88win.hsp
@@ -26,15 +26,18 @@
 
 ;#define EDITOR_DEBUG
 
-#const VER_NUMBER 55
-#define APP_VER "0.55"
+#const VER_NUMBER 56
+#define APP_VER "0.56"
 
 #define EDITOR_TITLE "MUCOM88"
 
 #define TEMPMML "mucommml"
 #define TEMPBIN "mucombin"
 #define STRMAP_EN "en.strmap"
 
+#define FMEDITOR_DLL "muplug_fmeditor.dll"
+
+
 	randomize
 	goto *boot
 
@@ -105,7 +108,7 @@
 	welcome_mes+="#Z80 emulation by Yasuo Kuwahara 2002-2018(C)\n"
 	welcome_mes+="#FM Sound Generator by cisc 1998, 2003(C)\n"
 	welcome_mes+="#SCCI system / adpcm converter by gasshi 2018(C)\n"
-	welcome_mes+="#Windows version by ONION software/onitama 2018-2021(C)\n"
+	welcome_mes+="#Windows version by ONION software/onitama 2018-2024(C)\n"
 
 	buf=welcome_mes
 	compflag=0
@@ -125,7 +128,7 @@
 	}
 
 	if plg_fmedit {
-		s1="muplug_fmeditor.dll"
+		s1=FMEDITOR_DLL
 		mucomplg_init s1
 		if stat : dialog "Missing plugin ["+s1+"]"
 		toolsw = 1
@@ -1008,28 +1011,11 @@
 	goto *main_menu
 
 *menu_web
-	;menu_str="Web"
-	pos sx,0
-	axobj ie, "Shell.Explorer.2",wx-sx,wy-80
-	comevent ie_event, ie, "{34A715A0-6587-11D0-924A-0020AFC7AC4D}",*webevent  ; DIID_DWebBrowserEvents2     
-
-	if langset=0 {
-		ie->"Navigate" "file://"+dir_exe+"\\index.html"
-	} else {
-		ie->"Navigate" "file://"+dir_exe+"\\index_en.html"
-	}
-	return
-*webevent
-	;	COM�C�x���g����
-	dispid = comevdisp(ie_event)
-	if dispid = DISPID_NAVIGATECOMPLETE2 : gosub *OnNavigateComplete2
-	return
-
-*OnNavigateComplete2
-	name = ie("LocationURL")
-	pDoc = ie("Document")
-	name = pDoc("Title")
-	delcom pDoc
+	menu_str="Web"
+	mes "MUCOM88����WEB�ŒT��"
+	sysfont 17
+	mes "\n"
+	exec "https://github.com/onitama/mucom88/wiki",16
 	return
 
 *menu_share
@@ -1278,6 +1264,7 @@
 *m_play
 	;	PLAY
 	if compflag {
+		gosub *fmedit_check
 		mucomplay 0
 		curplay=1
 	}
@@ -1660,6 +1647,15 @@
 	exec dir_exe+"\\aplayer.exe"
 	goto *main2
 
+*fmedit_check
+	;	FM�G�f�B�^�Ƃ̘A�g���`�F�b�N����
+	;	(FM�G�f�B�^�����ɏI������Ă�����A�g���~����)
+	if plg_fmedit=0 : return
+	aplsel "FmToneEditor(Mucom"
+	if stat=0 : return			; �A�g��
+	mucomplg_delete FMEDITOR_DLL
+	return
+
 	;---------------------------------------------------------------------------
 
 #deffunc toolshow int _p1