From 956cbb0738f833ca1a1b726af4a33265a8502a36 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 9 Feb 2021 13:59:10 -0500 Subject: [PATCH] Core/Misc: Fixed some wrong racemask comparisons. --- Source/Game/DataStorage/DB2Manager.cs | 2 +- Source/Game/Globals/ObjectManager.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Game/DataStorage/DB2Manager.cs b/Source/Game/DataStorage/DB2Manager.cs index f22cb926d..c5a00a784 100644 --- a/Source/Game/DataStorage/DB2Manager.cs +++ b/Source/Game/DataStorage/DB2Manager.cs @@ -1920,7 +1920,7 @@ namespace Game.DataStorage var bounds = _skillRaceClassInfoBySkill.LookupByKey(skill); foreach (var record in bounds) { - if (record.RaceMask != 0 && !Convert.ToBoolean(record.RaceMask & (1 << ((byte)race - 1)))) + if (record.RaceMask != 0 && !Convert.ToBoolean(record.RaceMask & SharedConst.GetMaskForRace(race))) continue; if (record.ClassMask != 0 && !Convert.ToBoolean(record.ClassMask & (1 << ((byte)class_ - 1)))) continue; diff --git a/Source/Game/Globals/ObjectManager.cs b/Source/Game/Globals/ObjectManager.cs index 046287006..f7542ef61 100644 --- a/Source/Game/Globals/ObjectManager.cs +++ b/Source/Game/Globals/ObjectManager.cs @@ -5630,12 +5630,12 @@ namespace Game if (items.Empty()) continue; - for (uint raceIndex = (int)Race.Human; raceIndex < (int)Race.Max; ++raceIndex) + for (var raceIndex = Race.Human; raceIndex < Race.Max; ++raceIndex) { - if (!characterLoadout.RaceMask.HasAnyFlag(raceIndex)) + if (!characterLoadout.RaceMask.HasAnyFlag(SharedConst.GetMaskForRace(raceIndex))) continue; - PlayerInfo playerInfo = _playerInfo[raceIndex][characterLoadout.ChrClassID]; + PlayerInfo playerInfo = _playerInfo[(int)raceIndex][characterLoadout.ChrClassID]; if (playerInfo != null) { foreach (ItemTemplate itemTemplate in items)