From 2cfe45fe42039485ef42267a2430f27bfa369ba7 Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Sat, 14 Dec 2024 00:34:23 -0500 Subject: [PATCH] remove `GameVersions.h` --- src/graphic/Fast3D/gfx_pc.cpp | 1 - src/resource/GameVersions.h | 28 ---------------------------- src/resource/archive/Archive.cpp | 3 +-- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 src/resource/GameVersions.h diff --git a/src/graphic/Fast3D/gfx_pc.cpp b/src/graphic/Fast3D/gfx_pc.cpp index d7b43eaac..0e7289d37 100644 --- a/src/graphic/Fast3D/gfx_pc.cpp +++ b/src/graphic/Fast3D/gfx_pc.cpp @@ -33,7 +33,6 @@ #include "log/luslog.h" #include "window/gui/Gui.h" -#include "resource/GameVersions.h" #include "resource/ResourceManager.h" #include "utils/Utils.h" #include "Context.h" diff --git a/src/resource/GameVersions.h b/src/resource/GameVersions.h deleted file mode 100644 index ce532d2eb..000000000 --- a/src/resource/GameVersions.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef GAME_VERSION_H -#define GAME_VERSION_H - -#pragma once - -#define OOT_NTSC_US_10 0xEC7011B7 -#define OOT_NTSC_US_11 0xD43DA81F -#define OOT_NTSC_US_12 0x693BA2AE -// #define OOT_NTSC_JP_10 ? -// #define OOT_NTSC_JP_11 ? -// #define OOT_NTSC_JP_12 ? -#define OOT_PAL_10 0xB044B569 -#define OOT_PAL_11 0xB2055FBD -#define OOT_NTSC_JP_GC_CE 0xF7F52DB8 -#define OOT_NTSC_JP_GC 0xF611F4BA -#define OOT_NTSC_US_GC 0xF3DD35BA -#define OOT_PAL_GC 0x09465AC3 -#define OOT_NTSC_JP_MQ 0xF43B45BA -#define OOT_NTSC_US_MQ 0xF034001A -#define OOT_PAL_MQ 0x1D4136F3 -#define OOT_PAL_GC_DBG1 0x871E1C92 // 03-21-2002 build -#define OOT_PAL_GC_DBG2 0x87121EFE // 03-13-2002 build -#define OOT_PAL_GC_MQ_DBG 0x917D18F6 -#define OOT_IQUE_TW 0x3D81FB3E -#define OOT_IQUE_CN 0xB1E1E07B -#define UNKNOWN_GAME_VERSION 0xFFFFFFFF - -#endif diff --git a/src/resource/archive/Archive.cpp b/src/resource/archive/Archive.cpp index cc855d6ba..9d3f14559 100644 --- a/src/resource/archive/Archive.cpp +++ b/src/resource/archive/Archive.cpp @@ -3,7 +3,6 @@ #include "spdlog/spdlog.h" #include "Context.h" -#include "resource/GameVersions.h" #include "resource/File.h" #include "resource/ResourceLoader.h" #include "utils/binarytools/MemoryStream.h" @@ -13,7 +12,7 @@ namespace Ship { Archive::Archive(const std::string& path) - : mIsLoaded(false), mHasGameVersion(false), mGameVersion(UNKNOWN_GAME_VERSION), mPath(path) { + : mIsLoaded(false), mHasGameVersion(false), mGameVersion(0xFFFFFFFF), mPath(path) { mHashes = std::make_shared>(); }