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

diff --git a/src/lib/16_sd.c b/src/lib/16_sd.c
index 610f7ed0..1cdd5627 100755
--- a/src/lib/16_sd.c
+++ b/src/lib/16_sd.c
@@ -22,8 +22,7 @@
 
 #include "src/lib/16_sd.h"
 
-//static void (interrupt *old_irq0)();
-void interrupt	(*old_irq0)(void);
+static	void interrupt	(*t0OldService)(void);
 
 void opl2out(word reg, word data)
 {
@@ -196,6 +195,24 @@ void FMSetVoice(int voiceNum, FMInstrument *ins){
 	opl2out(opCellNum, ins->Feedback);
 } /* End of FMSetVoice */
 
+
+//newer sd
+
+
+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 SDL_irq0()
+{
+	ggvv->ca.sd.irq0_ticks++;
+	if ((ggvv->ca.sd.irq0_cnt += ggvv->ca.sd.irq0_add) >= ggvv->ca.sd.irq0_max) {
+		ggvv->ca.sd.irq0_cnt -= ggvv->ca.sd.irq0_max;
+		t0OldService();
+	}
+	else {
+		p8259_OCW2(0,P8259_OCW2_NON_SPECIFIC_EOI);
+	}
+}
+
 void SD_Initimf(global_game_variables_t *gvar)
 {
 	if (!init_adlib()) {
@@ -207,28 +224,51 @@ void SD_Initimf(global_game_variables_t *gvar)
 		return;
 	}
 
-	gvar->ca.sd.irq0_ticks=
-	//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_delay_countdown=0;
 	gvar->ca.sd.imf_music=
 	gvar->ca.sd.imf_play_ptr=
 	gvar->ca.sd.imf_music_end=NULL;
+
+	SD_adlib_shut_up();
+	shutdown_adlib_opl3(); // NTS: Apparently the music won't play otherwise
+}
+
+void SD_imf_reset_music(global_game_variables_t *gvar)
+{
+	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;
+}
+
+void SD_StartupTimer(global_game_variables_t *gvar)
+{
+	gvar->ca.sd.irq0_ticks=
 	gvar->ca.sd.irq0_cnt = 0;
 	gvar->ca.sd.irq0_add = 182;
 	gvar->ca.sd.irq0_max = 1000; /* about 18.2Hz */
+	gvar->ca.sd.tickrate = 700;
 
-	SD_adlib_shut_up();
-	shutdown_adlib_opl3(); // NTS: Apparently the music won't play otherwise
+	write_8254_system_timer(T8254_REF_CLOCK_HZ / gvar->ca.sd.tickrate);
+	t0OldService = _dos_getvect(8);	/*IRQ0*/
+	_dos_setvect(8,SDL_irq0);
+
+	_cli();
+	gvar->ca.sd.irq0_ticks = gvar->ca.sd.ptick = 0;
+	_sti();
+}
+
+void SD_ShutdownTimer()
+{
+	_dos_setvect(8,t0OldService);
 }
 
 void SD_imf_free_music(global_game_variables_t *gvar)
 {
-//	if (gvar->ca.sd.imf_music) free(gvar->ca.sd.imf_music);
+#ifndef SD_USESCAMMPM
+	if (gvar->ca.sd.imf_music) free(gvar->ca.sd.imf_music);
+#else
 	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;
+#endif
+	SD_imf_reset_music(gvar);
 }
 
 int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
@@ -237,7 +277,11 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
 	unsigned char buf[8];
 	int fd;
 
+#ifndef SD_USESCAMMPM
 	SD_imf_free_music(gvar);
+#else
+	SD_imf_reset_music(gvar);
+#endif
 
 	fd = open(path,O_RDONLY|O_BINARY);
 	if (fd < 0) return 0;
@@ -256,8 +300,12 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
 	}
 	len -= len & 3;
 
+#ifndef SD_USESCAMMPM
+	gvar->ca.sd.imf_music = malloc(len);
+#else
 	MM_GetPtr(MEMPTRCONV gvar->ca.audiosegs[0],len, gvar);
 	gvar->ca.sd.imf_music = (struct imf_entry *)gvar->ca.audiosegs[0];
+#endif
 	if (gvar->ca.sd.imf_music == NULL) {
 		close(fd);
 		return 0;
@@ -270,20 +318,6 @@ 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()
-{
-	ggvv->ca.sd.irq0_ticks++;
-	if ((ggvv->ca.sd.irq0_cnt += ggvv->ca.sd.irq0_add) >= ggvv->ca.sd.irq0_max) {
-		ggvv->ca.sd.irq0_cnt -= ggvv->ca.sd.irq0_max;
-		old_irq0();
-	}
-	else {
-		p8259_OCW2(0,P8259_OCW2_NON_SPECIFIC_EOI);
-	}
-}
-
 void SD_imf_tick(global_game_variables_t *gvar)
 {
 	if (gvar->ca.sd.imf_delay_countdown == 0) {