Spare some string copies

est31 · est31 · commit 21878c9d5c36 · 2015-05-27T11:45:40.000+02:00
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
@@ -541,13 +541,13 @@ void LuaEntitySAO::setAnimation(v2f frame_range, float frame_speed, float frame_
 	m_animation_sent = false;
 }
 
-void LuaEntitySAO::setBonePosition(std::string bone, v3f position, v3f rotation)
+void LuaEntitySAO::setBonePosition(const std::string &bone, v3f position, v3f rotation)
 {
 	m_bone_position[bone] = core::vector2d<v3f>(position, rotation);
 	m_bone_position_sent = false;
 }
 
-void LuaEntitySAO::setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
+void LuaEntitySAO::setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation)
 {
 	// Attachments need to be handled on both the server and client.
 	// If we just attach on the server, we can only copy the position of the parent. Attachments
@@ -1142,14 +1142,14 @@ void PlayerSAO::setAnimation(v2f frame_range, float frame_speed, float frame_ble
 	m_animation_sent = false;
 }
 
-void PlayerSAO::setBonePosition(std::string bone, v3f position, v3f rotation)
+void PlayerSAO::setBonePosition(const std::string &bone, v3f position, v3f rotation)
 {
 	// store these so they can be updated to clients
 	m_bone_position[bone] = core::vector2d<v3f>(position, rotation);
 	m_bone_position_sent = false;
 }
 
-void PlayerSAO::setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
+void PlayerSAO::setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation)
 {
 	// Attachments need to be handled on both the server and client.
 	// If we just attach on the server, we can only copy the position of the parent. Attachments
diff --git a/src/content_sao.h b/src/content_sao.h
@@ -59,8 +59,8 @@ class LuaEntitySAO : public ServerActiveObject
 	s16 getHP() const;
 	void setArmorGroups(const ItemGroupList &armor_groups);
 	void setAnimation(v2f frame_range, float frame_speed, float frame_blend);
-	void setBonePosition(std::string bone, v3f position, v3f rotation);
-	void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation);
+	void setBonePosition(const std::string &bone, v3f position, v3f rotation);
+	void setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation);
 	ObjectProperties* accessObjectProperties();
 	void notifyObjectPropertiesModified();
 	/* LuaEntitySAO-specific */
@@ -193,8 +193,8 @@ class PlayerSAO : public ServerActiveObject
 	void setBreath(u16 breath);
 	void setArmorGroups(const ItemGroupList &armor_groups);
 	void setAnimation(v2f frame_range, float frame_speed, float frame_blend);
-	void setBonePosition(std::string bone, v3f position, v3f rotation);
-	void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation);
+	void setBonePosition(const std::string &bone, v3f position, v3f rotation);
+	void setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation);
 	ObjectProperties* accessObjectProperties();
 	void notifyObjectPropertiesModified();
 	void setNametagColor(video::SColor color);

Original file line number	Diff line number	Diff line change
`@@ -541,13 +541,13 @@ void LuaEntitySAO::setAnimation(v2f frame_range, float frame_speed, float frame_`
`541`	`541`	`m_animation_sent = false;`
`542`	`542`	`}`
`543`	`543`
`544`		`-void LuaEntitySAO::setBonePosition(std::string bone, v3f position, v3f rotation)`
	`544`	`+void LuaEntitySAO::setBonePosition(const std::string &bone, v3f position, v3f rotation)`
`545`	`545`	`{`
`546`	`546`	`m_bone_position[bone] = core::vector2d<v3f>(position, rotation);`
`547`	`547`	`m_bone_position_sent = false;`
`548`	`548`	`}`
`549`	`549`
`550`		`-void LuaEntitySAO::setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)`
	`550`	`+void LuaEntitySAO::setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation)`
`551`	`551`	`{`
`552`	`552`	`// Attachments need to be handled on both the server and client.`
`553`	`553`	`// If we just attach on the server, we can only copy the position of the parent. Attachments`
`@@ -1142,14 +1142,14 @@ void PlayerSAO::setAnimation(v2f frame_range, float frame_speed, float frame_ble`
`1142`	`1142`	`m_animation_sent = false;`
`1143`	`1143`	`}`
`1144`	`1144`
`1145`		`-void PlayerSAO::setBonePosition(std::string bone, v3f position, v3f rotation)`
	`1145`	`+void PlayerSAO::setBonePosition(const std::string &bone, v3f position, v3f rotation)`
`1146`	`1146`	`{`
`1147`	`1147`	`// store these so they can be updated to clients`
`1148`	`1148`	`m_bone_position[bone] = core::vector2d<v3f>(position, rotation);`
`1149`	`1149`	`m_bone_position_sent = false;`
`1150`	`1150`	`}`
`1151`	`1151`
`1152`		`-void PlayerSAO::setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)`
	`1152`	`+void PlayerSAO::setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation)`
`1153`	`1153`	`{`
`1154`	`1154`	`// Attachments need to be handled on both the server and client.`
`1155`	`1155`	`// If we just attach on the server, we can only copy the position of the parent. Attachments`