imfplay works now~

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

diff --git a/src/lib/16_sd.c b/src/lib/16_sd.c
index 610f7ed0d2e867c555acd7d2f9bc61fcbeeae143..f42f201956db68cacfce8c87810d5e006328cdb8 100755 (executable)
--- a/src/lib/16_sd.c
+++ b/src/lib/16_sd.c
@@ -22,8 +22,10 @@
 \r
 #include "src/lib/16_sd.h"\r
 \r
-//static void (interrupt *old_irq0)();\r
-void interrupt (*old_irq0)(void);\r
+//#define SD_USESCAMMPM\r
+\r
+static void (interrupt *SD_old_irq0)();\r
+//void interrupt       (*old_irq0)(void);\r
 \r
 void opl2out(word reg, word data)\r
 {\r
@@ -225,8 +227,11 @@ void SD_Initimf(global_game_variables_t *gvar)
 \r
 void SD_imf_free_music(global_game_variables_t *gvar)\r
 {\r
-//     if (gvar->ca.sd.imf_music) free(gvar->ca.sd.imf_music);\r
+#ifndef SD_USESCAMMPM\r
+       if (gvar->ca.sd.imf_music) free(gvar->ca.sd.imf_music);\r
+#else\r
        MM_FreePtr(MEMPTRCONV gvar->ca.audiosegs[0], gvar);     //TODO make behave like id engine\r
+#endif\r
        gvar->ca.sd.imf_music = gvar->ca.sd.imf_play_ptr = gvar->ca.sd.imf_music_end = NULL;\r
        gvar->ca.sd.imf_delay_countdown = 0;\r
 }\r
@@ -256,8 +261,12 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
        }\r
        len -= len & 3;\r
 \r
+#ifndef SD_USESCAMMPM\r
+       gvar->ca.sd.imf_music = malloc(len);\r
+#else\r
        MM_GetPtr(MEMPTRCONV gvar->ca.audiosegs[0],len, gvar);\r
        gvar->ca.sd.imf_music = (struct imf_entry *)gvar->ca.audiosegs[0];\r
+#endif\r
        if (gvar->ca.sd.imf_music == NULL) {\r
                close(fd);\r
                return 0;\r
@@ -272,12 +281,12 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
 \r
 struct glob_game_vars  *ggvv;\r
 // WARNING: subroutine call in interrupt handler. make sure you compile with -zu flag for large/compact memory models\r
-void interrupt irq0()\r
+void interrupt SD_irq0()\r
 {\r
        ggvv->ca.sd.irq0_ticks++;\r
        if ((ggvv->ca.sd.irq0_cnt += ggvv->ca.sd.irq0_add) >= ggvv->ca.sd.irq0_max) {\r
                ggvv->ca.sd.irq0_cnt -= ggvv->ca.sd.irq0_max;\r
-               old_irq0();\r
+               SD_old_irq0();\r
        }\r
        else {\r
                p8259_OCW2(0,P8259_OCW2_NON_SPECIFIC_EOI);\r