• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revisionbf5634697b45c2b416819e1e2ac89e14e42a6a7a (tree)
Time2014-02-27 23:59:27
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

Fix preprocessor error about music implementation and music.cfg.

Change Summary

Incremental Difference

--- a/lib/xtra/music/music.cfg
+++ b/lib/xtra/music/music.cfg
@@ -8,5 +8,8 @@
88 # Example:
99 # hit = hit.wav hit1.wav
1010
11-[BGM]
11+[Device]
12+type = MPEGVideo
1213
14+[Basic]
15+town =
--- a/src/angband.rc
+++ b/src/angband.rc
@@ -126,7 +126,7 @@ ANGBAND MENU
126126 MENUITEM "新タイル", 403
127127 MENUITEM "タイルを2倍幅で表示", 409
128128 }
129- MENUITEM "BGM(未実装)(&M)", 411
129+ MENUITEM "BGM(&M)", 411
130130 MENUITEM "効果音(&S)", 410
131131 MENUITEM "壁紙を使う(&B)", 440
132132 MENUITEM "壁紙を選択(&O)...", 441
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -2613,9 +2613,6 @@ static errr Term_xtra_win_music(int n, int v)
26132613 break;
26142614 }
26152615
2616-
2617-#endif /* USE_MUSIC */
2618-
26192616 #ifdef WIN32
26202617
26212618 mop.lpstrDeviceType = mci_device_type;
@@ -2627,12 +2624,14 @@ static errr Term_xtra_win_music(int n, int v)
26272624 mciSendCommand(mop.wDeviceID, MCI_PLAY, MCI_NOTIFY, (DWORD)&mop);
26282625 return (0);
26292626
2627+#endif /* WIN32 */
2628+
26302629 #else /* USE_MUSIC */
26312630
2632- /* Oops */
26332631 return (1);
26342632
26352633 #endif /* USE_MUSIC */
2634+
26362635 }
26372636
26382637
@@ -4765,7 +4764,9 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,
47654764 /* XXX XXX XXX */
47664765 case WM_CREATE:
47674766 {
4767+#ifdef USE_MUSIC
47684768 mop.dwCallback=(DWORD)hWnd;
4769+#endif
47694770 return 0;
47704771 }
47714772
Show on old repository browser