Fixes

diasurgical · Nov 3, 2024 · a289bff · a289bff
1 parent 52ce2af
commit a289bff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Source/items.cpp b/Source/items.cpp
@@ -536,8 +536,8 @@ void CalcSelfItems(Player &player)
 			}
 
 			if (currstr < equipment._iMinStr
-			    && currmag < equipment._iMinMag
-			    && currdex < equipment._iMinDex)
+			    || currmag < equipment._iMinMag
+			    || currdex < equipment._iMinDex)
 				isValid = false;
 
 			if (isValid)

diff --git a/test/player_test.cpp b/test/player_test.cpp
@@ -189,6 +189,7 @@ TEST(Player, CreatePlayer)
 	ASSERT_TRUE(HaveSpawn() || HaveDiabdat());
 
 	LoadPlayerDataFiles();
+	LoadMonsterData();
 	LoadItemData();
 	Players.resize(1);
 	CreatePlayer(Players[0], HeroClass::Rogue);

diff --git a/test/writehero_test.cpp b/test/writehero_test.cpp
@@ -386,6 +386,7 @@ TEST(Writehero, pfile_write_hero)
 
 	LoadSpellData();
 	LoadPlayerDataFiles();
+	LoadMonsterData();
 	LoadItemData();
 	_uiheroinfo info {};
 	info.heroclass = HeroClass::Rogue;