diff options
| author | Loki Rautio <lokirautio@gmail.com> | 2026-03-07 21:12:22 -0600 |
|---|---|---|
| committer | Loki Rautio <lokirautio@gmail.com> | 2026-03-07 21:12:22 -0600 |
| commit | 087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch) | |
| tree | 69454763e73ca764af4e682d3573080b13138a0e /Minecraft.Client/Common/DLC/DLCGameRulesHeader.h | |
| parent | a9be52c41a02d207233199e98898fe7483d7e817 (diff) | |
Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a02d207233199e98898fe7483d7e817.
Diffstat (limited to 'Minecraft.Client/Common/DLC/DLCGameRulesHeader.h')
| -rw-r--r-- | Minecraft.Client/Common/DLC/DLCGameRulesHeader.h | 55 |
1 files changed, 16 insertions, 39 deletions
diff --git a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h index 7409540d..4521ae11 100644 --- a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h +++ b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h @@ -14,52 +14,29 @@ private: bool m_hasData; public: - bool requiresTexturePack() override - {return m_bRequiresTexturePack;} - - UINT getRequiredTexturePackId() override - {return m_requiredTexturePackId;} - - wstring getDefaultSaveName() override - {return m_defaultSaveName;} - - LPCWSTR getWorldName() override - {return m_worldName.c_str();} - - LPCWSTR getDisplayName() override - {return m_displayName.c_str();} - - wstring getGrfPath() override - {return L"GameRules.grf";} - - void setRequiresTexturePack(bool x) override - {m_bRequiresTexturePack = x;} - - void setRequiredTexturePackId(UINT x) override - {m_requiredTexturePackId = x;} - - void setDefaultSaveName(const wstring &x) override - {m_defaultSaveName = x;} - - void setWorldName(const wstring & x) override - {m_worldName = x;} - - void setDisplayName(const wstring & x) override - {m_displayName = x;} - - void setGrfPath(const wstring & x) override - {m_grfPath = x;} + virtual bool requiresTexturePack() {return m_bRequiresTexturePack;} + virtual UINT getRequiredTexturePackId() {return m_requiredTexturePackId;} + virtual wstring getDefaultSaveName() {return m_defaultSaveName;} + virtual LPCWSTR getWorldName() {return m_worldName.c_str();} + virtual LPCWSTR getDisplayName() {return m_displayName.c_str();} + virtual wstring getGrfPath() {return L"GameRules.grf";} + + virtual void setRequiresTexturePack(bool x) {m_bRequiresTexturePack = x;} + virtual void setRequiredTexturePackId(UINT x) {m_requiredTexturePackId = x;} + virtual void setDefaultSaveName(const wstring &x) {m_defaultSaveName = x;} + virtual void setWorldName(const wstring & x) {m_worldName = x;} + virtual void setDisplayName(const wstring & x) {m_displayName = x;} + virtual void setGrfPath(const wstring & x) {m_grfPath = x;} LevelGenerationOptions *lgo; public: DLCGameRulesHeader(const wstring &path); - void addData(PBYTE pbData, DWORD dwBytes) override; - PBYTE getData(DWORD &dwBytes) override; + virtual void addData(PBYTE pbData, DWORD dwBytes); + virtual PBYTE getData(DWORD &dwBytes); void setGrfData(PBYTE fData, DWORD fSize, StringTable *); - bool ready() override - { return m_hasData; } + virtual bool ready() { return m_hasData; } };
\ No newline at end of file |
