16_ca needs huge amounts of work and I should remember what needs to be done soon...

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

diff --git a/src/lib/16_sd.c b/src/lib/16_sd.c
index a058a3204ac215be9333404bd15cb47584034fe3..610f7ed0d2e867c555acd7d2f9bc61fcbeeae143 100755 (executable)
--- a/src/lib/16_sd.c
+++ b/src/lib/16_sd.c
@@ -23,7 +23,7 @@
 #include "src/lib/16_sd.h"\r
 \r
 //static void (interrupt *old_irq0)();\r
-extern struct glob_game_vars   *ggvv;\r
+void interrupt (*old_irq0)(void);\r
 \r
 void opl2out(word reg, word data)\r
 {\r
@@ -196,7 +196,6 @@ void FMSetVoice(int voiceNum, FMInstrument *ins){
        opl2out(opCellNum, ins->Feedback);\r
 } /* End of FMSetVoice */\r
 \r
-\r
 void SD_Initimf(global_game_variables_t *gvar)\r
 {\r
        if (!init_adlib()) {\r
@@ -227,7 +226,7 @@ void SD_Initimf(global_game_variables_t *gvar)
 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
-       MM_FreePtr(MEMPTR gvar->ca.audiosegs[0], gvar); //TODO make behave like id engine\r
+       MM_FreePtr(MEMPTRCONV gvar->ca.audiosegs[0], gvar);     //TODO make behave like id engine\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
@@ -257,7 +256,7 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
        }\r
        len -= len & 3;\r
 \r
-       MM_GetPtr(MEMPTR gvar->ca.audiosegs[0],len, gvar);\r
+       MM_GetPtr(MEMPTRCONV gvar->ca.audiosegs[0],len, gvar);\r
        gvar->ca.sd.imf_music = (struct imf_entry *)gvar->ca.audiosegs[0];\r
        if (gvar->ca.sd.imf_music == NULL) {\r
                close(fd);\r
@@ -271,8 +270,9 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
        return 1;\r
 }\r
 \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 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
@@ -282,7 +282,7 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
        else {\r
                p8259_OCW2(0,P8259_OCW2_NON_SPECIFIC_EOI);\r
        }\r
-}*/\r
+}\r
 \r
 void SD_imf_tick(global_game_variables_t *gvar)\r
 {\r