mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

🚚 Rename 'AutoPlace' to 'AutoPlaceItemInInventorySlot'

pull/1407/head
Juliano Leal Goncalves 5 years ago committed by Anders Jenbo
parent
e33ea53086
commit
1c15e244b2
4 changed files with 35 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      Source/inv.cpp
  2. 2
      Source/inv.h
  3. 2
      Source/items.cpp
  4. 34
      Source/stores.cpp

32
Source/inv.cpp
Unescape View File

@ -860,74 +860,74 @@ bool AutoPlaceItemInInventory(int playerNumber, const ItemStruct &item, bool per
if (itemSize.X == 1 && itemSize.Y == 1) {
for (int i = 30; i <= 39 && !done; i++) {
done = AutoPlace(playerNumber, i, item, persistItem);
done = AutoPlaceItemInInventorySlot(playerNumber, i, item, persistItem);
}
for (int i = 20; i <= 29 && !done; i++) {
done = AutoPlace(playerNumber, i, item, persistItem);
done = AutoPlaceItemInInventorySlot(playerNumber, i, item, persistItem);
}
for (int i = 10; i <= 19 && !done; i++) {
done = AutoPlace(playerNumber, i, item, persistItem);
done = AutoPlaceItemInInventorySlot(playerNumber, i, item, persistItem);
}
for (int i = 0; i <= 9 && !done; i++) {
done = AutoPlace(playerNumber, i, item, persistItem);
done = AutoPlaceItemInInventorySlot(playerNumber, i, item, persistItem);
}
}
if (itemSize.X == 1 && itemSize.Y == 2) {
for (int i = 29; i >= 20 && !done; i--) {
done = AutoPlace(playerNumber, i, item, persistItem);
done = AutoPlaceItemInInventorySlot(playerNumber, i, item, persistItem);
}
for (int i = 9; i >= 0 && !done; i--) {
done = AutoPlace(playerNumber, i, item, persistItem);
done = AutoPlaceItemInInventorySlot(playerNumber, i, item, persistItem);
}
for (int i = 19; i >= 10 && !done; i--) {
done = AutoPlace(playerNumber, i, item, persistItem);
done = AutoPlaceItemInInventorySlot(playerNumber, i, item, persistItem);
}
}
if (itemSize.X == 1 && itemSize.Y == 3) {
for (int i = 0; i < 20 && !done; i++) {
done = AutoPlace(playerNumber, i, item, persistItem);
done = AutoPlaceItemInInventorySlot(playerNumber, i, item, persistItem);
}
}
if (itemSize.X == 2 && itemSize.Y == 2) {
for (int i = 0; i < 10 && !done; i++) {
done = AutoPlace(playerNumber, AP2x2Tbl[i], item, persistItem);
done = AutoPlaceItemInInventorySlot(playerNumber, AP2x2Tbl[i], item, persistItem);
}
for (int i = 21; i < 29 && !done; i += 2) {
done = AutoPlace(playerNumber, i, item, persistItem);
done = AutoPlaceItemInInventorySlot(playerNumber, i, item, persistItem);
}
for (int i = 1; i < 9 && !done; i += 2) {
done = AutoPlace(playerNumber, i, item, persistItem);
done = AutoPlaceItemInInventorySlot(playerNumber, i, item, persistItem);
}
for (int i = 10; i < 19 && !done; i++) {
done = AutoPlace(playerNumber, i, item, persistItem);
done = AutoPlaceItemInInventorySlot(playerNumber, i, item, persistItem);
}
}
if (itemSize.X == 2 && itemSize.Y == 3) {
for (int i = 0; i < 9 && !done; i++) {
done = AutoPlace(playerNumber, i, item, persistItem);
done = AutoPlaceItemInInventorySlot(playerNumber, i, item, persistItem);
}
for (int i = 10; i < 19 && !done; i++) {
done = AutoPlace(playerNumber, i, item, persistItem);
done = AutoPlaceItemInInventorySlot(playerNumber, i, item, persistItem);
}
}
return done;
}
BOOL AutoPlace(int pnum, int ii, const ItemStruct &item, BOOL saveflag)
BOOL AutoPlaceItemInInventorySlot(int pnum, int ii, const ItemStruct &item, BOOL saveflag)
{
int i, j, xx, yy;
BOOL done;
@ -1364,7 +1364,7 @@ void CheckInvPaste(int pnum, int mx, int my)
SetICursor(plr[pnum].HoldItem._iCurs + CURSOR_FIRSTITEM);
done2h = FALSE;
for (i = 0; i < NUM_INV_GRID_ELEM && !done2h; i++)
done2h = AutoPlace(pnum, i, plr[pnum].HoldItem, TRUE);
done2h = AutoPlaceItemInInventorySlot(pnum, i, plr[pnum].HoldItem, TRUE);
plr[pnum].HoldItem = tempitem;
if (pnum == myplr)
SetCursor_(plr[pnum].HoldItem._iCurs + CURSOR_FIRSTITEM);

2
Source/inv.h
Unescape View File

@ -42,7 +42,7 @@ void DrawInv(CelOutputBuffer out);
void DrawInvBelt(CelOutputBuffer out);
bool AutoEquipEnabled(const PlayerStruct &player, const ItemStruct &item);
bool AutoEquip(int playerNumber, const ItemStruct &item, bool persistItem = true);
BOOL AutoPlace(int pnum, int ii, const ItemStruct &item, BOOL saveflag);
BOOL AutoPlaceItemInInventorySlot(int pnum, int ii, const ItemStruct &item, BOOL saveflag);
BOOL SpecialAutoPlace(int pnum, int ii, const ItemStruct &item);
BOOL GoldAutoPlace(int pnum);
void CheckInvSwap(int pnum, BYTE bLoc, int idx, WORD wCI, int seed, BOOL bId, uint32_t dwBuff);

2
Source/items.cpp
Unescape View File

@ -1404,7 +1404,7 @@ void CreatePlrItems(int p)
{
SetPlrHandItem(&plr[p].HoldItem, IDI_WARRCLUB);
GetPlrHandSeed(&plr[p].HoldItem);
AutoPlace(p, 0, plr[p].HoldItem, TRUE);
AutoPlaceItemInInventorySlot(p, 0, plr[p].HoldItem, TRUE);
}
SetPlrHandItem(&plr[p].SpdList[0], IDI_HEAL);

34
Source/stores.cpp
Unescape View File

@ -216,54 +216,54 @@ void StoreAutoPlace()
}
}
for (i = 30; i <= 39 && !done; i++) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, TRUE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, TRUE);
}
for (i = 20; i <= 29 && !done; i++) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, TRUE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, TRUE);
}
for (i = 10; i <= 19 && !done; i++) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, TRUE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, TRUE);
}
for (i = 0; i <= 9 && !done; i++) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, TRUE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, TRUE);
}
}
if (w == 1 && h == 2 && !done) {
for (i = 29; i >= 20 && !done; i--) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, TRUE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, TRUE);
}
for (i = 9; i >= 0 && !done; i--) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, TRUE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, TRUE);
}
for (i = 19; i >= 10 && !done; i--) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, TRUE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, TRUE);
}
}
if (w == 1 && h == 3 && !done) {
for (i = 0; i < 20 && !done; i++) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, TRUE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, TRUE);
}
}
if (w == 2 && h == 2 && !done) {
for (i = 0; i < 10 && !done; i++) {
done = AutoPlace(myplr, AP2x2Tbl[i], plr[myplr].HoldItem, TRUE);
done = AutoPlaceItemInInventorySlot(myplr, AP2x2Tbl[i], plr[myplr].HoldItem, TRUE);
}
for (i = 21; i < 29 && !done; i += 2) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, TRUE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, TRUE);
}
for (i = 1; i < 9 && !done; i += 2) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, TRUE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, TRUE);
}
for (i = 10; i < 19 && !done; i++) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, TRUE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, TRUE);
}
}
if (w == 2 && h == 3 && !done) {
for (i = 0; i < 9 && !done; i++) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, TRUE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, TRUE);
}
for (i = 10; i < 19 && !done; i++) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, TRUE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, TRUE);
}
}
}
@ -1370,7 +1370,7 @@ void S_SBuyEnter()
}
for (i = 0; i < NUM_INV_GRID_ELEM && !done; i++) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, FALSE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, FALSE);
}
if (done)
StartStore(STORE_CONFIRM);
@ -1438,7 +1438,7 @@ void S_SPBuyEnter()
}
for (i = 0; i < NUM_INV_GRID_ELEM && !done; i++) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, FALSE);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, FALSE);
}
if (done)
StartStore(STORE_CONFIRM);
@ -1884,7 +1884,7 @@ void S_BBuyEnter()
}
for (int i = 0; i < NUM_INV_GRID_ELEM && !done; i++) {
done = AutoPlace(myplr, i, plr[myplr].HoldItem, false);
done = AutoPlaceItemInInventorySlot(myplr, i, plr[myplr].HoldItem, false);
}
StartStore(done ? STORE_CONFIRM : STORE_NOROOM);

Write Preview
Loading…
Cancel
Save