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 a9be52c41a.
This commit is contained in:
@@ -14,52 +14,29 @@ private:
|
||||
bool m_hasData;
|
||||
|
||||
public:
|
||||
bool requiresTexturePack() override
|
||||
{return m_bRequiresTexturePack;}
|
||||
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";}
|
||||
|
||||
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 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; }
|
||||
};
|
||||
Reference in New Issue
Block a user