diff --git a/Makefile b/Makefile index e8e15fb3..99cc0f40 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ TH06E_OBJS= $(OBJ_DIR)\main.obj \ $(OBJ_DIR)\MidiOutput.obj \ $(OBJ_DIR)\Pbg3Archive.obj \ $(OBJ_DIR)\SoundPlayer.obj \ - $(OBJ_DIR)\VeryBigStruct.obj \ + $(OBJ_DIR)\AnmManager.obj \ $(OBJ_DIR)\utils.obj \ $(OBJ_DIR)\th06.res diff --git a/src/AnmManager.cpp b/src/AnmManager.cpp new file mode 100644 index 00000000..4bf0ef08 --- /dev/null +++ b/src/AnmManager.cpp @@ -0,0 +1,13 @@ +#include "AnmManager.hpp" + +AnmManager::AnmManager() +{ +} +AnmManager::~AnmManager() +{ +} +void AnmManager::ReleaseD3dSurfaces(void) +{ +} + +AnmManager *g_AnmManager; diff --git a/src/AnmManager.hpp b/src/AnmManager.hpp new file mode 100644 index 00000000..ee57310c --- /dev/null +++ b/src/AnmManager.hpp @@ -0,0 +1,12 @@ +#pragma once + +struct AnmManager +{ + AnmManager(); + ~AnmManager(); + + void ReleaseD3dSurfaces(void); + char data[0x2112c]; +}; + +extern AnmManager *g_AnmManager; diff --git a/src/VeryBigStruct.cpp b/src/VeryBigStruct.cpp deleted file mode 100644 index 7b7e3250..00000000 --- a/src/VeryBigStruct.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "VeryBigStruct.hpp" - -VeryBigStruct::VeryBigStruct() -{ -} -VeryBigStruct::~VeryBigStruct() -{ -} -void VeryBigStruct::ReleaseD3dSurfaces(void) -{ -} - -VeryBigStruct *g_VeryBigStruct; diff --git a/src/VeryBigStruct.hpp b/src/VeryBigStruct.hpp deleted file mode 100644 index 498e2668..00000000 --- a/src/VeryBigStruct.hpp +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -struct VeryBigStruct -{ - VeryBigStruct(); - ~VeryBigStruct(); - - void ReleaseD3dSurfaces(void); - char data[0x2112c]; -}; - -extern VeryBigStruct *g_VeryBigStruct; diff --git a/src/main.cpp b/src/main.cpp index 23724fef..d119227c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,13 +5,13 @@ #include #include +#include "AnmManager.hpp" #include "Chain.hpp" #include "FileSystem.hpp" #include "GameContext.hpp" #include "GameErrorContext.hpp" #include "GameWindow.hpp" #include "SoundPlayer.hpp" -#include "VeryBigStruct.hpp" #include "i18n.hpp" #include "utils.hpp" @@ -149,7 +149,7 @@ int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL i32 testCoopLevelRes; i32 testResetRes; MSG msg; - VeryBigStruct *vbs; + AnmManager *anm; if (CheckForRunningGameInstance()) { @@ -193,8 +193,8 @@ int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL GetJoystickCaps(); ResetKeyboard(); - vbs = new VeryBigStruct(); - g_VeryBigStruct = vbs; + anm = new AnmManager(); + g_AnmManager = anm; if (AddInputChain() != 0) { @@ -227,7 +227,7 @@ int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL } else if (testCoopLevelRes == D3DERR_DEVICENOTRESET) { - g_VeryBigStruct->ReleaseD3dSurfaces(); + g_AnmManager->ReleaseD3dSurfaces(); testResetRes = g_GameContext.d3dDevice->Reset(&g_GameContext.presentParameters); if (testResetRes != 0) { @@ -244,8 +244,8 @@ int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL g_Chain.Release(); g_SoundPlayer.Release(); - delete g_VeryBigStruct; - g_VeryBigStruct = NULL; + delete g_AnmManager; + g_AnmManager = NULL; if (g_GameContext.d3dDevice != NULL) { g_GameContext.d3dDevice->Release();