mirror of
https://github.com/luanti-org/luanti.git
synced 2025-07-02 16:38:41 +00:00
C++11 patchset 9: move hardcoded init parameters to class definitions (part 1) (#5984)
* C++11 patchset 9: move hardcoded init parameters to class definitions C++11 introduced the possibility to define the default values directly in class definitions, do it on current code Also remove some unused attributes * CollisionInfo::bouncy * collisionMoveResult::collides_xy * collisionMoveResult::standing_on_unloaded * Clouds::speed * More constructor cleanups + some variables removal * remove only write guiFormSpecMenu::m_old_tooltip * move header included inside defintions in genericobject.h * remove some unused since years exception classes * remove unused & empty debug_stacks_init * remove unused & empty content_nodemeta_serialize_legacy * remove forgotten useless bool (bouncy) in collision.cpp code
This commit is contained in:
parent
49d6e5f4ab
commit
76be103a91
50 changed files with 331 additions and 751 deletions
17
src/emerge.h
17
src/emerge.h
|
@ -47,20 +47,15 @@ class Server;
|
|||
|
||||
// Structure containing inputs/outputs for chunk generation
|
||||
struct BlockMakeData {
|
||||
MMVManip *vmanip;
|
||||
u64 seed;
|
||||
MMVManip *vmanip = nullptr;
|
||||
u64 seed = 0;
|
||||
v3s16 blockpos_min;
|
||||
v3s16 blockpos_max;
|
||||
v3s16 blockpos_requested;
|
||||
UniqueQueue<v3s16> transforming_liquid;
|
||||
INodeDefManager *nodedef;
|
||||
|
||||
BlockMakeData():
|
||||
vmanip(NULL),
|
||||
seed(0),
|
||||
nodedef(NULL)
|
||||
{}
|
||||
INodeDefManager *nodedef = nullptr;
|
||||
|
||||
BlockMakeData() {}
|
||||
~BlockMakeData() { delete vmanip; }
|
||||
};
|
||||
|
||||
|
@ -96,7 +91,7 @@ public:
|
|||
bool enable_mapgen_debug_info;
|
||||
|
||||
// Generation Notify
|
||||
u32 gen_notify_on;
|
||||
u32 gen_notify_on = 0;
|
||||
std::set<u32> gen_notify_on_deco_ids;
|
||||
|
||||
// Parameters passed to mapgens owned by ServerMap
|
||||
|
@ -154,7 +149,7 @@ public:
|
|||
private:
|
||||
std::vector<Mapgen *> m_mapgens;
|
||||
std::vector<EmergeThread *> m_threads;
|
||||
bool m_threads_active;
|
||||
bool m_threads_active = false;
|
||||
|
||||
std::mutex m_queue_mutex;
|
||||
std::map<v3s16, BlockEmergeData> m_blocks_enqueued;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue