Commit 0f62a8c
committed
Fix torn notes not combining when moved into inventory
Fixes #8487
Torn notes were only combined when picked up from the ground via
CheckQuestItem(). When notes entered the inventory through other
paths (e.g. stash transfers, item swaps), the combine logic never
ran.
Add CheckSpecialInventoryItem() which checks whether all three torn
notes are present after an item is placed into InvList, and combines
them into the full note if so.
Called from:
- ChangeInvItem (empty slot path)
- ChangeInvItem (swap path)
- AutoPlaceItemInInventory (covers stash-to-inventory transfers)1 parent 5a08031 commit 0f62a8c
2 files changed
Lines changed: 58 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
498 | 498 | | |
499 | 499 | | |
500 | 500 | | |
501 | | - | |
| 501 | + | |
502 | 502 | | |
503 | 503 | | |
504 | 504 | | |
| |||
512 | 512 | | |
513 | 513 | | |
514 | 514 | | |
| 515 | + | |
515 | 516 | | |
516 | 517 | | |
| 518 | + | |
| 519 | + | |
517 | 520 | | |
518 | 521 | | |
519 | 522 | | |
| |||
1121 | 1124 | | |
1122 | 1125 | | |
1123 | 1126 | | |
| 1127 | + | |
| 1128 | + | |
| 1129 | + | |
| 1130 | + | |
| 1131 | + | |
| 1132 | + | |
| 1133 | + | |
| 1134 | + | |
| 1135 | + | |
| 1136 | + | |
| 1137 | + | |
| 1138 | + | |
| 1139 | + | |
| 1140 | + | |
| 1141 | + | |
| 1142 | + | |
| 1143 | + | |
| 1144 | + | |
| 1145 | + | |
| 1146 | + | |
| 1147 | + | |
| 1148 | + | |
| 1149 | + | |
| 1150 | + | |
| 1151 | + | |
| 1152 | + | |
| 1153 | + | |
| 1154 | + | |
| 1155 | + | |
| 1156 | + | |
| 1157 | + | |
| 1158 | + | |
| 1159 | + | |
| 1160 | + | |
| 1161 | + | |
| 1162 | + | |
| 1163 | + | |
| 1164 | + | |
| 1165 | + | |
| 1166 | + | |
| 1167 | + | |
| 1168 | + | |
| 1169 | + | |
1124 | 1170 | | |
1125 | 1171 | | |
1126 | 1172 | | |
| |||
1400 | 1446 | | |
1401 | 1447 | | |
1402 | 1448 | | |
| 1449 | + | |
1403 | 1450 | | |
1404 | | - | |
| 1451 | + | |
1405 | 1452 | | |
1406 | 1453 | | |
1407 | 1454 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
148 | 148 | | |
149 | 149 | | |
150 | 150 | | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
151 | 160 | | |
152 | 161 | | |
153 | 162 | | |
| |||
0 commit comments