Skip to content
Permalink
Browse files

Remove some unused attributes/class functions in server.cpp/h

  • Loading branch information
nerzhul committed Oct 8, 2016
1 parent 8bcd10b commit 09cefc3dfd76ac629bfc0777635fc5ac47b25ab0
Showing with 0 additions and 36 deletions.
  1. +0 −8 src/server.cpp
  2. +0 −28 src/server.h
@@ -184,9 +184,7 @@ Server::Server(
{
m_liquid_transform_timer = 0.0;
m_liquid_transform_every = 1.0;
m_print_info_timer = 0.0;
m_masterserver_timer = 0.0;
m_objectdata_timer = 0.0;
m_emergethread_trigger_timer = 0.0;
m_savemap_timer = 0.0;

@@ -3211,12 +3209,6 @@ void Server::deleteParticleSpawner(const std::string &playername, u32 id)
SendDeleteParticleSpawner(peer_id, id);
}

void Server::deleteParticleSpawnerAll(u32 id)
{
m_env->deleteParticleSpawner(id);
SendDeleteParticleSpawner(PEER_ID_INEXISTENT, id);
}

Inventory* Server::createDetachedInventory(const std::string &name)
{
if(m_detached_inventories.count(name) > 0){
@@ -64,31 +64,6 @@ enum ClientDeletionReason {
CDR_DENY
};

class MapEditEventIgnorer
{
public:
MapEditEventIgnorer(bool *flag):
m_flag(flag)
{
if(*m_flag == false)
*m_flag = true;
else
m_flag = NULL;
}

~MapEditEventIgnorer()
{
if(m_flag)
{
assert(*m_flag);
*m_flag = false;
}
}

private:
bool *m_flag;
};

class MapEditEventAreaIgnorer
{
public:
@@ -287,7 +262,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
const std::string &playername);

void deleteParticleSpawner(const std::string &playername, u32 id);
void deleteParticleSpawnerAll(u32 id);

// Creates or resets inventory
Inventory* createDetachedInventory(const std::string &name);
@@ -527,9 +501,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
// Some timers
float m_liquid_transform_timer;
float m_liquid_transform_every;
float m_print_info_timer;
float m_masterserver_timer;
float m_objectdata_timer;
float m_emergethread_trigger_timer;
float m_savemap_timer;
IntervalLimiter m_map_timer_and_unload_interval;

0 comments on commit 09cefc3

Please sign in to comment.
You can’t perform that action at this time.