ref: 58d7a45392adea33a3b13fc6a86284f1791c38be
parent: 9498fe13bedcca0417eee735173e59b94a236d02
author: Clownacy <Clownacy@users.noreply.github.com>
date: Mon Jan 6 16:20:17 EST 2020
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
--- 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;
--- 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
--- 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
--- 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];
--- 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"
--- 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)
{
--- 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);
--- 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;
--- 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
--- 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"
--- 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];
--- a/src/Profile.cpp
+++ b/src/Profile.cpp
@@ -12,6 +12,7 @@
#include "Flags.h"
#include "Frame.h"
#include "Game.h"
+#include "Main.h"
#include "MiniMap.h"
#include "MyChar.h"
#include "NpChar.h"
@@ -18,7 +19,6 @@
#include "SelStage.h"
#include "Stage.h"
#include "Star.h"
-#include "Tags.h"
#include "ValueView.h"
const char *gDefaultName = "Profile.dat";
--- a/src/Sound.cpp
+++ b/src/Sound.cpp
@@ -22,9 +22,9 @@
#include "WindowsWrapper.h"
+#include "Main.h"
#include "Organya.h"
#include "PixTone.h"
-#include "Tags.h"
LPDIRECTSOUND lpDS; // DirectSoundオブジェクト (DirectSound object)
LPDIRECTSOUNDBUFFER lpPRIMARYBUFFER; // 一時バッファ (Temporary buffer)
--- 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.
--- 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