AstralTransRocketries/LucidCube
1
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

fixed compile error in jenkins and more warnings

Browse Source
This commit is contained in:
x12xx12x 2021-11-26 09:25:44 +01:00 committed by Alexander Harkness
parent 250b8eb652
commit 2ec73a3fbd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Generating/FinishGen.cpp
View File

@ -1822,7 +1822,7 @@ cFinishGenOres::OreInfos cFinishGenOres::OreInfosFromString(const AString & a_Or
);
continue;
}
auto oreType = static_cast<BLOCKTYPE>(BlockStringToType(parts[0]));
auto oreType = BlockStringToType(parts[0]);
if (oreType < 0)
{
LOGWARNING("Cannot parse ore information from string, invalid OreType: \"%s\".", parts[0].c_str());
@ -1840,7 +1840,7 @@ cFinishGenOres::OreInfos cFinishGenOres::OreInfosFromString(const AString & a_Or
LOGWARNING("Cannot parse ore information from string, invalid number in OreInfo \"%s\".", ore.c_str());
continue;
}
res.emplace_back(oreType, oreMeta, maxHeight, numNests, nestSize);
res.emplace_back(static_cast<BLOCKTYPE>(oreType), oreMeta, maxHeight, numNests, nestSize);
} // for i - split[]
return res;
}

2
src/LightingThread.cpp
View File

@ -359,7 +359,7 @@ void cLightingThread::PrepareSkyLight(void)
// Fill the top of the chunk with all-light:
if (m_MaxHeight < cChunkDef::Height - 1)
{
std::fill(m_SkyLight + (m_MaxHeight + 1) * BlocksPerYLayer, m_SkyLight + ARRAYCOUNT(m_SkyLight), 15);
std::fill(m_SkyLight + (m_MaxHeight + 1) * BlocksPerYLayer, m_SkyLight + ARRAYCOUNT(m_SkyLight), NIBBLETYPE(15));
}
// Walk every column that has all XZ neighbors

2
src/LineBlockTracer.cpp
View File

@ -334,7 +334,7 @@ bool cLineBlockTracer::ChunkCallback(cChunk * a_Chunk)
return false;
}
}
else if (m_Callbacks->OnNextBlockNoData(m_Current, m_CurrentFace))
else if (m_Callbacks->OnNextBlockNoData(m_Current, static_cast<char>(m_CurrentFace)))
{
// The callback terminated the trace
return false;