Skip to content

Commit 24d8460

Browse files
committed
NPCBots: Fix CI build 1
1 parent 0dfd6dd commit 24d8460

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

src/server/game/AI/NpcBots/bot_ai.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19336,7 +19336,7 @@ WanderNode const* bot_ai::GetNextWanderNode(Position const* fromPos, uint8 lvl,
1933619336
if (me->IsFFAPvP())
1933719337
{
1933819338
ChrRacesEntry const* rentry = sChrRacesStore.LookupEntry(me->GetRace());
19339-
faction = (_botclass >= BOT_CLASS_EX_START) ? FACTION_TEMPLATE_NEUTRAL_HOSTILE : rentry ? rentry->FactionID : FACTION_TEMPLATE_NEUTRAL_HOSTILE;
19339+
faction = (_botclass >= BOT_CLASS_EX_START) ? uint32(FACTION_TEMPLATE_NEUTRAL_HOSTILE) : rentry ? rentry->FactionID : uint32(FACTION_TEMPLATE_NEUTRAL_HOSTILE);
1934019340
}
1934119341

1934219342
//Node got deleted (or forced)! Select close point and go from there

src/server/game/AI/NpcBots/botcommands.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -3342,8 +3342,7 @@ class script_bot_commands : public CommandScript
33423342

33433343
if (teamid)
33443344
{
3345-
ChrRacesEntry const* rentry = sChrRacesStore.LookupEntry(race);
3346-
uint32 faction = rentry ? rentry->FactionID : FACTION_TEMPLATE_NEUTRAL_HOSTILE;
3345+
uint32 faction = BotDataMgr::GetDefaultFactionForBotRace(race);
33473346
TeamId team = BotDataMgr::GetTeamIdForFaction(faction);
33483347

33493348
if (*teamid != uint8(team))

src/server/game/AI/NpcBots/botdatamgr.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3212,7 +3212,7 @@ int32 BotDataMgr::GetBotBaseReputation(Creature const* bot, FactionEntry const*
32123212
uint32 BotDataMgr::GetDefaultFactionForBotRace(uint8 bot_race)
32133213
{
32143214
ChrRacesEntry const* rentry = sChrRacesStore.LookupEntry(bot_race);
3215-
return rentry ? rentry->FactionID : FACTION_TEMPLATE_NEUTRAL_HOSTILE;
3215+
return rentry ? rentry->FactionID : uint32(FACTION_TEMPLATE_NEUTRAL_HOSTILE);
32163216
}
32173217

32183218
TeamId BotDataMgr::GetTeamIdForFaction(uint32 factionTemplateId)

0 commit comments

Comments
 (0)