Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove AUTO_VAR macro and _toString function (#592)

Browse Source
This commit is contained in:
void_17
2026-03-06 02:11:18 +07:00
committed by GitHub
parent 7d6658fe5b
commit 55231bb8d3
294 changed files with 5067 additions and 5773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Minecraft.World/HangingEntity.cpp
View File

@@ -10,7 +10,7 @@
void HangingEntity::_init(Level *level)
{
{
checkInterval = 0;
dir = 0;
xTile = yTile = zTile = 0;
@@ -32,7 +32,7 @@ HangingEntity::HangingEntity(Level *level, int xTile, int yTile, int zTile, int
this->zTile = zTile;
}
void HangingEntity::setDir(int dir)
void HangingEntity::setDir(int dir)
{
this->dir = dir;
yRotO = yRot = (float)(dir * 90);
@@ -41,12 +41,12 @@ void HangingEntity::setDir(int dir)
float h = (float)getHeight();
float d = (float)getWidth();
if (dir == Direction::NORTH || dir == Direction::SOUTH)
if (dir == Direction::NORTH || dir == Direction::SOUTH)
{
d = 0.5f;
yRot = yRotO = (float)(Direction::DIRECTION_OPPOSITE[dir] * 90);
}
else
}
else
{
w = 0.5f;
}
@@ -86,14 +86,14 @@ void HangingEntity::setDir(int dir)
bb->set(min(x0,x1), min(y0,y1), min(z0,z1), max(x0,x1), max(y0,y1), max(z0,z1));
}
float HangingEntity::offs(int w)
float HangingEntity::offs(int w)
{
if (w == 32) return 0.5f;
if (w == 64) return 0.5f;
return 0.0f;
}
void HangingEntity::tick()
void HangingEntity::tick()
{
xo = x;
yo = y;
@@ -101,7 +101,7 @@ void HangingEntity::tick()
if (checkInterval++ == 20 * 5 && !level->isClientSide)
{
checkInterval = 0;
if (!removed && !survives())
if (!removed && !survives())
{
remove();
dropItem(nullptr);
@@ -109,13 +109,13 @@ void HangingEntity::tick()
}
}
bool HangingEntity::survives()
bool HangingEntity::survives()
{
if (level->getCubes(shared_from_this(), bb)->size()!=0)//isEmpty())
if (level->getCubes(shared_from_this(), bb)->size()!=0)//isEmpty())
{
return false;
}
else
}
else
{
int ws = max(1, getWidth() / 16);
int hs = max(1, getHeight() / 16);
@@ -131,18 +131,18 @@ bool HangingEntity::survives()
for (int ss = 0; ss < ws; ss++)
{
for (int yy = 0; yy < hs; yy++)
for (int yy = 0; yy < hs; yy++)
{
Material *m;
if (dir == Direction::NORTH || dir == Direction::SOUTH)
if (dir == Direction::NORTH || dir == Direction::SOUTH)
{
m = level->getMaterial(xt + ss, yt + yy, zTile);
}
else
}
else
{
m = level->getMaterial(xTile, yt + yy, zt + ss);
}
if (!m->isSolid())
if (!m->isSolid())
{
return false;
}
@@ -152,11 +152,9 @@ bool HangingEntity::survives()
if (entities != NULL && entities->size() > 0)
{
AUTO_VAR(itEnd, entities->end());
for (AUTO_VAR(it, entities->begin()); it != itEnd; it++)
for (auto& e : *entities)
{
shared_ptr<Entity> e = (*it);
if( e->instanceof(eTYPE_HANGING_ENTITY) )
if( e && e->instanceof(eTYPE_HANGING_ENTITY) )
{
return false;
}
@@ -167,12 +165,12 @@ bool HangingEntity::survives()
return true;
}
bool HangingEntity::isPickable()
bool HangingEntity::isPickable()
{
return true;
}
bool HangingEntity::skipAttackInteraction(shared_ptr<Entity> source)
bool HangingEntity::skipAttackInteraction(shared_ptr<Entity> source)
{
if(source->GetType()==eTYPE_PLAYER)
{
@@ -181,10 +179,10 @@ bool HangingEntity::skipAttackInteraction(shared_ptr<Entity> source)
return false;
}
bool HangingEntity::hurt(DamageSource *source, float damage)
bool HangingEntity::hurt(DamageSource *source, float damage)
{
if (isInvulnerable()) return false;
if (!removed && !level->isClientSide)
if (!removed && !level->isClientSide)
{
if (dynamic_cast<EntityDamageSource *>(source) != NULL)
{
@@ -206,7 +204,7 @@ bool HangingEntity::hurt(DamageSource *source, float damage)
player = dynamic_pointer_cast<Player>( e );
}
if (player != NULL && player->abilities.instabuild)
if (player != NULL && player->abilities.instabuild)
{
return true;
}
@@ -217,25 +215,25 @@ bool HangingEntity::hurt(DamageSource *source, float damage)
}
// 4J - added noEntityCubes parameter
void HangingEntity::move(double xa, double ya, double za, bool noEntityCubes)
void HangingEntity::move(double xa, double ya, double za, bool noEntityCubes)
{
if (!level->isClientSide && !removed && (xa * xa + ya * ya + za * za) > 0)
if (!level->isClientSide && !removed && (xa * xa + ya * ya + za * za) > 0)
{
remove();
dropItem(nullptr);
}
}
void HangingEntity::push(double xa, double ya, double za)
void HangingEntity::push(double xa, double ya, double za)
{
if (!level->isClientSide && !removed && (xa * xa + ya * ya + za * za) > 0)
if (!level->isClientSide && !removed && (xa * xa + ya * ya + za * za) > 0)
{
remove();
dropItem(nullptr);
}
}
void HangingEntity::addAdditonalSaveData(CompoundTag *tag)
void HangingEntity::addAdditonalSaveData(CompoundTag *tag)
{
tag->putByte(L"Direction", (byte) dir);
tag->putInt(L"TileX", xTile);
@@ -243,7 +241,7 @@ void HangingEntity::addAdditonalSaveData(CompoundTag *tag)
tag->putInt(L"TileZ", zTile);
// Back compat
switch (dir)
switch (dir)
{
case Direction::NORTH:
tag->putByte(L"Dir", (byte) 0);
@@ -260,15 +258,15 @@ void HangingEntity::addAdditonalSaveData(CompoundTag *tag)
}
}
void HangingEntity::readAdditionalSaveData(CompoundTag *tag)
void HangingEntity::readAdditionalSaveData(CompoundTag *tag)
{
if (tag->contains(L"Direction"))
if (tag->contains(L"Direction"))
{
dir = tag->getByte(L"Direction");
}
else
}
else
{
switch (tag->getByte(L"Dir"))
switch (tag->getByte(L"Dir"))
{
case 0:
dir = Direction::NORTH;