flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed compile and some warnings in MSVS

Browse Source
This commit is contained in:
Tiger Wang 2014-02-09 00:57:22 +00:00
parent 9d1c9097e3
commit c68bdaf34b
7 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Blocks/BlockButton.h
View File

@ -88,7 +88,7 @@ public:
default:
{
ASSERT(!"Unhandled block meta!");
return 0;
return BLOCK_FACE_NONE;
}
}
}

2
src/Blocks/BlockLever.h
View File

@ -88,7 +88,7 @@ public:
default:
{
ASSERT(!"Unhandled block meta!");
return 0;
return BLOCK_FACE_NONE;
}
}
}

2
src/Blocks/BlockTrapdoor.h
View File

@ -84,7 +84,7 @@ public:
default:
{
ASSERT(!"Unhandled block meta!");
return 0;
return BLOCK_FACE_NONE;
}
}
}

9
src/Generating/StructGen.cpp
View File

@ -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:

2
src/MobSpawner.cpp
View File

@ -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);

2
src/World.cpp
View File

@ -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());

4
src/WorldStorage/ScoreboardSerializer.cpp
View File

@ -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)