From 46359e643ede888f9765d394f5a97eaab45d381a Mon Sep 17 00:00:00 2001 From: nmlgc Date: Mon, 8 Mar 2021 19:27:29 +0100 Subject: [PATCH] [Translation unit catch-up] [th05] game_exit() Part of P0136, funded by [Anonymous]. --- Makefile.mak | 8 +++++--- th02/core/exit.c | 2 -- th02/exit.c | 1 + th04/exit.c | 2 ++ th05_main.asm | 2 +- th05_maine.asm | 2 +- th05_op.asm | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 th04/exit.c diff --git a/Makefile.mak b/Makefile.mak index 743f362f..f8464cbc 100644 --- a/Makefile.mak +++ b/Makefile.mak @@ -120,6 +120,8 @@ bin\th03\mainl.exe: bin\th03\mainl.obj bin\th03\pi_put_i.obj bin\th03\snd_se.obj $** | +{th04}.c{bin\th04}.obj: + $(CC) $(CFLAGS) -ml -Z -DGAME=4 -n$(@D) -c $** {th04}.cpp{bin\th04}.obj: $(CC) $(CFLAGS) -ml -Z -DGAME=4 -n$(@D) -c $** @@ -154,17 +156,17 @@ bin\th05\res_kso.com: th05\res_kso.cpp $** | masters.lib -bin\th05\op.exe: th05\op010.cpp bin\th05\op.obj th05\op011.cpp th05\m_char.cpp bin\th05\vector.obj bin\th05\musicp_c.obj bin\th05\musicp_a.obj bin\th05\bgimager.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\pi_cpp_1.obj bin\th05\pi_asm_1.obj bin\th05\pi_cpp_2.obj bin\th05\pi_asm_2.obj bin\th05\initop.obj bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\snd_dlym.obj th05\cdg_p_nc.cpp bin\th05\frmdelay.obj bin\th04\cdg_load.obj bin\th05\egcrect.obj bin\hfliplut.obj +bin\th05\op.exe: th05\op010.cpp bin\th05\op.obj th05\op011.cpp th05\m_char.cpp bin\th04\exit.obj bin\th05\vector.obj bin\th05\musicp_c.obj bin\th05\musicp_a.obj bin\th05\bgimager.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\pi_cpp_1.obj bin\th05\pi_asm_1.obj bin\th05\pi_cpp_2.obj bin\th05\pi_asm_2.obj bin\th05\initop.obj bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\snd_dlym.obj th05\cdg_p_nc.cpp bin\th05\frmdelay.obj bin\th04\cdg_load.obj bin\th05\egcrect.obj bin\hfliplut.obj $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=5 -DBINARY='O' -3 -Z -nbin\th05\ -eOP.EXE @&&| $** | -bin\th05\main.exe: bin\th05\main.obj th05\main010.cpp th05\main011.cpp th05\p_common.cpp th05\p_reimu.cpp th05\p_marisa.cpp th05\p_mima.cpp th05\p_yuuka.cpp bin\th05\player.obj bin\th05\hud_bar.obj bin\th05\scoreupd.obj th05\main012.cpp th05\main013.cpp bin\hfliplut.obj bin\th05\bullet.obj bin\th05\vector.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\initmain.obj bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\frmdelay.obj bin\th04\cdg_load.obj th05\main031.cpp th05\main032.cpp th05\main033.cpp th05\main034.cpp +bin\th05\main.exe: bin\th05\main.obj th05\main010.cpp th05\main011.cpp th05\p_common.cpp th05\p_reimu.cpp th05\p_marisa.cpp th05\p_mima.cpp th05\p_yuuka.cpp bin\th05\player.obj bin\th05\hud_bar.obj bin\th05\scoreupd.obj th05\main012.cpp th05\main013.cpp bin\hfliplut.obj bin\th05\bullet.obj bin\th04\exit.obj bin\th05\vector.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\initmain.obj bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\frmdelay.obj bin\th04\cdg_load.obj th05\main031.cpp th05\main032.cpp th05\main033.cpp th05\main034.cpp $(CC) $(CFLAGS) $(LARGE_LFLAGS) -3 -Z -DGAME=5 -DBINARY='M' -nbin\th05\ -eMAIN.EXE @&&| $** | -bin\th05\maine.exe: bin\th05\maine.obj th05\maine011.cpp th05\regist.cpp th05\staff.cpp bin\th05\vector.obj bin\th05\bgimager.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\pi_cpp_1.obj bin\th05\pi_asm_1.obj bin\th05\pi_cpp_2.obj bin\th05\pi_asm_2.obj bin\th05\initmain.obj bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\snd_dlym.obj bin\th05\frmdelay.obj bin\th04\cdg_load.obj bin\th05\egcrect.obj bin\hfliplut.obj +bin\th05\maine.exe: bin\th05\maine.obj th05\maine011.cpp th05\regist.cpp th05\staff.cpp bin\th04\exit.obj bin\th05\vector.obj bin\th05\bgimager.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\pi_cpp_1.obj bin\th05\pi_asm_1.obj bin\th05\pi_cpp_2.obj bin\th05\pi_asm_2.obj bin\th05\initmain.obj bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\snd_dlym.obj bin\th05\frmdelay.obj bin\th04\cdg_load.obj bin\th05\egcrect.obj bin\hfliplut.obj $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=5 -DBINARY='E' -Z -nbin\th05\ -eMAINE.EXE @&&| $** | diff --git a/th02/core/exit.c b/th02/core/exit.c index 57dbf434..bdd980a6 100644 --- a/th02/core/exit.c +++ b/th02/core/exit.c @@ -1,5 +1,3 @@ -#pragma codeseg SHARED - #include "platform.h" #include "x86real.h" #include "master.hpp" diff --git a/th02/exit.c b/th02/exit.c index f06aa961..34bc9824 100644 --- a/th02/exit.c +++ b/th02/exit.c @@ -1 +1,2 @@ +#pragma codeseg SHARED #include "th02/core/exit.c" diff --git a/th04/exit.c b/th04/exit.c new file mode 100644 index 00000000..0c8866c7 --- /dev/null +++ b/th04/exit.c @@ -0,0 +1,2 @@ +#pragma codeseg SHARED_ +#include "th02/core/exit.c" diff --git a/th05_main.asm b/th05_main.asm index 2a49382b..7bbe61ae 100644 --- a/th05_main.asm +++ b/th05_main.asm @@ -10558,7 +10558,7 @@ include th04/snd/detmodes.asm include th04/formats/cdg_put_noalpha.asm include th04/snd/se.asm include th04/formats/cdg_put.asm -include th02/exit.asm + extern _game_exit:proc extern VECTOR1_AT:proc extern VECTOR2_AT:proc extern SND_LOAD:proc diff --git a/th05_maine.asm b/th05_maine.asm index d66aab10..35eadfa8 100644 --- a/th05_maine.asm +++ b/th05_maine.asm @@ -7532,7 +7532,7 @@ include th04/hardware/grppsafx.asm include th04/formats/cdg_put_noalpha.asm include th04/snd/se.asm include th04/hardware/bgimage.asm -include th02/exit.asm + extern _game_exit:proc extern VECTOR2_AT:proc extern BGIMAGE_PUT_RECT:proc extern SND_LOAD:proc diff --git a/th05_op.asm b/th05_op.asm index 3844bea4..1927f6ef 100644 --- a/th05_op.asm +++ b/th05_op.asm @@ -2534,7 +2534,7 @@ include th04/formats/cdg_put_noalpha.asm include th04/snd/se.asm include th04/hardware/bgimage.asm include th04/formats/cdg_put.asm -include th02/exit.asm + extern _game_exit:proc extern VECTOR1_AT:proc extern _piano_render:proc extern _piano_setup_and_put_initial:proc