diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h index 25c4721c8..156a48374 100644 --- a/src/framework/Dynamic/ObjectRegistry.h +++ b/src/framework/Dynamic/ObjectRegistry.h @@ -43,12 +43,12 @@ class MANGOS_DLL_DECL ObjectRegistry } /// Inserts a registry item - bool InsertItem(T *obj, Key key, bool override = false) + bool InsertItem(T *obj, Key key, bool replace = false) { typename RegistryMapType::iterator iter = i_registeredObjects.find(key); if( iter != i_registeredObjects.end() ) { - if( !override ) + if( !replace ) return false; delete iter->second; i_registeredObjects.erase(iter); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 395e14ac9..760399677 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11588" + #define REVISION_NR "11589" #endif // __REVISION_NR_H__