Bugfix: Prevent item deletion when dropping items

Source/controls/plrctrls.cpp

@@ -1929,42 +1929,6 @@ void UpdateSpellTarget(SpellID spell)
  cursPosition = myPlayer.position.future + Displacement(myPlayer._pdir) * range;
 }
 
-/**
- * @brief Try dropping item in all 9 possible places
- */
-bool TryDropItem()
-{
- Player &myPlayer = *MyPlayer;
-
- if (myPlayer.HoldItem.isEmpty()) {
- return false;
- }
-
- if (leveltype == DTYPE_TOWN) {
- if (UseItemOpensHive(myPlayer.HoldItem, myPlayer.position.tile)) {
- OpenHive();
- NewCursor(CURSOR_HAND);
- return true;
- }
- if (UseItemOpensGrave(myPlayer.HoldItem, myPlayer.position.tile)) {
- OpenGrave();
- NewCursor(CURSOR_HAND);
- return true;
- }
- }
-
- std::optional<Point> itemTile = FindAdjacentPositionForItem(myPlayer.position.future, myPlayer._pdir);
- if (!itemTile) {
- myPlayer.Say(HeroSpeech::WhereWouldIPutThis);
- return false;
- }
-
- NetSendCmdPItem(true, CMD_PUTITEM, *itemTile, myPlayer.HoldItem);
- myPlayer.HoldItem.clear();
- NewCursor(CURSOR_HAND);
- return true;
-}
-
 void PerformSpellAction()
 {
  if (InGameMenu() || QuestLogIsOpen || sbookflag)

Source/controls/plrctrls.h

@@ -76,7 +76,6 @@ void PerformPrimaryAction();
 // Open chests, doors, pickup items.
 void PerformSecondaryAction();
 void UpdateSpellTarget(SpellID spell);
-bool TryDropItem();
 void InvalidateInventorySlot();
 void FocusOnInventory();
 void PerformSpellAction();

Source/diablo.cpp

@@ -150,6 +150,60 @@ extern void plrctrls_after_check_curs_move();
 extern void plrctrls_every_frame();
 extern void plrctrls_after_game_logic();
 
+bool TryOpenDungeon(bool useCursorPosition)
+{
+ if (leveltype != DTYPE_TOWN)
+ return false;
+
+ Item &holdItem = MyPlayer->HoldItem;
+ WorldTilePosition &position = MyPlayer->position.tile;
+
+ // Common function to attempt opening based on input method.
+ auto attemptOpen = [&]() -> bool {
+ if ((useCursorPosition && holdItem.IDidx == IDI_RUNEBOMB && OpensHive(cursPosition)) || (!useCursorPosition && UseItemOpensHive(holdItem, position))) {
+ OpenHive();
+ NewCursor(CURSOR_HAND);
+ return true;
+ }
+ if ((useCursorPosition && holdItem.IDidx == IDI_MAPOFDOOM && OpensGrave(cursPosition)) || (!useCursorPosition && UseItemOpensGrave(holdItem, position))) {
+ OpenGrave();
+ NewCursor(CURSOR_HAND);
+ return true;
+ }
+ return false;
+ };
+
+ return attemptOpen();
+}
+
+/**
+ * @brief Try dropping item in all 9 possible places
+ */
+bool TryDropItem(bool useCursorPosition /*= false*/)
+{
+ Player &myPlayer = *MyPlayer;
+
+ if (myPlayer.HoldItem.isEmpty()) {
+ return false;
+ }
+
+ if (TryOpenDungeon(useCursorPosition))
+ return true;
+
+ Direction dir = useCursorPosition ? GetDirection(myPlayer.position.tile, cursPosition) : myPlayer._pdir;
+ std::optional<Point> itemTile = FindAdjacentPositionForItem(myPlayer.position.tile, dir);
+
+ if (!itemTile) {
+ myPlayer.Say(HeroSpeech::WhereWouldIPutThis);
+ return false;
+ }
+
+ NetSendCmdPItem(true, CMD_PUTITEM, *itemTile, myPlayer.HoldItem);
+ myPlayer.HoldItem.clear();
+ NewCursor(CURSOR_HAND);
+ return true;
+}
+
 namespace {
 
 char gszVersionNumber[64] = "internal version unknown";
@@ -302,23 +356,6 @@ void LeftMouseCmd(bool bShift)
  }
 }
 
-bool TryOpenDungeonWithMouse()
-{
- if (leveltype != DTYPE_TOWN)
- return false;
-
- Item &holdItem = MyPlayer->HoldItem;
- if (holdItem.IDidx == IDI_RUNEBOMB && OpensHive(cursPosition))
- OpenHive();
- else if (holdItem.IDidx == IDI_MAPOFDOOM && OpensGrave(cursPosition))
- OpenGrave();
- else
- return false;
-
- NewCursor(CURSOR_HAND);
- return true;
-}
-
 void LeftMouseDown(uint16_t modState)
 {
  LastMouseButtonAction = MouseActionType::None;
@@ -377,14 +414,7 @@ void LeftMouseDown(uint16_t modState)
  } else if (sbookflag && GetRightPanel().contains(MousePosition)) {
  CheckSBook();
  } else if (!MyPlayer->HoldItem.isEmpty()) {
- if (!TryOpenDungeonWithMouse()) {
- Point currentPosition = MyPlayer->position.tile;
- std::optional<Point> itemTile = FindAdjacentPositionForItem(currentPosition, GetDirection(currentPosition, cursPosition));
- if (itemTile) {
- NetSendCmdPItem(true, CMD_PUTITEM, *itemTile, MyPlayer->HoldItem);
- NewCursor(CURSOR_HAND);
- }
- }
+ TryDropItem(true);
  } else {
  CheckLvlBtn();
  if (!lvlbtndown)

Source/diablo.h

@@ -97,6 +97,7 @@ void DisableInputEventHandler(const SDL_Event &event, uint16_t modState);
 void LoadGameLevel(bool firstflag, lvl_entry lvldir);
 bool IsDiabloAlive(bool playSFX);
 void PrintScreen(SDL_Keycode vkey);
+bool TryDropItem(bool useCursorPosition = false);
 
 /**
  * @param bStartup Process additional ticks before returning

Source/msg.cpp

@@ -1356,12 +1356,11 @@ size_t OnPutItem(const TCmd *pCmd, Player &player)
  pfile_update(true);
  }
  return sizeof(message);
- } else {
- PutItemRecord(dwSeed, wCI, wIndx);
- DeltaPutItem(message, position, player);
- if (isSelf)
- pfile_update(true);
  }
+ PutItemRecord(dwSeed, wCI, wIndx);
+ DeltaPutItem(message, position, player);
+ if (isSelf)
+ pfile_update(true);
  }
 
  return sizeof(message);