[Translation unit catch-up] [th03] snd_kaja_interrupt()

Part of P0136, funded by [Anonymous].
nmlgc · Mar 20, 2021 · 0929d91 · 0929d91
1 parent 0263439
commit 0929d91
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 30 deletions.
diff --git a/Makefile.mak b/Makefile.mak
@@ -95,6 +95,8 @@ bin\th02\maine.exe: bin\th02\maine.obj bin\th02\grppsafx.obj th02\maine021.cpp b
 $**
 |
 
+{th03}.c{bin\th03}.obj:
+	$(CC) $(CFLAGS) -ml -Z -DGAME=3 -n$(@D) -c $**
 {th03}.cpp{bin\th03}.obj:
 	$(CC) $(CFLAGS) -ml -Z -DGAME=3 -n$(@D) -c $**
 
@@ -103,17 +105,17 @@ bin\th03\res_yume.com: th03\res_yume.cpp
 $**
 | masters.lib
 
-bin\th03\op.exe: th03\op_01.cpp bin\th03\op.obj bin\th03\initop.obj bin\th03\cdg_load.obj bin\th03\grppsafx.obj bin\th03\pi_load.obj bin\th03\inp_m_w.obj bin\th03\cdg_p_na.obj bin\hfliplut.obj bin\frmdely2.obj
+bin\th03\op.exe: th03\op_01.cpp bin\th03\op.obj bin\th03\snd_kaja.obj bin\th03\initop.obj bin\th03\cdg_load.obj bin\th03\grppsafx.obj bin\th03\pi_load.obj bin\th03\inp_m_w.obj bin\th03\cdg_p_na.obj bin\hfliplut.obj bin\frmdely2.obj
 	$(CC) $(CFLAGS) $(LARGE_LFLAGS) -3 -Z -DGAME=3 -nbin\th03\ -eOP.EXE @&&|
 $**
 |
 
-bin\th03\main.exe: bin\th03\main.obj th03\main_01.cpp bin\th03\initmain.obj bin\th03\pi_load.obj bin\th03\inp_m_w.obj bin\hfliplut.obj th03\mrs.cpp th03\sprite16.cpp
+bin\th03\main.exe: bin\th03\main.obj th03\main_01.cpp bin\th03\snd_kaja.obj bin\th03\initmain.obj bin\th03\pi_load.obj bin\th03\inp_m_w.obj bin\hfliplut.obj th03\mrs.cpp th03\sprite16.cpp
 	$(CC) $(CFLAGS) $(LARGE_LFLAGS) -Z -DGAME=3 -nbin\th03\ -eMAIN.EXE @&&|
 $**
 |
 
-bin\th03\mainl.exe: bin\th03\mainl.obj bin\th03\initmain.obj bin\th03\cdg_load.obj th03\exitmain.cpp bin\th03\grppsafx.obj bin\th03\snd_dlym.obj bin\th03\inp_wait.obj bin\th03\pi_load.obj bin\th03\pi_put_q.obj bin\th03\inp_m_w.obj bin\th03\cdg_p_na.obj bin\hfliplut.obj
+bin\th03\mainl.exe: bin\th03\mainl.obj bin\th03\snd_kaja.obj bin\th03\initmain.obj bin\th03\cdg_load.obj th03\exitmain.cpp bin\th03\grppsafx.obj bin\th03\snd_dlym.obj bin\th03\inp_wait.obj bin\th03\pi_load.obj bin\th03\pi_put_q.obj bin\th03\inp_m_w.obj bin\th03\cdg_p_na.obj bin\hfliplut.obj
 	$(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=3 -nbin\th03\ -eMAINL.EXE @&&|
 $**
 |

diff --git a/th02/snd/kajaint.asm b/th02/snd/kajaint.asm
diff --git a/th03/snd_kaja.c b/th03/snd_kaja.c
@@ -0,0 +1 @@
+#include "th02/snd/kajaint.c"
diff --git a/th03_main.asm b/th03_main.asm
@@ -8891,7 +8891,7 @@ include th02/hardware/frame_delay.asm
 include th03/hardware/input_sense.asm
 		nop
 include th02/snd/se.asm
-include th02/snd/kajaint.asm
+	extern SND_KAJA_INTERRUPT:proc
 	extern GAME_INIT_MAIN:proc
 	extern INPUT_MODE_KEY_VS_KEY:proc
 	extern INPUT_MODE_JOY_VS_KEY:proc
@@ -35044,6 +35044,7 @@ include libs/master.lib/wordmask[data].asm
 include libs/master.lib/mem[data].asm
 include libs/master.lib/super_entry_bfnt[data].asm
 include libs/master.lib/superpa[data].asm
+public _snd_active
 _snd_active	db 0
 		db 0
 include libs/master.lib/respal_exist[data].asm

diff --git a/th03_mainl.asm b/th03_mainl.asm
@@ -5535,7 +5535,7 @@ include th02/formats/pi_palette_apply.asm
 include th02/formats/pi_put.asm
 include th03/formats/pi_put_interlace.asm
 include th02/snd/se.asm
-include th02/snd/kajaint.asm
+	extern SND_KAJA_INTERRUPT:proc
 	extern GAME_INIT_MAIN:proc
 	extern CDG_LOAD_SINGLE:proc
 	extern CDG_LOAD_SINGLE_NOALPHA:proc

diff --git a/th03_op.asm b/th03_op.asm
@@ -3626,7 +3626,7 @@ include th02/hardware/frame_delay.asm
 include th03/hardware/input_sense.asm
 include th02/formats/pi_palette_apply.asm
 include th02/formats/pi_put.asm
-include th02/snd/kajaint.asm
+	extern SND_KAJA_INTERRUPT:proc
 	extern _game_init_op:proc
 	extern CDG_LOAD_SINGLE:proc
 	extern CDG_LOAD_SINGLE_NOALPHA:proc