From 6ccb5835ff55d85156be91473c598eca9d6cb9a6 Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Wed, 4 Nov 2020 16:57:41 +0100
Subject: Revert "Make Lint Happy"

This reverts commit ad148587dcf5244c2d2011dba339786c765c54c4.
---
 src/client/clientenvironment.h | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

(limited to 'src/client/clientenvironment.h')

diff --git a/src/client/clientenvironment.h b/src/client/clientenvironment.h
index a24ea209a..52d999c99 100644
--- a/src/client/clientenvironment.h
+++ b/src/client/clientenvironment.h
@@ -49,27 +49,25 @@ enum ClientEnvEventType
 struct ClientEnvEvent
 {
 	ClientEnvEventType type;
-	union
-	{
-		// struct{
+	union {
+		//struct{
 		//} none;
-		struct
-		{
+		struct{
 			u16 amount;
 			bool send_to_server;
 		} player_damage;
 	};
 };
 
-typedef std::unordered_map<u16, ClientActiveObject *> ClientActiveObjectMap;
+typedef std::unordered_map<u16, ClientActiveObject*> ClientActiveObjectMap;
 class ClientEnvironment : public Environment
 {
 public:
 	ClientEnvironment(ClientMap *map, ITextureSource *texturesource, Client *client);
 	~ClientEnvironment();
 
-	Map &getMap();
-	ClientMap &getClientMap();
+	Map & getMap();
+	ClientMap & getClientMap();
 
 	Client *getGameDef() { return m_client; }
 	void setScript(ClientScripting *script) { m_script = script; }
@@ -89,13 +87,13 @@ public:
 		ActiveObjects
 	*/
 
-	GenericCAO *getGenericCAO(u16 id);
-	ClientActiveObject *getActiveObject(u16 id)
+	GenericCAO* getGenericCAO(u16 id);
+	ClientActiveObject* getActiveObject(u16 id)
 	{
 		return m_ao_manager.getActiveObject(id);
 	}
-
-	std::unordered_map<u16, ClientActiveObject *> getAllActiveObjects()
+	
+	std::unordered_map<u16, ClientActiveObject*> getAllActiveObjects()
 	{
 		return m_ao_manager.getAllActiveObjects();
 	}
@@ -119,7 +117,7 @@ public:
 		Callbacks for activeobjects
 	*/
 
-	void damageLocalPlayer(u16 damage, bool handle_hp = true);
+	void damageLocalPlayer(u16 damage, bool handle_hp=true);
 
 	/*
 		Client likes to call these
@@ -127,7 +125,7 @@ public:
 
 	// Get all nearby objects
 	void getActiveObjects(const v3f &origin, f32 max_d,
-			std::vector<DistanceSortedActiveObject> &dest)
+		std::vector<DistanceSortedActiveObject> &dest)
 	{
 		return m_ao_manager.getActiveObjects(origin, max_d, dest);
 	}
@@ -137,18 +135,17 @@ public:
 	// Get event from queue. If queue is empty, it triggers an assertion failure.
 	ClientEnvEvent getClientEnvEvent();
 
-	virtual void getSelectedActiveObjects(const core::line3d<f32> &shootline_on_map,
-			std::vector<PointedThing> &objects);
+	virtual void getSelectedActiveObjects(
+		const core::line3d<f32> &shootline_on_map,
+		std::vector<PointedThing> &objects
+	);
 
 	const std::list<std::string> &getPlayerNames() { return m_player_names; }
 	void addPlayerName(const std::string &name) { m_player_names.push_back(name); }
 	void removePlayerName(const std::string &name) { m_player_names.remove(name); }
 	void updateCameraOffset(const v3s16 &camera_offset)
-	{
-		m_camera_offset = camera_offset;
-	}
+	{ m_camera_offset = camera_offset; }
 	v3s16 getCameraOffset() const { return m_camera_offset; }
-
 private:
 	ClientMap *m_map;
 	LocalPlayer *m_local_player = nullptr;
@@ -156,7 +153,7 @@ private:
 	Client *m_client;
 	ClientScripting *m_script = nullptr;
 	client::ActiveObjectMgr m_ao_manager;
-	std::vector<ClientSimpleObject *> m_simple_objects;
+	std::vector<ClientSimpleObject*> m_simple_objects;
 	std::queue<ClientEnvEvent> m_client_event_queue;
 	IntervalLimiter m_active_object_light_update_interval;
 	std::list<std::string> m_player_names;
-- 
cgit v1.2.3