openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Add option for move items node to pull from containers

Browse Source
This commit is contained in:
Celtic Minstrel
2023-01-30 00:10:24 -05:00
parent 0bfa325060
commit 1ac7132733
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/game/boe.specials.cpp
View File

@@ -4397,14 +4397,16 @@ void rect_spec(const runtime_state& ctx){
if(is_out()) if(is_out())
return; return;
bool isContainer = is_container(loc(spec.sd1,spec.sd2)); bool isContainer = is_container(loc(spec.sd1,spec.sd2));
for(short k = 0; k < univ.town.items.size(); k++) bool moveContainer = spec.pictype > 0;
if(univ.town.items[k].variety != eItemType::NO_ITEM && univ.town.items[k].item_loc == l) { for(auto& item : univ.town.items)
univ.town.items[k].item_loc.x = spec.sd1; if(item.variety != eItemType::NO_ITEM && item.item_loc == l) {
univ.town.items[k].item_loc.y = spec.sd2; if(item.contained && !moveContainer) continue;
if(isContainer && spec.m3) { item.item_loc.x = spec.sd1;
univ.town.items[k].contained = is_container(univ.town.items[k].item_loc); item.item_loc.y = spec.sd2;
if(isContainer && spec.m3 > 0) {
item.contained = is_container(item.item_loc);
if(univ.town.is_crate(spec.sd1,spec.sd2) || univ.town.is_barrel(spec.sd1,spec.sd2)) if(univ.town.is_crate(spec.sd1,spec.sd2) || univ.town.is_barrel(spec.sd1,spec.sd2))
univ.town.items[k].held = true; item.held = true;
} }
} }
break; break;