[Maintenance] [th02] Get rid of th02.h

… remove the last of the game-specific header files, …

Part of P0186, funded by [Anonymous] and Blue Bolt.

th02/common.h

@@ -0,0 +1,6 @@
+/* ReC98
+ * -----
+ * Common, essential macros for TH02. No types here!
+ */
+
+#define SHOTTYPE_COUNT 3

th02/maine_04.cpp

@@ -5,9 +5,10 @@
 
 extern "C" {
 #include <dos.h>
-#include "th02/th02.h"
+#include "ReC98.h"
 #include "master.hpp"
 #include "th01/math/clamp.hpp"
+#include "th02/common.h"
 #include "th02/resident.hpp"
 #include "th02/hardware/frmdelay.h"
 #include "th02/hardware/input.hpp"

th02/maine_05.cpp

@@ -4,7 +4,7 @@
  */
 
 extern "C" {
-#include "th02/th02.h"
+#include "ReC98.h"
 #include "x86real.h"
 #include "master.hpp"
 #include "th01/math/polar.hpp"

th02/op/cmt_load.c

@@ -4,7 +4,7 @@ char music_cmt[MUSIC_CMT_LINE_COUNT][MUSIC_CMT_LINE_LEN];
 void pascal near music_cmt_load(int track)
 {
 	int i;
-	file_ropen(MUSIC_CMT_FILE);
+	file_ropen(MUSIC_CMT_FN);
 	file_seek(track * MUSIC_CMT_LEN, SEEK_SET);
 	file_read(music_cmt, MUSIC_CMT_LEN);
 	file_close();

th02/op/music.inc

@@ -1,3 +1,2 @@
-; Music Room constants.
 MUSIC_CMT_LINE_LEN equ 42
 MUSIC_CMT_LINE_COUNT equ 20

th02/op_01.cpp

@@ -5,12 +5,15 @@
 
 extern "C" {
 #include <process.h>
-#include "th02/th02.h"
+#include "ReC98.h"
 #include "x86real.h"
 #include "th02/resident.hpp"
 #include "master.hpp"
 #include "libs/kaja/kaja.h"
+#include "th01/rank.h"
 #include "th01/math/clamp.hpp"
+#include "th01/hardware/grppsafx.h"
+#include "th02/common.h"
 #include "th02/hardware/frmdelay.h"
 #include "th02/hardware/grp_rect.h"
 #include "th02/hardware/input.hpp"
@@ -40,10 +43,9 @@ unsigned char demo_num;
 resident_t __seg *resident_sgm;
 putfunc_t near *putfunc;
 
-// No, we don't want to put these two into th02.h. Apparently, declaring
-// variables with extern before definining them for real within the same
-// compilation unit causes Turbo C++ to emit *everything* in a different
-// order... really, I couldn't make this up.
+// Apparently, declaring variables with `extern` before definining them for
+// real within the same compilation unit causes Turbo C++ to emit *everything*
+// in a different order... really, I couldn't make this up.
 extern char extra_unlocked;
 extern unsigned int score_duration;
 

th02/op_03.cpp

@@ -6,7 +6,7 @@
 #pragma codestring "\x00"
 
 extern "C" {
-#include "th02/th02.h"
+#include "ReC98.h"
 #include "x86real.h"
 #include "master.hpp"
 #include "th02/hardware/frmdelay.h"

th02/op_04.cpp

@@ -7,8 +7,10 @@ extern "C" {
 #include <dos.h>
 #include <mbctype.h>
 #include <mbstring.h>
-#include "th02/th02.h"
+#include "ReC98.h"
 #include "master.hpp"
+#include "th01/rank.h"
+#include "th02/common.h"
 #include "th02/hardware/frmdelay.h"
 #include "th02/hardware/input.hpp"
 #include "th02/core/globals.hpp"

th02/op_05.cpp

@@ -4,10 +4,12 @@
  */
 
 extern "C" {
-#include "th02/th02.h"
+#include "ReC98.h"
 #include "x86real.h"
 #include "master.hpp"
 #include "th01/math/clamp.hpp"
+#include "th01/hardware/grppsafx.h"
+#include "th02/common.h"
 #include "th02/resident.hpp"
 #include "th02/hardware/frmdelay.h"
 #include "th02/hardware/grp_rect.h"

th02/op_06.cpp

@@ -4,16 +4,21 @@
  */
 
 extern "C" {
-#include "th02/th02.h"
+#include "ReC98.h"
 #include "x86real.h"
 #include "master.hpp"
 #include "libs/kaja/kaja.h"
 #include "th01/math/polar.hpp"
+#include "th01/hardware/grppsafx.h"
 #include "th02/math/vector.hpp"
 #include "th02/hardware/frmdelay.h"
 #include "th02/hardware/input.hpp"
 #include "th02/formats/pi.h"
 #include "th02/snd/snd.h"
+#include "th02/shiftjis/fns.hpp"
+
+static const int MUSIC_CMT_LINE_LEN = 42;
+static const int MUSIC_CMT_LINE_COUNT = 20;
 
 #define TRACK_COUNT sizeof(MUSIC_FILES) / sizeof(MUSIC_FILES[0])
 #define SEL_QUIT TRACK_COUNT + 1

th02/shiftjis/fns.hpp

@@ -1 +1,2 @@
 #define PF_FN "“Œ•û••–‚.˜^"
+#define MUSIC_CMT_FN "MUSIC.TXT"

th02/th02.h

@@ -1,21 +0,0 @@
-/* ReC98
- * -----
- * Include file for TH02
- */
-
-#include "ReC98.h"
-#include "th01/rank.h"
-
-#undef grcg_off
-
-// Hardware
-// -------
-#include "th01/hardware/grppsafx.h"
-// -------
-
-// Music Room
-#define MUSIC_CMT_FILE "MUSIC.TXT"
-#define MUSIC_CMT_LINE_LEN 42
-#define MUSIC_CMT_LINE_COUNT 20
-
-#define SHOTTYPE_COUNT 3

th02/zun_res1.cpp

@@ -6,8 +6,9 @@
 
 #include <dos.h>
 #include <stddef.h>
-#include "th02/th02.h"
+#include "ReC98.h"
 #include "master.hpp"
+#include "th01/rank.h"
 #include "th02/resident.hpp"
 #include "th02/snd/snd.h"
 #include "th02/formats/cfg.h"

th02/zun_res2.c

@@ -7,8 +7,9 @@
 
 #include <dos.h>
 #include <stddef.h>
-#include "th02/th02.h"
+#include "ReC98.h"
 #include "master.hpp"
+#include "th01/rank.h"
 #include "th02/formats/scoredat.h"
 
 extern char rank;

th02/zun_res3.c

@@ -4,7 +4,7 @@
  */
 
 #include <dos.h>
-#include "th02/th02.h"
+#include "ReC98.h"
 #include "master.hpp"
 #include "th02/formats/scoredat.h"
 #include "th02/gaiji/gaiji.h"