Merge pull request OpenEnroth#1951 from captainurist/macos_fixes_633

Test for OpenEnroth#1912
q4a · Feb 23, 2025 · 0daaa01 · 0daaa01
2 parents b1d6c15 + 37b4240
commit 0daaa01
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 3 deletions.
diff --git a/src/Engine/Objects/Character.cpp b/src/Engine/Objects/Character.cpp
@@ -6119,7 +6119,7 @@ bool Character::hasUnderwaterSuitEquipped() {
     return true;
 }
 
-bool Character::hasItem(ItemId uItemID, bool checkHeldItem) {
+bool Character::hasItem(ItemId uItemID, bool checkHeldItem) const {
     if (!checkHeldItem || pParty->pPickedItem.itemId != uItemID) {
         for (unsigned i = 0; i < INVENTORY_SLOT_COUNT; ++i) {
             if (this->pInventoryMatrix[i] > 0) {

diff --git a/src/Engine/Objects/Character.h b/src/Engine/Objects/Character.h
@@ -295,7 +295,7 @@ class Character {
     /**
      * @offset 0x43EE15
      */
-    bool hasItem(ItemId uItemID, bool checkHeldItem);
+    bool hasItem(ItemId uItemID, bool checkHeldItem) const;
     void OnInventoryLeftClick();
 
     bool characterHitOrMiss(Actor *pActor, int distancemod, int skillmod);

diff --git a/test/Bin/CMakeLists.txt b/test/Bin/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
 ExternalProject_Add(OpenEnroth_TestData
         PREFIX ${CMAKE_CURRENT_BINARY_DIR}/test_data_tmp
         GIT_REPOSITORY https://github.com/OpenEnroth/OpenEnroth_TestData.git
-        GIT_TAG c0803c62f32eb13a5569957eb1f60a74f8872e0d
+        GIT_TAG edc30aa266c295aa2f6cb869a43a7e95a4e75ac9
         SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/test_data
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""

diff --git a/test/Bin/GameTest/GameTests_1500.cpp b/test/Bin/GameTest/GameTests_1500.cpp
@@ -570,6 +570,17 @@ GAME_TEST(Issues, Issue1911) {
     EXPECT_EQ(pParty->pCharacters[0].GetActualAttack(true), 14); // +10 from staff, +4 from unarmed.
 }
 
+GAME_TEST(Issues, Issue1912) {
+    // Trading a Red Potion for a Wealthy Hat doesn't remove the potion from the inventory.
+    auto potionTape = charTapes.hasItem(ITEM_POTION_CURE_WOUNDS);
+    auto hatTape = charTapes.hasItem(ITEM_QUEST_WEALTHY_HAT);
+    auto activeCharTape = tapes.activeCharacterIndex();
+    test.playTraceFromTestData("issue_1912.mm7", "issue_1912.json");
+    EXPECT_EQ(activeCharTape, tape(1)); // First char was talking.
+    EXPECT_EQ(potionTape, tape({false, true, false, false}, {false, false, false, false})); // But 2nd char had the potion.
+    EXPECT_EQ(hatTape, tape({false, false, false, false}, {true, false, false, false})); // We passed the hat to the 1st char.
+}
+
 GAME_TEST(Issues, Issue1925) {
     // Test for wand behaviour.
     for (bool wandsDisappear : {true, false}) {

diff --git a/test/Testing/Game/CharacterTapeRecorder.cpp b/test/Testing/Game/CharacterTapeRecorder.cpp
@@ -118,3 +118,11 @@ TestTape<SpellId> CharacterTapeRecorder::quickSpell(int characterIndex) {
 TestMultiTape<SpellId> CharacterTapeRecorder::quickSpells() {
     return custom(std::bind(&Character::uQuickSpell, _1));
 }
+
+TestTape<bool> CharacterTapeRecorder::hasItem(int characterIndex, ItemId itemId) {
+    return custom(characterIndex, std::bind(&Character::hasItem, _1, itemId, false));
+}
+
+TestMultiTape<bool> CharacterTapeRecorder::hasItem(ItemId itemId) {
+    return custom(std::bind(&Character::hasItem, _1, itemId, false));
+}
diff --git a/test/Testing/Game/CharacterTapeRecorder.h b/test/Testing/Game/CharacterTapeRecorder.h
@@ -78,6 +78,9 @@ class CharacterTapeRecorder {
     TestTape<SpellId> quickSpell(int characterIndex);
     TestMultiTape<SpellId> quickSpells();
 
+    TestTape<bool> hasItem(int characterIndex, ItemId itemId);
+    TestMultiTape<bool> hasItem(ItemId itemId);
+
  private:
     static std::span<Character> characters();