mirror of
https://github.com/mod-playerbots/mod-playerbots.git
synced 2026-02-12 06:43:45 +00:00
Improper singletons migration to clean Meyer's singletons (cherry-pick) (#2082)
# Pull Request
- Applies the clean and corrected singletons, Meyer pattern. (cherry
picked from @SmashingQuasar )
Testing by just playing the game in various ways. Been tested by myself
@Celandriel and @SmashingQuasar
---
## Complexity & Impact
- Does this change add new decision branches?
- [x] No
- [ ] Yes (**explain below**)
- Does this change increase per-bot or per-tick processing?
- [x] No
- [ ] Yes (**describe and justify impact**)
- Could this logic scale poorly under load?
- [x] No
- [ ] Yes (**explain why**)
---
## Defaults & Configuration
- Does this change modify default bot behavior?
- [x] No
- [ ] Yes (**explain why**)
---
## AI Assistance
- Was AI assistance (e.g. ChatGPT or similar tools) used while working
on this change?
- [x] No
- [ ] Yes (**explain below**)
---
## Final Checklist
- [x] Stability is not compromised
- [x] Performance impact is understood, tested, and acceptable
- [x] Added logic complexity is justified and explained
- [x] Documentation updated if needed
---
## Notes for Reviewers
Anything that significantly improves realism at the cost of stability or
performance should be carefully discussed
before merging.
---------
Co-authored-by: Nicolas Lebacq <nicolas.cordier@outlook.com>
Co-authored-by: Keleborn <22352763+Celandriel@users.noreply.github.com>
This commit is contained in:
@@ -12,39 +12,14 @@
|
||||
#include "PvpValues.h"
|
||||
#include "QuestValues.h"
|
||||
|
||||
class PlayerbotAI;
|
||||
|
||||
class SharedValueContext : public NamedObjectContext<UntypedValue>
|
||||
{
|
||||
public:
|
||||
SharedValueContext() : NamedObjectContext(true)
|
||||
{
|
||||
creators["bg masters"] = &SharedValueContext::bg_masters;
|
||||
creators["drop map"] = &SharedValueContext::drop_map;
|
||||
creators["item drop list"] = &SharedValueContext::item_drop_list;
|
||||
creators["entry loot list"] = &SharedValueContext::entry_loot_list;
|
||||
|
||||
creators["entry quest relation"] = &SharedValueContext::entry_quest_relation;
|
||||
creators["quest guidp map"] = &SharedValueContext::quest_guidp_map;
|
||||
creators["quest givers"] = &SharedValueContext::quest_givers;
|
||||
}
|
||||
|
||||
private:
|
||||
static UntypedValue* bg_masters(PlayerbotAI* botAI) { return new BgMastersValue(botAI); }
|
||||
static UntypedValue* drop_map(PlayerbotAI* botAI) { return new DropMapValue(botAI); }
|
||||
static UntypedValue* item_drop_list(PlayerbotAI* botAI) { return new ItemDropListValue(botAI); }
|
||||
static UntypedValue* entry_loot_list(PlayerbotAI* botAI) { return new EntryLootListValue(botAI); }
|
||||
|
||||
static UntypedValue* entry_quest_relation(PlayerbotAI* botAI) { return new EntryQuestRelationMapValue(botAI); }
|
||||
static UntypedValue* quest_guidp_map(PlayerbotAI* botAI) { return new QuestGuidpMapValue(botAI); }
|
||||
static UntypedValue* quest_givers(PlayerbotAI* botAI) { return new QuestGiversValue(botAI); }
|
||||
|
||||
// Global acess functions
|
||||
public:
|
||||
static SharedValueContext* instance()
|
||||
static SharedValueContext& instance()
|
||||
{
|
||||
static SharedValueContext instance;
|
||||
return &instance;
|
||||
|
||||
return instance;
|
||||
}
|
||||
|
||||
template <class T>
|
||||
@@ -74,6 +49,36 @@ public:
|
||||
out << param;
|
||||
return getGlobalValue<T>(name, out.str());
|
||||
}
|
||||
|
||||
private:
|
||||
SharedValueContext() : NamedObjectContext(true)
|
||||
{
|
||||
creators["bg masters"] = &SharedValueContext::bg_masters;
|
||||
creators["drop map"] = &SharedValueContext::drop_map;
|
||||
creators["item drop list"] = &SharedValueContext::item_drop_list;
|
||||
creators["entry loot list"] = &SharedValueContext::entry_loot_list;
|
||||
|
||||
creators["entry quest relation"] = &SharedValueContext::entry_quest_relation;
|
||||
creators["quest guidp map"] = &SharedValueContext::quest_guidp_map;
|
||||
creators["quest givers"] = &SharedValueContext::quest_givers;
|
||||
}
|
||||
~SharedValueContext() = default;
|
||||
|
||||
SharedValueContext(const SharedValueContext&) = delete;
|
||||
SharedValueContext& operator=(const SharedValueContext&) = delete;
|
||||
|
||||
SharedValueContext(SharedValueContext&&) = delete;
|
||||
SharedValueContext& operator=(SharedValueContext&&) = delete;
|
||||
|
||||
static UntypedValue* bg_masters(PlayerbotAI* botAI) { return new BgMastersValue(botAI); }
|
||||
static UntypedValue* drop_map(PlayerbotAI* botAI) { return new DropMapValue(botAI); }
|
||||
static UntypedValue* item_drop_list(PlayerbotAI* botAI) { return new ItemDropListValue(botAI); }
|
||||
static UntypedValue* entry_loot_list(PlayerbotAI* botAI) { return new EntryLootListValue(botAI); }
|
||||
|
||||
static UntypedValue* entry_quest_relation(PlayerbotAI* botAI) { return new EntryQuestRelationMapValue(botAI); }
|
||||
static UntypedValue* quest_guidp_map(PlayerbotAI* botAI) { return new QuestGuidpMapValue(botAI); }
|
||||
static UntypedValue* quest_givers(PlayerbotAI* botAI) { return new QuestGiversValue(botAI); }
|
||||
|
||||
};
|
||||
|
||||
#define sSharedValueContext SharedValueContext::instance()
|
||||
|
||||
Reference in New Issue
Block a user