From 58d7a45392adea33a3b13fc6a86284f1791c38be Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Mon, 6 Jan 2020 21:20:17 +0000
Subject: [PATCH] Empty Tags.h

There's no evidence Tags.h contained these variables (if anything, it
appears that Pixel manually declared them in every file that used
them).

gg Pixel
---
 src/Back.cpp     |  2 +-
 src/Config.cpp   |  2 +-
 src/Draw.cpp     |  1 -
 src/Ending.cpp   |  1 -
 src/Game.cpp     |  1 -
 src/Generic.cpp  |  2 +-
 src/Main.cpp     |  1 -
 src/Main.h       |  3 +++
 src/Map.cpp      |  2 +-
 src/MycParam.cpp |  2 +-
 src/NpChar.cpp   |  2 +-
 src/Profile.cpp  |  2 +-
 src/Sound.cpp    |  2 +-
 src/Tags.h       | 14 ++------------
 src/TextScr.cpp  |  1 -
 15 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/src/Back.cpp b/src/Back.cpp
index 001101f0..c5f2de76 100644
--- a/src/Back.cpp
+++ b/src/Back.cpp
@@ -9,9 +9,9 @@
 #include "Draw.h"
 #include "Frame.h"
 #include "Game.h"
+#include "Main.h"
 #include "Map.h"
 #include "Stage.h"
-#include "Tags.h"
 
 BACK gBack;
 int gWaterY;
diff --git a/src/Config.cpp b/src/Config.cpp
index c9d21b10..dfc02224 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -5,7 +5,7 @@
 #include "WindowsWrapper.h"
 
 #include "Config.h"
-#include "Tags.h"
+#include "Main.h"
 
 static const char* const config_filename = "Config.dat";	// Not the original name
 static const char* const config_magic = "DOUKUTSU20041206";	// Not the original name
diff --git a/src/Draw.cpp b/src/Draw.cpp
index a638c0b1..b48972c5 100644
--- a/src/Draw.cpp
+++ b/src/Draw.cpp
@@ -14,7 +14,6 @@
 #include "Generic.h"
 #include "Main.h"
 #include "MapName.h"
-#include "Tags.h"
 #include "TextScr.h"
 
 typedef enum SurfaceType
diff --git a/src/Ending.cpp b/src/Ending.cpp
index e5108768..70af5dbf 100644
--- a/src/Ending.cpp
+++ b/src/Ending.cpp
@@ -16,7 +16,6 @@
 #include "Organya.h"
 #include "Stage.h"
 #include "TextScr.h"
-#include "Tags.h"
 
 CREDIT Credit;
 STRIP Strip[MAX_STRIP];
diff --git a/src/Game.cpp b/src/Game.cpp
index e9c4c565..c7357235 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -40,7 +40,6 @@
 #include "Sound.h"
 #include "Stage.h"
 #include "Star.h"
-#include "Tags.h"
 #include "TextScr.h"
 #include "ValueView.h"
 
diff --git a/src/Generic.cpp b/src/Generic.cpp
index a435ced8..e6db4928 100644
--- a/src/Generic.cpp
+++ b/src/Generic.cpp
@@ -6,7 +6,7 @@
 
 #include "WindowsWrapper.h"
 
-#include "Tags.h"
+#include "Main.h"
 
 void GetCompileDate(int *year, int *month, int *day)
 {
diff --git a/src/Main.cpp b/src/Main.cpp
index 98450750..757575fb 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -20,7 +20,6 @@
 #include "Organya.h"
 #include "Profile.h"
 #include "Sound.h"
-#include "Tags.h"
 #include "Triangle.h"
 
 LRESULT __stdcall WindowProcedure(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
diff --git a/src/Main.h b/src/Main.h
index 3acd86b8..5735a749 100644
--- a/src/Main.h
+++ b/src/Main.h
@@ -6,6 +6,9 @@
 extern "C" {
 #endif
 
+extern char gModulePath[MAX_PATH];
+extern char gDataPath[MAX_PATH];
+
 extern HWND ghWnd;
 extern BOOL bFullscreen;
 
diff --git a/src/Map.cpp b/src/Map.cpp
index 5627db2c..f16ccc78 100644
--- a/src/Map.cpp
+++ b/src/Map.cpp
@@ -9,8 +9,8 @@
 
 #include "CommonDefines.h"
 #include "Draw.h"
+#include "Main.h"
 #include "NpChar.h"
-#include "Tags.h"
 
 #define PXM_BUFFER_SIZE 0x4B000
 
diff --git a/src/MycParam.cpp b/src/MycParam.cpp
index 5fff9171..74d17afa 100644
--- a/src/MycParam.cpp
+++ b/src/MycParam.cpp
@@ -9,10 +9,10 @@
 #include "Caret.h"
 #include "Draw.h"
 #include "Game.h"
+#include "Main.h"
 #include "MyChar.h"
 #include "NpChar.h"
 #include "Sound.h"
-#include "Tags.h"
 #include "TextScr.h"
 #include "ValueView.h"
 
diff --git a/src/NpChar.cpp b/src/NpChar.cpp
index d35226a5..64a02467 100644
--- a/src/NpChar.cpp
+++ b/src/NpChar.cpp
@@ -11,10 +11,10 @@
 #include "Draw.h"
 #include "Flags.h"
 #include "Game.h"
+#include "Main.h"
 #include "MyChar.h"
 #include "NpcTbl.h"
 #include "Sound.h"
-#include "Tags.h"
 #include "ValueView.h"
 
 NPCHAR gNPC[NPC_MAX];
diff --git a/src/Profile.cpp b/src/Profile.cpp
index 4f228244..c28c51aa 100644
--- a/src/Profile.cpp
+++ b/src/Profile.cpp
@@ -12,13 +12,13 @@
 #include "Flags.h"
 #include "Frame.h"
 #include "Game.h"
+#include "Main.h"
 #include "MiniMap.h"
 #include "MyChar.h"
 #include "NpChar.h"
 #include "SelStage.h"
 #include "Stage.h"
 #include "Star.h"
-#include "Tags.h"
 #include "ValueView.h"
 
 const char *gDefaultName = "Profile.dat";
diff --git a/src/Sound.cpp b/src/Sound.cpp
index 662891db..5e15e9a1 100644
--- a/src/Sound.cpp
+++ b/src/Sound.cpp
@@ -22,9 +22,9 @@ equivalents.
 
 #include "WindowsWrapper.h"
 
+#include "Main.h"
 #include "Organya.h"
 #include "PixTone.h"
-#include "Tags.h"
 
 LPDIRECTSOUND       lpDS;            // DirectSoundオブジェクト (DirectSound object)
 LPDIRECTSOUNDBUFFER lpPRIMARYBUFFER; // 一時バッファ (Temporary buffer)
diff --git a/src/Tags.h b/src/Tags.h
index 0bc06aeb..09235ab7 100644
--- a/src/Tags.h
+++ b/src/Tags.h
@@ -1,14 +1,4 @@
 #pragma once
 
-#include "WindowsWrapper.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern char gModulePath[MAX_PATH];
-extern char gDataPath[MAX_PATH];
-
-#ifdef __cplusplus
-}
-#endif
+// Apparently this used to contain a bunch of structs?
+// For now, the structs are in header files matching their purpose.
diff --git a/src/TextScr.cpp b/src/TextScr.cpp
index a2fa078e..6be4012e 100644
--- a/src/TextScr.cpp
+++ b/src/TextScr.cpp
@@ -32,7 +32,6 @@
 #include "SelStage.h"
 #include "Sound.h"
 #include "Stage.h"
-#include "Tags.h"
 
 #define TSC_BUFFER_SIZE 0x5000