Fixed a bunch of MSVS warnings
* Possibly also fixed some bugs with pathfinding and TNT, though unlikely
This commit is contained in:
parent
9eeeb91fa6
commit
630507fd5b
@ -88,7 +88,7 @@ public:
|
|||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
ASSERT(!"Unhandled block meta!");
|
ASSERT(!"Unhandled block meta!");
|
||||||
return BLOCK_FACE_NONE;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -88,7 +88,7 @@ public:
|
|||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
ASSERT(!"Unhandled block meta!");
|
ASSERT(!"Unhandled block meta!");
|
||||||
return BLOCK_FACE_NONE;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -68,7 +68,7 @@ public:
|
|||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
ASSERT(!"Unhandled block face!");
|
ASSERT(!"Unhandled block face!");
|
||||||
return 0x0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -84,7 +84,7 @@ public:
|
|||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
ASSERT(!"Unhandled block meta!");
|
ASSERT(!"Unhandled block meta!");
|
||||||
return BLOCK_FACE_NONE;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1839,7 +1839,7 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
|
|||||||
bbTNT.Expand(ExplosionSizeInt * 2, ExplosionSizeInt * 2, ExplosionSizeInt * 2);
|
bbTNT.Expand(ExplosionSizeInt * 2, ExplosionSizeInt * 2, ExplosionSizeInt * 2);
|
||||||
|
|
||||||
|
|
||||||
cTNTDamageCallback TNTDamageCallback(bbTNT, Vector3d(a_BlockX, a_BlockY, a_BlockZ), a_ExplosionSize, ExplosionSizeSq);
|
cTNTDamageCallback TNTDamageCallback(bbTNT, Vector3d(a_BlockX, a_BlockY, a_BlockZ), a_ExplosionSizeInt, ExplosionSizeSq);
|
||||||
ForEachEntity(TNTDamageCallback);
|
ForEachEntity(TNTDamageCallback);
|
||||||
|
|
||||||
// Wake up all simulators for the area, so that water and lava flows and sand falls into the blasted holes (FS #391):
|
// Wake up all simulators for the area, so that water and lava flows and sand falls into the blasted holes (FS #391):
|
||||||
|
@ -264,7 +264,7 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
{
|
{
|
||||||
m_Destination.y = FindFirstNonAirBlockPosition(m_Destination.x, m_Destination.z);
|
m_Destination.y = FindFirstNonAirBlockPosition(m_Destination.x, m_Destination.z);
|
||||||
|
|
||||||
if (DoesPosYRequireJump(m_Destination.y))
|
if (DoesPosYRequireJump((int)floor(m_Destination.y)))
|
||||||
{
|
{
|
||||||
m_bOnGround = false;
|
m_bOnGround = false;
|
||||||
AddPosY(1.5); // Jump!!
|
AddPosY(1.5); // Jump!!
|
||||||
|
@ -2435,7 +2435,8 @@ void cProtocol172::cPacketizer::WriteEntityProperties(const cEntity & a_Entity)
|
|||||||
WriteInt(0);
|
WriteInt(0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const cMonster & Mob = (const cMonster &)a_Entity;
|
|
||||||
|
//const cMonster & Mob = (const cMonster &)a_Entity;
|
||||||
|
|
||||||
// TODO: Send properties and modifiers based on the mob type
|
// TODO: Send properties and modifiers based on the mob type
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user