mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-21 08:00:25 +00:00
Code Issues Releases Wiki Activity

newlands:: fixed Orb of Choice

Browse Source
This commit is contained in:
Zeno Rogue 2018-12-23 17:54:38 +01:00
parent acdb9d2219
commit 30c4d798db
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
game.cpp
View File

@ -6887,6 +6887,7 @@ bool collectItem(cell *c2, bool telekinesis) {
int pg = gold(); int pg = gold();
bool dopickup = true; bool dopickup = true;
bool had_choice = false;
if(cannotPickupItem(c2, telekinesis)) if(cannotPickupItem(c2, telekinesis))
return false; return false;
@ -6928,6 +6929,7 @@ bool collectItem(cell *c2, bool telekinesis) {
else if(it == itOrbSpeed) playSound(c2, "pickup-speed"); else if(it == itOrbSpeed) playSound(c2, "pickup-speed");
else if(it == itRevolver) playSound(c2, "pickup-key"); else if(it == itRevolver) playSound(c2, "pickup-key");
else playSound(c2, "pickup-orb"); else playSound(c2, "pickup-orb");
if(items[itOrbChoice]) items[itOrbChoice] = 0, had_choice = true;
int oc = orbcharges(it); int oc = orbcharges(it);
if(markOrb(itOrbBrown)) oc = oc * 6 / 5; if(markOrb(itOrbBrown)) oc = oc * 6 / 5;
if(!items[it]) items[it]++; if(!items[it]) items[it]++;
@ -7098,9 +7100,7 @@ bool collectItem(cell *c2, bool telekinesis) {
c2->landparam &= ~1; c2->landparam &= ~1;
} }
if(items[itOrbChoice] && itemclass(c2->item) == IC_ORB) if(!had_choice)
items[itOrbChoice] = 0;
else
c2->item = itNone; c2->item = itNone;
} }
// if(c2->land == laHive) // if(c2->land == laHive)