Fix code style from recent commits and add misc. optimizations

1 files changed, 48 insertions, 23 deletions

diff --git a/src/player.h b/src/player.h
index 4db0e4c58..c84cc1c92 100644
--- a/src/player.h
+++ b/src/player.h
@@ -130,13 +130,8 @@ public:
 
 	v3f getEyeOffset()
 	{
-		// This is at the height of the eyes of the current figure
-		// return v3f(0, BS*1.5, 0);
-		// This is more like in minecraft
-		if(camera_barely_in_ceiling)
-			return v3f(0,BS*1.5,0);
-		else
-			return v3f(0,BS*1.625,0);
+		float eye_height = camera_barely_in_ceiling ? 1.5f : 1.625f;
+		return v3f(0, BS * eye_height, 0);
 	}
 
 	v3f getEyePosition()
@@ -197,12 +192,13 @@ public:
 		return (m_yaw + 90.) * core::DEGTORAD;
 	}
 
-	const char * getName() const
+	const char *getName() const
 	{
 		return m_name;
 	}
 
-	core::aabbox3d<f32> getCollisionbox() {
+	core::aabbox3d<f32> getCollisionbox()
+	{
 		return m_collisionbox;
 	}
 
@@ -215,62 +211,91 @@ public:
 		return size;
 	}
 
-	void setHotbarItemcount(s32 hotbar_itemcount) {
+	void setHotbarItemcount(s32 hotbar_itemcount)
+	{
 		hud_hotbar_itemcount = hotbar_itemcount;
 	}
-	s32 getHotbarItemcount() {
+
+	s32 getHotbarItemcount()
+	{
 		return hud_hotbar_itemcount;
 	}
-	void setHotbarImage(std::string name) {
+
+	void setHotbarImage(const std::string &name)
+	{
 		hud_hotbar_image = name;
 	}
-	std::string getHotbarImage() {
+
+	std::string getHotbarImage()
+	{
 		return hud_hotbar_image;
 	}
-	void setHotbarSelectedImage(std::string name) {
+
+	void setHotbarSelectedImage(const std::string &name)
+	{
 		hud_hotbar_selected_image = name;
 	}
+
 	std::string getHotbarSelectedImage() {
 		return hud_hotbar_selected_image;
 	}
 
 	void setSky(const video::SColor &bgcolor, const std::string &type,
-			const std::vector<std::string> &params) {
+		const std::vector<std::string> &params)
+	{
 		m_sky_bgcolor = bgcolor;
 		m_sky_type = type;
 		m_sky_params = params;
 	}
+
 	void getSky(video::SColor *bgcolor, std::string *type,
-			std::vector<std::string> *params) {
+		std::vector<std::string> *params)
+	{
 		*bgcolor = m_sky_bgcolor;
 		*type = m_sky_type;
 		*params = m_sky_params;
 	}
-	void overrideDayNightRatio(bool do_override, float ratio) {
+
+	void overrideDayNightRatio(bool do_override, float ratio)
+	{
 		m_day_night_ratio_do_override = do_override;
 		m_day_night_ratio = ratio;
 	}
-	void getDayNightRatio(bool *do_override, float *ratio) {
+
+	void getDayNightRatio(bool *do_override, float *ratio)
+	{
 		*do_override = m_day_night_ratio_do_override;
 		*ratio = m_day_night_ratio;
 	}
-	void setLocalAnimations(v2s32 frames[4], float frame_speed) {
+
+	void setLocalAnimations(v2s32 frames[4], float frame_speed)
+	{
 		for (int i = 0; i < 4; i++)
 			local_animations[i] = frames[i];
 		local_animation_speed = frame_speed;
 	}
-	void getLocalAnimations(v2s32 *frames, float *frame_speed) {
+
+	void getLocalAnimations(v2s32 *frames, float *frame_speed)
+	{
 		for (int i = 0; i < 4; i++)
 			frames[i] = local_animations[i];
 		*frame_speed = local_animation_speed;
 	}
 
 	virtual bool isLocal() const
-	{ return false; }
+	{
+		return false;
+	}
+
 	virtual PlayerSAO *getPlayerSAO()
-	{ return NULL; }
+	{
+		return NULL;
+	}
+
 	virtual void setPlayerSAO(PlayerSAO *sao)
-	{ FATAL_ERROR("FIXME"); }
+	{
+		FATAL_ERROR("FIXME");
+	}
 
 	/*
 		serialize() writes a bunch of text that can contain