Merge 7b3f0cfdab into 108e3dc233
This commit is contained in:
commit
092dee18a9
5 changed files with 15 additions and 4 deletions
|
|
@ -485,7 +485,7 @@ void PlayerRenderer::additionalRendering(shared_ptr<LivingEntity> _mob, float a)
|
|||
}
|
||||
}
|
||||
|
||||
void PlayerRenderer::renderNameTags(shared_ptr<LivingEntity> player, double x, double y, double z, wstring msg, float scale, double dist)
|
||||
void PlayerRenderer::renderNameTags(shared_ptr<LivingEntity> player, double x, double y, double z, const wstring& msg, float scale, double dist)
|
||||
{
|
||||
#if 0
|
||||
if (dist < 10 * 10)
|
||||
|
|
@ -511,6 +511,13 @@ void PlayerRenderer::renderNameTags(shared_ptr<LivingEntity> player, double x, d
|
|||
}
|
||||
#endif
|
||||
|
||||
if (player->instanceof(eTYPE_PLAYER)) {
|
||||
shared_ptr<Player> p = dynamic_pointer_cast<Player>(player);
|
||||
p->nametagColor = getNametagColour(p->getPlayerIndex());
|
||||
}
|
||||
else {
|
||||
player->nametagColor = 0xFF000000;
|
||||
}
|
||||
LivingEntityRenderer::renderNameTags(player, x, y, z, msg, scale, dist);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue