From b32f36bf34c9a3208b2c0261e0f541453b4459b6 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Tue, 20 Jun 2017 00:04:18 +0200
Subject: [PATCH] Fix 2 warnings reported by GCC

* ClientEnvironment::m_irr is not used anymore since a recent cleanup
* l_vmanip constructor ordering
---
 src/client.cpp                  | 2 +-
 src/clientenvironment.cpp       | 6 ++----
 src/clientenvironment.h         | 5 +----
 src/script/lua_api/l_vmanip.cpp | 4 +++-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index 9892e08cd..ebe1d9c8f 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -81,7 +81,7 @@ Client::Client(
 			device->getSceneManager()->getRootSceneNode(),
 			device->getSceneManager(), 666),
 		device->getSceneManager(),
-		tsrc, this, device
+		tsrc, this
 	),
 	m_particle_manager(&m_env),
 	m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this),
diff --git a/src/clientenvironment.cpp b/src/clientenvironment.cpp
index e6b273086..e0398a062 100644
--- a/src/clientenvironment.cpp
+++ b/src/clientenvironment.cpp
@@ -37,14 +37,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 ClientEnvironment::ClientEnvironment(ClientMap *map, scene::ISceneManager *smgr,
-	ITextureSource *texturesource, Client *client,
-	IrrlichtDevice *irr):
+	ITextureSource *texturesource, Client *client):
 	Environment(client),
 	m_map(map),
 	m_smgr(smgr),
 	m_texturesource(texturesource),
-	m_client(client),
-	m_irr(irr)
+	m_client(client)
 {
 	char zero = 0;
 	memset(attachement_parent_ids, zero, sizeof(attachement_parent_ids));
diff --git a/src/clientenvironment.h b/src/clientenvironment.h
index c8b192ee9..9d893766b 100644
--- a/src/clientenvironment.h
+++ b/src/clientenvironment.h
@@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CLIENT_ENVIRONMENT_HEADER
 #define CLIENT_ENVIRONMENT_HEADER
 
-#include <IrrlichtDevice.h>
 #include <ISceneManager.h>
 #include "environment.h"
 #include "clientobject.h"
@@ -69,8 +68,7 @@ class ClientEnvironment : public Environment
 {
 public:
 	ClientEnvironment(ClientMap *map, scene::ISceneManager *smgr,
-		ITextureSource *texturesource, Client *client,
-		IrrlichtDevice *device);
+		ITextureSource *texturesource, Client *client);
 	~ClientEnvironment();
 
 	Map & getMap();
@@ -181,7 +179,6 @@ private:
 	ITextureSource *m_texturesource;
 	Client *m_client;
 	ClientScripting *m_script = nullptr;
-	IrrlichtDevice *m_irr;
 	ClientActiveObjectMap m_active_objects;
 	std::vector<ClientSimpleObject*> m_simple_objects;
 	std::queue<ClientEnvEvent> m_client_event_queue;
diff --git a/src/script/lua_api/l_vmanip.cpp b/src/script/lua_api/l_vmanip.cpp
index ed5042bcf..9e482873b 100644
--- a/src/script/lua_api/l_vmanip.cpp
+++ b/src/script/lua_api/l_vmanip.cpp
@@ -365,7 +365,9 @@ int LuaVoxelManip::l_get_emerged_area(lua_State *L)
 	return 2;
 }
 
-LuaVoxelManip::LuaVoxelManip(MMVManip *mmvm, bool is_mg_vm) : vm(mmvm), is_mapgen_vm(is_mg_vm)
+LuaVoxelManip::LuaVoxelManip(MMVManip *mmvm, bool is_mg_vm) :
+	is_mapgen_vm(is_mg_vm),
+	vm(mmvm)
 {
 }