X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_sd.c;h=610f7ed0d2e867c555acd7d2f9bc61fcbeeae143;hb=adb425e17c32e33e71670dd69c909717f1d65acb;hp=f48ae2c05501fac4a7b1f7c828593efca09b2eae;hpb=b0e52bf89f50997ba85d95c748f00dbf386f7fae;p=16.git

diff --git a/src/lib/16_sd.c b/src/lib/16_sd.c
index f48ae2c0..610f7ed0 100755
--- a/src/lib/16_sd.c
+++ b/src/lib/16_sd.c
@@ -23,7 +23,7 @@
 #include "src/lib/16_sd.h"
 
 //static void (interrupt *old_irq0)();
-extern struct glob_game_vars	*ggvv;
+void interrupt	(*old_irq0)(void);
 
 void opl2out(word reg, word data)
 {
@@ -196,23 +196,37 @@ void FMSetVoice(int voiceNum, FMInstrument *ins){
 	opl2out(opCellNum, ins->Feedback);
 } /* End of FMSetVoice */
 
-
 void SD_Initimf(global_game_variables_t *gvar)
 {
+	if (!init_adlib()) {
+		printf("Cannot init library\n");
+		return;
+	}
+	if (!probe_8254()) { /* we need the timer to keep time with the music */
+		printf("8254 timer not found\n");
+		return;
+	}
+
 	gvar->ca.sd.irq0_ticks=
-	gvar->ca.sd.irq0_cnt=
-	gvar->ca.sd.irq0_add=
+	//gvar->ca.sd.irq0_cnt=
+	//gvar->ca.sd.irq0_add=
 	gvar->ca.sd.imf_delay_countdown=
 	gvar->ca.sd.irq0_max=0;
 	gvar->ca.sd.imf_music=
 	gvar->ca.sd.imf_play_ptr=
 	gvar->ca.sd.imf_music_end=NULL;
+	gvar->ca.sd.irq0_cnt = 0;
+	gvar->ca.sd.irq0_add = 182;
+	gvar->ca.sd.irq0_max = 1000; /* about 18.2Hz */
+
+	SD_adlib_shut_up();
+	shutdown_adlib_opl3(); // NTS: Apparently the music won't play otherwise
 }
 
 void SD_imf_free_music(global_game_variables_t *gvar)
 {
-	if (gvar->ca.sd.imf_music) free(gvar->ca.sd.imf_music);
-	MM_FreePtr(MEMPTR gvar->ca.audiosegs[0], gvar);	//TODO make behave like id engine
+//	if (gvar->ca.sd.imf_music) free(gvar->ca.sd.imf_music);
+	MM_FreePtr(MEMPTRCONV gvar->ca.audiosegs[0], gvar);	//TODO make behave like id engine
 	gvar->ca.sd.imf_music = gvar->ca.sd.imf_play_ptr = gvar->ca.sd.imf_music_end = NULL;
 	gvar->ca.sd.imf_delay_countdown = 0;
 }
@@ -242,7 +256,7 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
 	}
 	len -= len & 3;
 
-	MM_GetPtr(MEMPTR gvar->ca.audiosegs[0],len, gvar);
+	MM_GetPtr(MEMPTRCONV gvar->ca.audiosegs[0],len, gvar);
 	gvar->ca.sd.imf_music = (struct imf_entry *)gvar->ca.audiosegs[0];
 	if (gvar->ca.sd.imf_music == NULL) {
 		close(fd);
@@ -256,8 +270,9 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
 	return 1;
 }
 
+struct glob_game_vars	*ggvv;
 // WARNING: subroutine call in interrupt handler. make sure you compile with -zu flag for large/compact memory models
-/*void interrupt irq0()
+void interrupt irq0()
 {
 	ggvv->ca.sd.irq0_ticks++;
 	if ((ggvv->ca.sd.irq0_cnt += ggvv->ca.sd.irq0_add) >= ggvv->ca.sd.irq0_max) {
@@ -267,7 +282,7 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
 	else {
 		p8259_OCW2(0,P8259_OCW2_NON_SPECIFIC_EOI);
 	}
-}*/
+}
 
 void SD_imf_tick(global_game_variables_t *gvar)
 {