OSDN > Find Software > Games/Entertainment > Role-Playing > 変愚蛮怒 > SCM > git > hengband > Commit

変愚蛮怒
Fork
hengband
web

hengband: Commit

変愚蛮怒のメインリポジトリです

Setting music definition for BGM playing.

--- a/src/birth.c

+++ b/src/birth.c

		@@ -6548,6 +6548,8 @@ void player_birth(void)
6548	6548	/* Quick start? */
6549	6549	if (!ask_quick_start())
6550	6550	{
	6551	+ music_basic(MUSIC_BASIC_DEFAULT);
	6552	+
6551	6553	/* No, normal start */
6552	6554	while (1)
6553	6555	{

--- a/src/effects.c

+++ b/src/effects.c

		@@ -5373,6 +5373,8 @@ int take_hit(int damage_type, int damage, cptr hit_from, int monspell)
5373	5373	bool seppuku = streq(hit_from, "Seppuku");
5374	5374	bool winning_seppuku = p_ptr->total_winner && seppuku;
5375	5375
	5376	+ music_basic(MUSIC_BASIC_GAMEOVER);
	5377	+
5376	5378	#ifdef WORLD_SCORE
5377	5379	/* Make screen dump */
5378	5380	screen_dump = make_screen_dump();

--- a/src/externs.h

+++ b/src/externs.h

		@@ -1331,7 +1331,7 @@ extern errr fd_write(int fd, cptr buf, huge n);
1331	1331	extern errr fd_close(int fd);
1332	1332	extern void flush(void);
1333	1333	extern void bell(void);
1334		-extern void music(int num);
	1334	+extern void music_basic(int num);
1335	1335	extern void select_floor_music(void);
1336	1336	extern void sound(int num);
1337	1337	extern void move_cursor(int row, int col);

--- a/src/main-win.c

+++ b/src/main-win.c

		@@ -2465,8 +2465,10 @@ static errr Term_xtra_win_music(int v)
2465	2465
2466	2466	#ifdef WIN32
2467	2467
2468		- mop.lpstrDeviceType = "WaveAudio";
	2468	+ mop.lpstrDeviceType = "MPEGVideo";
	2469	+ //mop.lpstrDeviceType = "WaveAudio";
2469	2470	mop.lpstrElementName = buf;
	2471	+ mciSendCommand(mop.wDeviceID, MCI_STOP, 0, 0);
2470	2472	mciSendCommand(mop.wDeviceID, MCI_OPEN, MCI_OPEN_TYPE \| MCI_OPEN_ELEMENT, (DWORD)&mop);
2471	2473	mciSendCommand(mop.wDeviceID, MCI_SEEK, MCI_SEEK_TO_START, 0);
2472	2474	mciSendCommand(mop.wDeviceID, MCI_PLAY, MCI_NOTIFY, (DWORD)&mop);

		@@ -2533,7 +2535,7 @@ static errr Term_xtra_win(int n, int v)
2533	2535	}
2534	2536
2535	2537	/* Play a music */
2536		- case TERM_XTRA_MUSIC:
	2538	+ case TERM_XTRA_MUSIC_BASIC:
2537	2539	{
2538	2540	return (Term_xtra_win_music(v));
2539	2541	}

--- a/src/util.c

+++ b/src/util.c

		@@ -1711,13 +1711,13 @@ void sound(int val)
1711	1711	/*
1712	1712	* Hack -- Play a music
1713	1713	*/
1714		-void music(int val)
	1714	+void music_basic(int val)
1715	1715	{
1716	1716	/* No sound */
1717	1717	if (!use_music) return;
1718	1718
1719	1719	/* Make a sound (if allowed) */
1720		- Term_xtra(TERM_XTRA_MUSIC, val);
	1720	+ Term_xtra(TERM_XTRA_MUSIC_BASIC, val);
1721	1721	}
1722	1722
1723	1723	/*

		@@ -1728,8 +1728,12 @@ void select_floor_music()
1728	1728	/* No sound */
1729	1729	if (!use_music) return;
1730	1730
	1731	+ if(dun_level < 40) music_basic(MUSIC_BASIC_DUN_LOW);
	1732	+ else if(dun_level < 80) music_basic(MUSIC_BASIC_DUN_MED);
	1733	+ else music_basic(MUSIC_BASIC_DUN_HIGH);
	1734	+
1731	1735	/* Make a sound (if allowed) */
1732		- //TODO Term_xtra(TERM_XTRA_MUSIC, val);
	1736	+ //TODO Term_xtra(TERM_XTRA_MUSIC_BASIC, val);
1733	1737	}
1734	1738
1735	1739

--- a/src/z-term.h

+++ b/src/z-term.h

		@@ -261,7 +261,10 @@ struct term
261	261	#define TERM_XTRA_ALIVE 11 /* Change the "hard" level (optional) */
262	262	#define TERM_XTRA_LEVEL 12 /* Change the "soft" level (optional) */
263	263	#define TERM_XTRA_DELAY 13 /* Delay some milliseconds (optional) */
264		-#define TERM_XTRA_MUSIC 14 /* Play a music (optional) */
	264	+#define TERM_XTRA_MUSIC_BASIC 14 /* Play a music(basic) (optional) */
	265	+#define TERM_XTRA_MUSIC_DUNGEON 15 /* Play a music(dungeon) (optional) */
	266	+#define TERM_XTRA_MUSIC_QUEST 16 /* Play a music(quest) (optional) */
	267	+#define TERM_XTRA_MUSIC_TOWN 17 /* Play a music(floor) (optional) */
265	268
266	269
267	270	/** Available Variables **/