Skip to content

Commit 103d9c5

Browse files
committedDec 7, 2019
Renaming the function wasn't enough
1 parent aa8df11 commit 103d9c5

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed
 

Diff for: ‎src/client/content_cao.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
588588
};
589589

590590
if (m_prop.visual == "sprite") {
591-
getMatrixNode();
591+
grabMatrixNode();
592592
m_spritenode = RenderingEngine::get_scene_manager()->addBillboardSceneNode(
593593
m_matrixnode, v2f(1, 1), v3f(0,0,0), -1);
594594
m_spritenode->grab();
@@ -609,7 +609,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
609609
txs, tys, 0, 0);
610610
}
611611
} else if (m_prop.visual == "upright_sprite") {
612-
getMatrixNode();
612+
grabMatrixNode();
613613
scene::SMesh *mesh = new scene::SMesh();
614614
double dx = BS * m_prop.visual_size.X / 2;
615615
double dy = BS * m_prop.visual_size.Y / 2;
@@ -672,7 +672,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
672672
// This is needed for changing the texture in the future
673673
m_meshnode->setReadOnlyMaterials(true);
674674
} else if (m_prop.visual == "cube") {
675-
getMatrixNode();
675+
grabMatrixNode();
676676
scene::IMesh *mesh = createCubeMesh(v3f(BS,BS,BS));
677677
m_meshnode = RenderingEngine::get_scene_manager()->
678678
addMeshSceneNode(mesh, m_matrixnode);
@@ -688,7 +688,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
688688
m_meshnode->setMaterialType(material_type);
689689
m_meshnode->setMaterialFlag(video::EMF_FOG_ENABLE, true);
690690
} else if (m_prop.visual == "mesh") {
691-
getMatrixNode();
691+
grabMatrixNode();
692692
scene::IAnimatedMesh *mesh = m_client->getMesh(m_prop.mesh, true);
693693
if (mesh) {
694694
m_animated_meshnode = RenderingEngine::get_scene_manager()->
@@ -713,7 +713,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
713713
} else
714714
errorstream<<"GenericCAO::addToScene(): Could not load mesh "<<m_prop.mesh<<std::endl;
715715
} else if (m_prop.visual == "wielditem" || m_prop.visual == "item") {
716-
getMatrixNode();
716+
grabMatrixNode();
717717
ItemStack item;
718718
if (m_prop.wield_item.empty()) {
719719
// Old format, only textures are specified.

0 commit comments

Comments
 (0)
Please sign in to comment.