Browse Source

Remove duplicate argument to DeleteItem

pull/3586/head
ephphatha 5 years ago committed by Anders Jenbo
parent
commit
18658f6a42
  1. 2
      Source/inv.cpp
  2. 11
      Source/items.cpp
  3. 2
      Source/items.h
  4. 2
      Source/loadsave.cpp
  5. 2
      Source/msg.cpp

2
Source/inv.cpp

@ -1101,7 +1101,7 @@ void CleanupItems(int ii)
int i = 0; int i = 0;
while (i < ActiveItemCount) { while (i < ActiveItemCount) {
if (ActiveItems[i] == ii) { if (ActiveItems[i] == ii) {
DeleteItem(ActiveItems[i], i); DeleteItem(i);
i = 0; i = 0;
continue; continue;
} }

11
Source/items.cpp

@ -3567,7 +3567,7 @@ void CornerstoneLoad(Point position)
int ii = dItem[position.x][position.y] - 1; int ii = dItem[position.x][position.y] - 1;
for (int i = 0; i < ActiveItemCount; i++) { for (int i = 0; i < ActiveItemCount; i++) {
if (ActiveItems[i] == ii) { if (ActiveItems[i] == ii) {
DeleteItem(ActiveItems[i], i); DeleteItem(i);
break; break;
} }
} }
@ -3686,14 +3686,15 @@ void RespawnItem(Item *item, bool flipFlag)
item->_iSelFlag = 1; item->_iSelFlag = 1;
} }
void DeleteItem(int ii, int i) void DeleteItem(int i)
{ {
AvailableItems[MAXITEMS - ActiveItemCount] = ii; if (pcursitem == ActiveItems[i]) // Unselect item if player has it highlighted
pcursitem = -1;
AvailableItems[MAXITEMS - ActiveItemCount] = ActiveItems[i];
ActiveItemCount--; ActiveItemCount--;
if (ActiveItemCount > 0 && i != ActiveItemCount) if (ActiveItemCount > 0 && i != ActiveItemCount)
ActiveItems[i] = ActiveItems[ActiveItemCount]; ActiveItems[i] = ActiveItems[ActiveItemCount];
if (pcursitem == ii) // Unselect item if player has it highlighted
pcursitem = -1;
} }
void ProcessItems() void ProcessItems()

2
Source/items.h

@ -464,7 +464,7 @@ void SpawnMapOfDoom(Point position);
void SpawnRuneBomb(Point position); void SpawnRuneBomb(Point position);
void SpawnTheodore(Point position); void SpawnTheodore(Point position);
void RespawnItem(Item *item, bool FlipFlag); void RespawnItem(Item *item, bool FlipFlag);
void DeleteItem(int ii, int i); void DeleteItem(int i);
void ProcessItems(); void ProcessItems();
void FreeItemGFX(); void FreeItemGFX();
void GetItemFrm(Item &item); void GetItemFrm(Item &item);

2
Source/loadsave.cpp

@ -931,7 +931,7 @@ void RemoveEmptyLevelItems()
auto &item = Items[ActiveItems[i]]; auto &item = Items[ActiveItems[i]];
if (item.isEmpty()) { if (item.isEmpty()) {
dItem[item.position.x][item.position.y] = 0; dItem[item.position.x][item.position.y] = 0;
DeleteItem(ActiveItems[i], i); DeleteItem(i);
} }
} }
} }

2
Source/msg.cpp

@ -2235,7 +2235,7 @@ void DeltaLoadLevel()
const auto &position = Items[ActiveItems[activeItemIndex]].position; const auto &position = Items[ActiveItems[activeItemIndex]].position;
if (dItem[position.x][position.y] == ActiveItems[activeItemIndex] + 1) if (dItem[position.x][position.y] == ActiveItems[activeItemIndex] + 1)
dItem[position.x][position.y] = 0; dItem[position.x][position.y] = 0;
DeleteItem(ActiveItems[activeItemIndex], activeItemIndex); DeleteItem(activeItemIndex);
} }
} }
if (sgLevels[currlevel].item[i].bCmd == CMD_ACK_PLRINFO) { if (sgLevels[currlevel].item[i].bCmd == CMD_ACK_PLRINFO) {

Loading…
Cancel
Save