mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-12-24 14:36:02 +00:00
Code Issues Releases Wiki Activity

cleaned up where summoned creature appears for Orb of Life and Orb of Friendship

Browse Source
This commit is contained in:
Zeno Rogue
2021-08-08 19:04:58 +02:00
parent 683ab67ad9
commit 025893e946
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
complex.cpp
View File

@@ -144,7 +144,7 @@ EX namespace whirlwind {
animateMovement(match(whirlline[i+1], whirlline[i]), LAYER_BOAT);
}
for(int i=0; i<z; i++)
pickupMovedItems(whirlline[i]);
pickupMovedItems(whirlline[i], i==z-1 ? whirlline[0] : whirlline[i+1]);
}
EX void move() {
@@ -1119,8 +1119,8 @@ EX namespace whirlpool {
if(wfrom->item == itKey || wfrom->item == itOrbYendor)
for(int i=0; i<wto->type; i++) createMov(wto, i);
moveItem(wfrom, wto, false);
pickupMovedItems(wfrom);
pickupMovedItems(wto);
pickupMovedItems(wfrom, wto);
pickupMovedItems(wto, wfrom);
}
if(wto && !wfrom)
@@ -2466,7 +2466,7 @@ EX void livecaves() {
if(hv > 0 && c->wall == waNone) {
if(c->item && c->cpdist == 1 && markOrb(itOrbWater)) {
bool saf = c->item == itOrbSafety;
collectItem(c);
collectItem(c, c);
if(saf) return;
}
c->wall = waSea;