diff --git a/Source/inv.cpp b/Source/inv.cpp index cfb5a476c..977d82186 100644 --- a/Source/inv.cpp +++ b/Source/inv.cpp @@ -1947,8 +1947,7 @@ void SyncGetItem(int x, int y, int idx, WORD ci, int iseed) i++; } } - /// ASSERT: assert(FindGetItem(idx, ci, iseed) == -1); - FindGetItem(idx, ci, iseed); /* todo: replace with above */ + assert(FindGetItem(idx, ci, iseed) == -1); } } @@ -2036,11 +2035,6 @@ int InvPutItem(int pnum, int x, int y) if (numitems >= MAXITEMS) return -1; - if (FindGetItem(plr[pnum].HoldItem.IDidx, plr[pnum].HoldItem._iCreateInfo, plr[pnum].HoldItem._iSeed) != -1) { - DrawInvMsg("A duplicate item has been detected. Destroying duplicate..."); - SyncGetItem(x, y, plr[pnum].HoldItem.IDidx, plr[pnum].HoldItem._iCreateInfo, plr[pnum].HoldItem._iSeed); - } - d = GetDirection(plr[pnum]._px, plr[pnum]._py, x, y); xx = x - plr[pnum]._px; yy = y - plr[pnum]._py; @@ -2134,11 +2128,6 @@ int SyncPutItem(int pnum, int x, int y, int idx, WORD icreateinfo, int iseed, in if (numitems >= MAXITEMS) return -1; - if (FindGetItem(idx, icreateinfo, iseed) != -1) { - DrawInvMsg("A duplicate item has been detected from another player."); - SyncGetItem(x, y, idx, icreateinfo, iseed); - } - d = GetDirection(plr[pnum]._px, plr[pnum]._py, x, y); xx = x - plr[pnum]._px; yy = y - plr[pnum]._py; diff --git a/Source/player.cpp b/Source/player.cpp index 4dd822e95..0821b6deb 100644 --- a/Source/player.cpp +++ b/Source/player.cpp @@ -1689,11 +1689,6 @@ void RespawnDeadItem(ItemStruct *itm, int x, int y) return; } - if (FindGetItem(itm->IDidx, itm->_iCreateInfo, itm->_iSeed) >= 0) { - DrawInvMsg("A duplicate item has been detected. Destroying duplicate..."); - SyncGetItem(x, y, itm->IDidx, itm->_iCreateInfo, itm->_iSeed); - } - ii = itemavail[0]; dItem[x][y] = ii + 1; itemavail[0] = itemavail[MAXITEMS - numitems - 1];