Merge branch 'NetHack-3.6'
This commit is contained in:
@@ -1390,7 +1390,7 @@ movebubbles()
|
||||
struct bubble *b;
|
||||
struct container *cons;
|
||||
struct trap *btrap;
|
||||
int x, y, i, j;
|
||||
int x, y, i, j, bcpin;
|
||||
|
||||
/* set up the portal the first time bubbles are moved */
|
||||
if (!g.wportal)
|
||||
@@ -1401,7 +1401,7 @@ movebubbles()
|
||||
if (Is_waterlevel(&u.uz)) {
|
||||
/* keep attached ball&chain separate from bubble objects */
|
||||
if (Punished)
|
||||
unplacebc();
|
||||
bcpin = unplacebc_and_covet_placebc();
|
||||
|
||||
/*
|
||||
* Pick up everything inside of a bubble then fill all bubble
|
||||
@@ -1518,7 +1518,7 @@ movebubbles()
|
||||
|
||||
/* put attached ball&chain back */
|
||||
if (Is_waterlevel(&u.uz) && Punished)
|
||||
placebc();
|
||||
lift_covet_and_placebc(bcpin);
|
||||
g.vision_full_recalc = 1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user