Fixed compile and some warnings in MSVS
parent
9d1c9097e3
commit
c68bdaf34b
|
@ -88,7 +88,7 @@ public:
|
|||
default:
|
||||
{
|
||||
ASSERT(!"Unhandled block meta!");
|
||||
return 0;
|
||||
return BLOCK_FACE_NONE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -88,7 +88,7 @@ public:
|
|||
default:
|
||||
{
|
||||
ASSERT(!"Unhandled block meta!");
|
||||
return 0;
|
||||
return BLOCK_FACE_NONE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -84,7 +84,7 @@ public:
|
|||
default:
|
||||
{
|
||||
ASSERT(!"Unhandled block meta!");
|
||||
return 0;
|
||||
return BLOCK_FACE_NONE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -60,15 +60,6 @@ template <typename T> T Clamp(T a_Value, T a_Min, T a_Max)
|
|||
|
||||
|
||||
|
||||
static bool SortTreeBlocks(const sSetBlock & a_First, const sSetBlock & a_Second)
|
||||
{
|
||||
return (a_First.BlockType == E_BLOCK_LOG) && (a_Second.BlockType != E_BLOCK_LOG);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// cStructGenTrees:
|
||||
|
||||
|
|
|
@ -126,7 +126,7 @@ cMonster::eType cMobSpawner::ChooseMobType(EMCSBiome a_Biome)
|
|||
|
||||
bool cMobSpawner::CanSpawnHere(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_RelZ, cMonster::eType a_MobType, EMCSBiome a_Biome)
|
||||
{
|
||||
BLOCKTYPE TargetBlock;
|
||||
BLOCKTYPE TargetBlock = E_BLOCK_AIR;
|
||||
if (m_AllowedTypes.find(a_MobType) != m_AllowedTypes.end() && a_Chunk->UnboundedRelGetBlockType(a_RelX, a_RelY, a_RelZ, TargetBlock))
|
||||
{
|
||||
NIBBLETYPE BlockLight = a_Chunk->GetBlockLight(a_RelX, a_RelY, a_RelZ);
|
||||
|
|
|
@ -251,10 +251,8 @@ cWorld::cWorld(const AString & a_WorldName) :
|
|||
m_Scoreboard(this),
|
||||
m_GeneratorCallbacks(*this),
|
||||
m_TickThread(*this),
|
||||
m_Scoreboard(this),
|
||||
m_bCommandBlocksEnabled(false),
|
||||
m_bUseChatPrefixes(true)
|
||||
m_TickThread(*this)
|
||||
{
|
||||
LOGD("cWorld::cWorld(\"%s\")", a_WorldName.c_str());
|
||||
|
||||
|
|
|
@ -242,7 +242,7 @@ bool cScoreboardSerializer::LoadScoreboardFromNBT(const cParsedNBT & a_NBT)
|
|||
{
|
||||
AString Name, ObjectiveName;
|
||||
|
||||
cObjective::Score Score;
|
||||
cObjective::Score Score = 0;
|
||||
|
||||
int CurrLine = a_NBT.FindChildByName(Child, "Score");
|
||||
if (CurrLine >= 0)
|
||||
|
@ -280,7 +280,7 @@ bool cScoreboardSerializer::LoadScoreboardFromNBT(const cParsedNBT & a_NBT)
|
|||
{
|
||||
AString Name, DisplayName, Prefix, Suffix;
|
||||
|
||||
bool AllowsFriendlyFire, CanSeeFriendlyInvisible;
|
||||
bool AllowsFriendlyFire = false, CanSeeFriendlyInvisible = false;
|
||||
|
||||
int CurrLine = a_NBT.FindChildByName(Child, "Name");
|
||||
if (CurrLine >= 0)
|
||||
|
|
Loading…
Reference in New Issue