BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Small CAO improvements

Browse Source 
-> remove the old parent as @kahrl suggested
-> use indices no iterator as @kwolekr suggested
This commit is contained in:
est31 2015-06-20 06:58:07 +02:00
parent 70da8a940b
commit 14f4cd0ef9
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/content_cao.cpp
View File

@ -728,9 +728,8 @@ scene::IBillboardSceneNode* GenericCAO::getSpriteSceneNode()
void GenericCAO::setChildrenVisible(bool toset) void GenericCAO::setChildrenVisible(bool toset)
{ {
for (std::vector<u16>::iterator ci = m_children.begin(); for (std::vector<u16>::size_type i = 0; i < m_children.size(); i++) {
ci != m_children.end(); ci++) { GenericCAO *obj = m_env->getGenericCAO(m_children[i]);
GenericCAO *obj = m_env->getGenericCAO(*ci);
if (obj) { if (obj) {
obj->setVisible(toset); obj->setVisible(toset);
} }
@ -760,11 +759,10 @@ void GenericCAO::removeFromScene(bool permanent)
// Should be true when removing the object permanently and false when refreshing (eg: updating visuals) // Should be true when removing the object permanently and false when refreshing (eg: updating visuals)
if((m_env != NULL) && (permanent)) if((m_env != NULL) && (permanent))
{ {
for(std::vector<u16>::iterator ci = m_children.begin(); for (std::vector<u16>::size_type i = 0; i < m_children.size(); i++) {
ci != m_children.end(); ci++) u16 ci = m_children[i];
{ if (m_env->attachement_parent_ids[ci] == getId()) {
if (m_env->attachement_parent_ids[*ci] == getId()) { m_env->attachement_parent_ids[ci] = 0;
m_env->attachement_parent_ids[*ci] = 0;
} }
} }
@ -1127,11 +1125,9 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
addToScene(m_smgr, m_gamedef->tsrc(), m_irr); addToScene(m_smgr, m_gamedef->tsrc(), m_irr);
// Attachments, part 2: Now that the parent has been refreshed, put its attachments back // Attachments, part 2: Now that the parent has been refreshed, put its attachments back
for(std::vector<u16>::iterator ci = m_children.begin(); for (std::vector<u16>::size_type i = 0; i < m_children.size(); i++) {
ci != m_children.end(); ci++)
{
// Get the object of the child // Get the object of the child
ClientActiveObject *obj = m_env->getActiveObject(*ci); ClientActiveObject *obj = m_env->getActiveObject(m_children[i]);
if (obj) if (obj)
obj->setAttachments(); obj->setAttachments();
} }
@ -1670,6 +1666,11 @@ void GenericCAO::processMessage(const std::string &data)
updateBonePosition(); updateBonePosition();
} else if (cmd == GENERIC_CMD_ATTACH_TO) { } else if (cmd == GENERIC_CMD_ATTACH_TO) {
u16 parentID = readS16(is); u16 parentID = readS16(is);
u16 oldparent = m_env->attachement_parent_ids[getId()];
if (oldparent) {
m_children.erase(std::remove(m_children.begin(), m_children.end(),
getId()), m_children.end());
}
m_env->attachement_parent_ids[getId()] = parentID; m_env->attachement_parent_ids[getId()] = parentID;
GenericCAO *parentobj = m_env->getGenericCAO(parentID); GenericCAO *parentobj = m_env->getGenericCAO(parentID);