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 7e16839a3dd430ecb6c84ff40d4bbfc33d8e4ae5..610f7ed0d2e867c555acd7d2f9bc61fcbeeae143 100755 (executable)
--- a/src/lib/16_sd.c
+++ b/src/lib/16_sd.c
@@ -226,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
@@ -256,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
@@ -270,7 +270,6 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
        return 1;\r
 }\r
 \r
-#ifdef LIBIRQ0\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
@@ -284,7 +283,6 @@ void interrupt irq0()
                p8259_OCW2(0,P8259_OCW2_NON_SPECIFIC_EOI);\r
        }\r
 }\r
-#endif\r
 \r
 void SD_imf_tick(global_game_variables_t *gvar)\r
 {\r