From 16e7a719806f15b60315ca18a2a91e7e230a9bfc Mon Sep 17 00:00:00 2001 From: Rochet2 Date: Mon, 2 Jun 2014 11:46:42 +0300 Subject: [PATCH] Eluna prevent copying of Eluna and fix init order of WorldObjectInRangeCheck --- LuaEngine.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/LuaEngine.h b/LuaEngine.h index bd99bb2..d7110c0 100644 --- a/LuaEngine.h +++ b/LuaEngine.h @@ -430,8 +430,12 @@ class ElunaTemplate; class Eluna { +private: + // prevent copy + Eluna(Eluna const&); + Eluna& operator=(const Eluna&); + public: - friend class ScriptMgr; typedef std::set ScriptPaths; static Eluna* GEluna; @@ -585,11 +589,11 @@ public: return true; } + bool i_nearest; WorldObject const* i_obj; float i_range; uint16 i_typeMask; uint32 i_entry; - bool i_nearest; uint32 i_hostile; WorldObjectInRangeCheck(WorldObjectInRangeCheck const&);