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

Fixed a few more switch warnings.

Browse Source
This commit is contained in:
archshift 2014-05-11 16:25:21 -07:00 committed by archshift
parent 6c57b38b74
commit 3f9e00a3f3
3 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Generating/StructGen.cpp
View File

@ -596,24 +596,22 @@ void cStructGenDirectOverhangs::GenFinish(cChunkDesc & a_ChunkDesc)
// Interpolate between FloorLo and FloorHi: // Interpolate between FloorLo and FloorHi:
for (int z = 0; z < 16; z++) for (int x = 0; x < 16; x++) for (int z = 0; z < 16; z++) for (int x = 0; x < 16; x++)
{ {
switch (a_ChunkDesc.GetBiome(x, z)) EMCSBiome biome = a_ChunkDesc.GetBiome(x, z);
if ((biome == biExtremeHills) || (biome == biExtremeHillsEdge))
{ {
case biExtremeHills: int Lo = FloorLo[x + 17 * z] / 256;
case biExtremeHillsEdge: int Hi = FloorHi[x + 17 * z] / 256;
for (int y = 0; y < SEGMENT_HEIGHT; y++)
{ {
int Lo = FloorLo[x + 17 * z] / 256; int Val = Lo + (Hi - Lo) * y / SEGMENT_HEIGHT;
int Hi = FloorHi[x + 17 * z] / 256; if (Val < 0)
for (int y = 0; y < SEGMENT_HEIGHT; y++)
{ {
int Val = Lo + (Hi - Lo) * y / SEGMENT_HEIGHT; a_ChunkDesc.SetBlockType(x, y + Segment, z, E_BLOCK_AIR);
if (Val < 0) }
{ } // for y
a_ChunkDesc.SetBlockType(x, y + Segment, z, E_BLOCK_AIR); break;
} } // if (biome)
} // for y
break;
}
} // switch (biome)
} // for z, x } // for z, x
// Swap the floors: // Swap the floors:

2
src/Mobs/Monster.cpp
View File

@ -355,6 +355,8 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
InStateEscaping(a_Dt); InStateEscaping(a_Dt);
break; break;
} }
case ATTACKING: break;
} // switch (m_EMState) } // switch (m_EMState)
BroadcastMovementUpdate(); BroadcastMovementUpdate();

37
src/WorldStorage/NBTChunkSerializer.cpp
View File

@ -391,38 +391,41 @@ void cNBTChunkSerializer::AddFallingBlockEntity(cFallingBlock * a_FallingBlock)
void cNBTChunkSerializer::AddMinecartEntity(cMinecart * a_Minecart) void cNBTChunkSerializer::AddMinecartEntity(cMinecart * a_Minecart)
{ {
const char * EntityClass = NULL;
switch (a_Minecart->GetPayload())
{
case cMinecart::mpNone: EntityClass = "MinecartRideable"; break;
case cMinecart::mpChest: EntityClass = "MinecartChest"; break;
case cMinecart::mpFurnace: EntityClass = "MinecartFurnace"; break;
case cMinecart::mpTNT: EntityClass = "MinecartTNT"; break;
case cMinecart::mpHopper: EntityClass = "MinecartHopper"; break;
default:
{
ASSERT(!"Unhandled minecart payload type");
return;
}
} // switch (payload)
m_Writer.BeginCompound(""); m_Writer.BeginCompound("");
AddBasicEntity(a_Minecart, EntityClass);
switch (a_Minecart->GetPayload()) switch (a_Minecart->GetPayload())
{ {
case cMinecart::mpChest: case cMinecart::mpChest:
{ {
AddBasicEntity(a_Minecart, "MinecartChest");
// Add chest contents into the Items tag: // Add chest contents into the Items tag:
AddMinecartChestContents((cMinecartWithChest *)a_Minecart); AddMinecartChestContents((cMinecartWithChest *)a_Minecart);
break; break;
} }
case cMinecart::mpFurnace: case cMinecart::mpFurnace:
{ {
AddBasicEntity(a_Minecart, "MinecartFurnace");
// TODO: Add "Push" and "Fuel" tags // TODO: Add "Push" and "Fuel" tags
break; break;
} }
case cMinecart::mpHopper:
{
AddBasicEntity(a_Minecart, "MinecartHopper");
// TODO: Add hopper contents?
break;
}
case cMinecart::mpTNT:
{
AddBasicEntity(a_Minecart, "MinecartTNT");
break;
}
case cMinecart::mpNone:
{
AddBasicEntity(a_Minecart, "MinecartRideable");
break;
}
} // switch (Payload) } // switch (Payload)
m_Writer.EndCompound(); m_Writer.EndCompound();
} }