p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

[16.git] / src / lib / 16_sd.c

diff --git a/src/lib/16_sd.c b/src/lib/16_sd.c
index f48ae2c05501fac4a7b1f7c828593efca09b2eae..3e4cfc00e6acfd4468e5484a729a9c6a937cde29 100755 (executable)
--- a/src/lib/16_sd.c
+++ b/src/lib/16_sd.c
@@ -199,14 +199,29 @@ void FMSetVoice(int voiceNum, FMInstrument *ins){
 \r
 void SD_Initimf(global_game_variables_t *gvar)\r
 {\r
+       if (!init_adlib()) {\r
+               printf("Cannot init library\n");\r
+               return;\r
+       }\r
+       if (!probe_8254()) { /* we need the timer to keep time with the music */\r
+               printf("8254 timer not found\n");\r
+               return;\r
+       }\r
+\r
        gvar->ca.sd.irq0_ticks=\r
-       gvar->ca.sd.irq0_cnt=\r
-       gvar->ca.sd.irq0_add=\r
+       //gvar->ca.sd.irq0_cnt=\r
+       //gvar->ca.sd.irq0_add=\r
        gvar->ca.sd.imf_delay_countdown=\r
        gvar->ca.sd.irq0_max=0;\r
        gvar->ca.sd.imf_music=\r
        gvar->ca.sd.imf_play_ptr=\r
        gvar->ca.sd.imf_music_end=NULL;\r
+       gvar->ca.sd.irq0_cnt = 0;\r
+       gvar->ca.sd.irq0_add = 182;\r
+       gvar->ca.sd.irq0_max = 1000; /* about 18.2Hz */\r
+\r
+       SD_adlib_shut_up();\r
+       shutdown_adlib_opl3(); // NTS: Apparently the music won't play otherwise\r
 }\r
 \r
 void SD_imf_free_music(global_game_variables_t *gvar)\r