Merge branch 'NetHack-3.6.2'
This commit is contained in:
@@ -1074,7 +1074,7 @@ struct obj *obj;
|
||||
if ((u.dx || u.dy) && (g.bhitpos.x != u.ux || g.bhitpos.y != u.uy)) {
|
||||
int x = g.bhitpos.x - u.dx, y = g.bhitpos.y - u.dy;
|
||||
|
||||
tmp_at(DISP_FLASH, obj_to_glyph(obj));
|
||||
tmp_at(DISP_FLASH, obj_to_glyph(obj, rn2_on_display_rng));
|
||||
while (isok(x,y) && (x != u.ux || y != u.uy)) {
|
||||
tmp_at(x, y);
|
||||
delay_output();
|
||||
@@ -1143,7 +1143,7 @@ boolean twoweap; /* used to restore twoweapon mode if wielded weapon returns */
|
||||
g.bhitpos.x = mon->mx;
|
||||
g.bhitpos.y = mon->my;
|
||||
if (tethered_weapon)
|
||||
tmp_at(DISP_TETHER, obj_to_glyph(obj));
|
||||
tmp_at(DISP_TETHER, obj_to_glyph(obj, rn2_on_display_rng));
|
||||
} else if (u.dz) {
|
||||
if (u.dz < 0
|
||||
/* Mjollnir must we wielded to be thrown--caller verifies this;
|
||||
@@ -1372,7 +1372,7 @@ boolean twoweap; /* used to restore twoweapon mode if wielded weapon returns */
|
||||
}
|
||||
|
||||
if (!IS_SOFT(levl[g.bhitpos.x][g.bhitpos.y].typ) && breaktest(obj)) {
|
||||
tmp_at(DISP_FLASH, obj_to_glyph(obj));
|
||||
tmp_at(DISP_FLASH, obj_to_glyph(obj, rn2_on_display_rng));
|
||||
tmp_at(g.bhitpos.x, g.bhitpos.y);
|
||||
delay_output();
|
||||
tmp_at(DISP_END, 0);
|
||||
|
||||
Reference in New Issue
Block a user