-Internal: Linux fixes

conan513 · Dec 30, 2022 · b2940f2 · b2940f2
1 parent 878e02b
commit b2940f2
Show file tree

Hide file tree

Showing 18 changed files with 135 additions and 104 deletions.
diff --git a/playerbot/GuildTaskMgr.cpp b/playerbot/GuildTaskMgr.cpp
@@ -57,7 +57,7 @@ void GuildTaskMgr::Update(Player* player, Player* guildMaster)
     if (secLevel == PlayerbotSecurityLevel::PLAYERBOT_SECURITY_DENY_ALL || (secLevel == PlayerbotSecurityLevel::PLAYERBOT_SECURITY_TALK && reason != DenyReason::PLAYERBOT_DENY_FAR))
     {
         sLog.outDebug("%s / %s: skipping guild task update - not enough security level, reason = %u",
-			guild->GetName().c_str(), player->GetName(), reason);
+			guild->GetName().c_str(), player->GetName(), (uint8)reason);
         return;
     }
 

diff --git a/playerbot/PerformanceMonitor.cpp b/playerbot/PerformanceMonitor.cpp
@@ -150,7 +150,7 @@ void PerformanceMonitor::PrintStats(bool perTick, bool fullStack)
             }
 
             if (i->first != PERF_MON_TOTAL)
-                sLog.outString("%7.3f%% %10.3fs | %6u .. %6u (%9.4f of %10u) - %s    : %s"
+                sLog.outString("%7.3f%% %10.3fs | %6u .. %6u (%9.4d of %10u) - %s    : %s"
                     , tPerc
                     , tTime / 1000.0f
                     , tMin

diff --git a/playerbot/PlayerbotAI.cpp b/playerbot/PlayerbotAI.cpp
@@ -5081,7 +5081,7 @@ void PlayerbotAI::EnchantItemT(uint32 spellid, uint8 slot, Item* item)
    uint32 enchantid = spellInfo->EffectMiscValue[0];
    if (!enchantid)
    {
-      sLog.outError("%s: Invalid enchantid " , enchantid , " report to devs", bot->GetName());
+      sLog.outError("%u: Invalid enchantid %s %s" , enchantid , " report to devs", bot->GetName());
       return;
    }
 

diff --git a/playerbot/PlayerbotAIAware.h b/playerbot/PlayerbotAIAware.h
@@ -1,14 +1,17 @@
 #pragma once
+#include <string>
 
 class PlayerbotAI;
 
+using namespace std;
+
 namespace ai
 {
     class PlayerbotAIAware 
     {
     public:
         PlayerbotAIAware(PlayerbotAI* const ai) : ai(ai) { }
-        virtual std::string getName() { return std::string(); }
+        virtual string getName() { return string(); }
     protected:
         PlayerbotAI* ai;
     };

diff --git a/playerbot/PlayerbotFactory.cpp b/playerbot/PlayerbotFactory.cpp
@@ -1274,7 +1274,10 @@ void PlayerbotFactory::InitEquipment(bool incremental)
             quality--;
         }
 
+        quality = ITEM_QUALITY_POOR;
+
         uint32 attempts = 0;
+        uint32 searchLevel = level;
         do
         {
             // pick random shirt
@@ -1329,9 +1332,33 @@ void PlayerbotFactory::InitEquipment(bool incremental)
                 vector<uint32> ids;
                 for (uint32 q = quality; q < ITEM_QUALITY_ARTIFACT; ++q)
                 {
-                    vector<uint32> newItems = sRandomItemMgr.Query(level, bot->getClass(), uint8(specId), slot, q);
-                    if (newItems.size())
-                        ids.insert(ids.begin(), newItems.begin(), newItems.end());
+                    uint32 searchLevel = level;
+                    bool hasProperLevel = false;
+                    while (!hasProperLevel && searchLevel > 0)
+                    {
+                        vector<uint32> newItems = sRandomItemMgr.Query(searchLevel, bot->getClass(), uint8(specId), slot, q);
+                        if (newItems.size())
+                            ids.insert(ids.begin(), newItems.begin(), newItems.end());
+
+                        uint32 properLevel = 0;
+
+                        for (auto id : ids)
+                        {
+                            ItemPrototype const* proto = sObjectMgr.GetItemPrototype(id);
+
+                            if (proto->ItemLevel > sPlayerbotAIConfig.randomGearMaxLevel)
+                                continue;
+
+                            hasProperLevel = true;
+                            break;
+                        }
+
+                        if (!hasProperLevel)
+                        {
+                            ids.clear();
+                            searchLevel--;
+                        }
+                    }
 
                     // add one hand weapons for tanks
                     if ((specId == 3 || specId == 5) && slot == EQUIPMENT_SLOT_MAINHAND)

diff --git a/playerbot/RandomPlayerbotMgr.cpp b/playerbot/RandomPlayerbotMgr.cpp
@@ -35,6 +35,7 @@
 
 #include "TravelMgr.h"
 #include <iomanip>
+#include <float.h>
 
 using namespace ai;
 using namespace MaNGOS;

diff --git a/playerbot/TravelMgr.cpp b/playerbot/TravelMgr.cpp
@@ -1,13 +1,11 @@
-#pragma once
-
-
 #include "TravelMgr.h"
 #include <numeric>
 #include <iomanip>
 
 #include "strategy/values/SharedValueContext.h"
 #include "PathFinder.h"
 #include "TravelNode.h"
+#include "PlayerbotAI.h"
 
 using namespace ai;
 using namespace MaNGOS;

diff --git a/playerbot/TravelMgr.h b/playerbot/TravelMgr.h
@@ -2,7 +2,7 @@
 
 #include "strategy/AiObject.h"
 #include <boost/functional/hash.hpp>
-#include "WorldPosition.h"
+#include "GuidPosition.h"
 
 namespace ai
 {   
@@ -48,7 +48,7 @@ namespace ai
         uint32 getExpireDelay() { return expireDelay; }
         uint32 getCooldownDelay() { return cooldownDelay; }
 
-        virtual Quest const* GetQuestTemplate() { return NULL; }
+        virtual Quest const* GetQuestTemplate() { return nullptr; }
 
         virtual bool isActive(Player* bot) { return false; }
 
@@ -83,7 +83,7 @@ namespace ai
     public:
         NullTravelDestination(uint32 cooldownDelay1 = 5 * 60 * 1000) : TravelDestination() { cooldownDelay = cooldownDelay1;};
 
-        virtual Quest const* GetQuestTemplate() { return NULL; }
+        virtual Quest const* GetQuestTemplate() { return nullptr; }
 
         virtual bool isActive(Player* bot) { return false; }
 
@@ -195,7 +195,7 @@ namespace ai
         virtual bool isActive(Player* bot);
 
         virtual string getName() { return "ExploreTravelDestination"; }
-        virtual int32 getEntry() { return NULL; }
+        virtual int32 getEntry() { return 0; }
         virtual string getTitle() { return title; }
         virtual void setTitle(std::string newTitle) { title = newTitle; }
         virtual uint32 getAreaId() { return areaId; }

diff --git a/playerbot/TravelNode.cpp b/playerbot/TravelNode.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "TravelNode.h"
 #include "TravelMgr.h"
 

diff --git a/playerbot/WorldPosition.cpp b/playerbot/WorldPosition.cpp
@@ -8,8 +8,10 @@
 #include "Map.h"
 #include "vmap/VMapFactory.h"
 #include "MoveMap.h"
+#include "World.h"
 #include "PathFinder.h"
 #include "Grids/CellImpl.h"
+#include "ObjectAccessor.h"
 
 #include <numeric>
 #include <iomanip>

diff --git a/playerbot/playerbot.h b/playerbot/playerbot.h
@@ -1,11 +1,5 @@
 #pragma once
 
-std::vector<std::string> split(const std::string &s, char delim);
-void split(std::vector<std::string>& dest, const std::string& str, const char* delim);
-#ifndef WIN32
-int strcmpi(std::string s1, std::string s2);
-#endif
-
 #include "Spell.h"
 #include "WorldPacket.h"
 #include "LootMgr.h"
@@ -30,3 +24,9 @@ int strcmpi(std::string s1, std::string s2);
 #include "PlayerbotDbStore.h"
 
 #define MANGOSBOT_VERSION 2
+
+std::vector<std::string> split(std::string const& s, char delim);
+void split(std::vector<std::string>& dest, std::string const& str, char const* delim);
+#ifndef WIN32
+int strcmpi(std::string s1, std::string s2);
+#endif
diff --git a/playerbot/strategy/Action.h b/playerbot/strategy/Action.h
@@ -170,23 +170,4 @@ namespace ai
         Event event;
         time_t created;
 	};
-}
-
-#define AI_VALUE(type, name) context->GetValue<type>(name)->Get()
-#define AI_VALUE2(type, name, param) context->GetValue<type>(name, param)->Get()
-
-#define AI_VALUE_LAZY(type, name) context->GetValue<type>(name)->LazyGet()
-#define AI_VALUE2_LAZY(type, name, param) context->GetValue<type>(name, param)->LazyGet()
-
-#define SET_AI_VALUE(type, name, value) context->GetValue<type>(name)->Set(value)
-#define SET_AI_VALUE2(type, name, param, value) context->GetValue<type>(name, param)->Set(value)
-#define RESET_AI_VALUE(type, name) context->GetValue<type>(name)->Reset()
-#define RESET_AI_VALUE2(type, name, param) context->GetValue<type>(name, param)->Reset()
-
-#define PAI_VALUE(type, name) player->GetPlayerbotAI()->GetAiObjectContext()->GetValue<type>(name)->Get()
-#define PAI_VALUE2(type, name, param) player->GetPlayerbotAI()->GetAiObjectContext()->GetValue<type>(name, param)->Get()
-#define GAI_VALUE(type, name) sSharedValueContext.getGlobalValue<type>(name)->Get()
-#define GAI_VALUE2(type, name, param) sSharedValueContext.getGlobalValue<type>(name, param)->Get()
-
-#define MEM_AI_VALUE(type, name) dynamic_cast<MemoryCalculatedValue<type>*>(context->GetUntypedValue(name))
-#define LOG_AI_VALUE(type, name) dynamic_cast<LogCalculatedValue<type>*>(context->GetUntypedValue(name))
+}
diff --git a/playerbot/strategy/AiObject.h b/playerbot/strategy/AiObject.h
@@ -5,8 +5,6 @@
 class Player;
 class PlayerbotAI;
 
-using namespace std;
-
 namespace ai
 {
     class AiObjectContext;

diff --git a/playerbot/strategy/AiObjectContext.h b/playerbot/strategy/AiObjectContext.h
@@ -91,3 +91,23 @@ namespace ai
         NamedObjectContextList<UntypedValue> valueContexts;
     };
 }
+
+
+#define AI_VALUE(type, name) context->GetValue<type>(name)->Get()
+#define AI_VALUE2(type, name, param) context->GetValue<type>(name, param)->Get()
+
+#define AI_VALUE_LAZY(type, name) context->GetValue<type>(name)->LazyGet()
+#define AI_VALUE2_LAZY(type, name, param) context->GetValue<type>(name, param)->LazyGet()
+
+#define SET_AI_VALUE(type, name, value) context->GetValue<type>(name)->Set(value)
+#define SET_AI_VALUE2(type, name, param, value) context->GetValue<type>(name, param)->Set(value)
+#define RESET_AI_VALUE(type, name) context->GetValue<type>(name)->Reset()
+#define RESET_AI_VALUE2(type, name, param) context->GetValue<type>(name, param)->Reset()
+
+#define PAI_VALUE(type, name) player->GetPlayerbotAI()->GetAiObjectContext()->GetValue<type>(name)->Get()
+#define PAI_VALUE2(type, name, param) player->GetPlayerbotAI()->GetAiObjectContext()->GetValue<type>(name, param)->Get()
+#define GAI_VALUE(type, name) sSharedValueContext.getGlobalValue<type>(name)->Get()
+#define GAI_VALUE2(type, name, param) sSharedValueContext.getGlobalValue<type>(name, param)->Get()
+
+#define MEM_AI_VALUE(type, name) dynamic_cast<MemoryCalculatedValue<type>*>(context->GetUntypedValue(name))
+#define LOG_AI_VALUE(type, name) dynamic_cast<LogCalculatedValue<type>*>(context->GetUntypedValue(name))
diff --git a/playerbot/strategy/Trigger.h b/playerbot/strategy/Trigger.h
@@ -16,9 +16,10 @@ namespace ai
     class Trigger : public AiNamedObject
 	{
 	public:
-        Trigger(PlayerbotAI* ai, string name = "trigger", int checkInterval = 1) : AiNamedObject(ai, name), triggered(false) {
+        Trigger(PlayerbotAI* ai, string name = "trigger", int checkInterval = 1) : AiNamedObject(ai, name) {
+            this->triggered = false;
 			this->checkInterval = checkInterval;
-			lastCheckTime = time(0) - rand() % checkInterval;
+            this->lastCheckTime = time(0) - rand() % checkInterval;
 		}
         virtual ~Trigger() {}
 
@@ -30,7 +31,7 @@ namespace ai
         {
             this->param = param;
             this->owner = owner;
-            triggered = true;
+            this->triggered = true;
         }
         virtual bool IsActive() { return false; }
         virtual NextAction** getHandlers() { return NULL; }

diff --git a/playerbot/strategy/Value.h b/playerbot/strategy/Value.h
@@ -57,7 +57,7 @@ namespace ai
             {
                 lastCheckTime = now;
 
-                PerformanceMonitorOperation *pmo = sPerformanceMonitor.start(PERF_MON_VALUE, this->getName(), this->ai);
+                PerformanceMonitorOperation *pmo = sPerformanceMonitor.start(PERF_MON_VALUE, AiNamedObject::getName(), this->ai);
                 value = Calculate();
                 if (pmo) pmo->finish();
             }
@@ -93,7 +93,7 @@ namespace ai
             {
                 this->lastCheckTime = now;
 
-                PerformanceMonitorOperation* pmo = sPerformanceMonitor.start(PERF_MON_VALUE, this->getName(), this->ai);
+                PerformanceMonitorOperation* pmo = sPerformanceMonitor.start(PERF_MON_VALUE, AiNamedObject::getName(), this->ai);
                 this->value = this->Calculate();
                 if (pmo) pmo->finish();
             }