Fix 2 warnings reported by GCC
* ClientEnvironment::m_irr is not used anymore since a recent cleanup * l_vmanip constructor orderingmaster
parent
4a5e8ad343
commit
b32f36bf34
|
@ -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),
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue