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

Fix 2 warnings reported by GCC

Browse Source 
* ClientEnvironment::m_irr is not used anymore since a recent cleanup
* l_vmanip constructor ordering
This commit is contained in:
Loic Blot 2017-06-20 00:04:18 +02:00
parent 4a5e8ad343
commit b32f36bf34
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client.cpp
View File

@ -81,7 +81,7 @@ Client::Client(
device->getSceneManager()->getRootSceneNode(), device->getSceneManager()->getRootSceneNode(),
device->getSceneManager(), 666), device->getSceneManager(), 666),
device->getSceneManager(), device->getSceneManager(),
tsrc, this, device tsrc, this
), ),
m_particle_manager(&m_env), m_particle_manager(&m_env),
m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this), m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this),

6
src/clientenvironment.cpp
View File

@ -37,14 +37,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/ */
ClientEnvironment::ClientEnvironment(ClientMap *map, scene::ISceneManager *smgr, ClientEnvironment::ClientEnvironment(ClientMap *map, scene::ISceneManager *smgr,
ITextureSource *texturesource, Client *client, ITextureSource *texturesource, Client *client):
IrrlichtDevice *irr):
Environment(client), Environment(client),
m_map(map), m_map(map),
m_smgr(smgr), m_smgr(smgr),
m_texturesource(texturesource), m_texturesource(texturesource),
m_client(client), m_client(client)
m_irr(irr)
{ {
char zero = 0; char zero = 0;
memset(attachement_parent_ids, zero, sizeof(attachement_parent_ids)); memset(attachement_parent_ids, zero, sizeof(attachement_parent_ids));

5
src/clientenvironment.h
View File

@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef CLIENT_ENVIRONMENT_HEADER #ifndef CLIENT_ENVIRONMENT_HEADER
#define CLIENT_ENVIRONMENT_HEADER #define CLIENT_ENVIRONMENT_HEADER
#include <IrrlichtDevice.h>
#include <ISceneManager.h> #include <ISceneManager.h>
#include "environment.h" #include "environment.h"
#include "clientobject.h" #include "clientobject.h"
@ -69,8 +68,7 @@ class ClientEnvironment : public Environment
{ {
public: public:
ClientEnvironment(ClientMap *map, scene::ISceneManager *smgr, ClientEnvironment(ClientMap *map, scene::ISceneManager *smgr,
ITextureSource *texturesource, Client *client, ITextureSource *texturesource, Client *client);
IrrlichtDevice *device);
~ClientEnvironment(); ~ClientEnvironment();
Map & getMap(); Map & getMap();
@ -181,7 +179,6 @@ private:
ITextureSource *m_texturesource; ITextureSource *m_texturesource;
Client *m_client; Client *m_client;
ClientScripting *m_script = nullptr; ClientScripting *m_script = nullptr;
IrrlichtDevice *m_irr;
ClientActiveObjectMap m_active_objects; ClientActiveObjectMap m_active_objects;
std::vector<ClientSimpleObject*> m_simple_objects; std::vector<ClientSimpleObject*> m_simple_objects;
std::queue<ClientEnvEvent> m_client_event_queue; std::queue<ClientEnvEvent> m_client_event_queue;

4
src/script/lua_api/l_vmanip.cpp
View File

@ -365,7 +365,9 @@ int LuaVoxelManip::l_get_emerged_area(lua_State *L)
return 2; 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)
{ {
} }