mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-08-20 09:57:10 +00:00
fix(hack): temporarily restore tutorial world functionality using old GameRuleManager logic
This commit is contained in:
parent
7e27377d46
commit
1f32cfb206
|
|
@ -656,6 +656,7 @@ void GameRuleManager::loadDefaultGameRules() {
|
||||||
|
|
||||||
#else // _XBOX
|
#else // _XBOX
|
||||||
|
|
||||||
|
#ifndef __linux__
|
||||||
#ifdef _WINDOWS64
|
#ifdef _WINDOWS64
|
||||||
File packedTutorialFile(L"Windows64Media\\Tutorial\\Tutorial.pck");
|
File packedTutorialFile(L"Windows64Media\\Tutorial\\Tutorial.pck");
|
||||||
if (!packedTutorialFile.exists())
|
if (!packedTutorialFile.exists())
|
||||||
|
|
@ -676,7 +677,7 @@ void GameRuleManager::loadDefaultGameRules() {
|
||||||
m_levelGenerators.getLevelGenerators()->at(0)->setDefaultSaveName(
|
m_levelGenerators.getLevelGenerators()->at(0)->setDefaultSaveName(
|
||||||
app.GetString(IDS_TUTORIALSAVENAME));
|
app.GetString(IDS_TUTORIALSAVENAME));
|
||||||
}
|
}
|
||||||
#if 0
|
#else // 4jcraft, TODO this is using old pre-TU19 logic for loading the tutorial, modify to use the above ifdefs
|
||||||
std::wstring fpTutorial = L"Tutorial.pck";
|
std::wstring fpTutorial = L"Tutorial.pck";
|
||||||
if(app.getArchiveFileSize(fpTutorial) >= 0)
|
if(app.getArchiveFileSize(fpTutorial) >= 0)
|
||||||
{
|
{
|
||||||
|
|
@ -685,8 +686,8 @@ void GameRuleManager::loadDefaultGameRules() {
|
||||||
if ( app.m_dlcManager.readDLCDataFile(dwFilesProcessed,fpTutorial,pack,true) )
|
if ( app.m_dlcManager.readDLCDataFile(dwFilesProcessed,fpTutorial,pack,true) )
|
||||||
{
|
{
|
||||||
app.m_dlcManager.addPack(pack);
|
app.m_dlcManager.addPack(pack);
|
||||||
//m_levelGenerators.getLevelGenerators()->at(0)->setWorldName(app.GetString(IDS_PLAY_TUTORIAL));
|
m_levelGenerators.getLevelGenerators()->at(0)->setWorldName(app.GetString(IDS_PLAY_TUTORIAL));
|
||||||
//m_levelGenerators.getLevelGenerators()->at(0)->setDefaultSaveName(app.GetString(IDS_TUTORIALSAVENAME));
|
m_levelGenerators.getLevelGenerators()->at(0)->setDefaultSaveName(app.GetString(IDS_TUTORIALSAVENAME));
|
||||||
}
|
}
|
||||||
else delete pack;
|
else delete pack;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue