mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-06-16 10:19:58 +00:00
changes: fixed items disappearing with Orb of Magnetism
This commit is contained in:
parent
ca59e464b1
commit
ed015de6c9
|
@ -31,7 +31,9 @@ EX bool canPickupItemWithMagnetism(cell *c, cell *from) {
|
||||||
EX bool doPickupItemsWithMagnetism(cell *c) {
|
EX bool doPickupItemsWithMagnetism(cell *c) {
|
||||||
cell *csaf = NULL;
|
cell *csaf = NULL;
|
||||||
if(items[itOrbMagnetism])
|
if(items[itOrbMagnetism])
|
||||||
forCellEx(c3, c) if(canPickupItemWithMagnetism(c3, c)) {
|
forCellEx(c3, c) if(canPickupItemWithMagnetism(c3, c)) {
|
||||||
|
changes.ccell(c3);
|
||||||
|
changes.ccell(c);
|
||||||
if(c3->item == itCompass) {
|
if(c3->item == itCompass) {
|
||||||
if(!c->item)
|
if(!c->item)
|
||||||
moveItem(c3, c, false);
|
moveItem(c3, c, false);
|
||||||
|
@ -52,8 +54,11 @@ EX void pickupMovedItems(cell *c) {
|
||||||
if(isPlayerOn(c)) collectItem(c, true);
|
if(isPlayerOn(c)) collectItem(c, true);
|
||||||
if(items[itOrbMagnetism])
|
if(items[itOrbMagnetism])
|
||||||
forCellEx(c2, c)
|
forCellEx(c2, c)
|
||||||
if(isPlayerOn(c2) && canPickupItemWithMagnetism(c, c2))
|
if(isPlayerOn(c2) && canPickupItemWithMagnetism(c, c2)) {
|
||||||
|
changes.ccell(c2);
|
||||||
|
changes.ccell(c);
|
||||||
collectItem(c, true);
|
collectItem(c, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EX bool collectItem(cell *c2, bool telekinesis IS(false)) {
|
EX bool collectItem(cell *c2, bool telekinesis IS(false)) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user