nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Fix reversed stinking cloud targeting logic

Browse Source 
...and give indication when blessed scroll of fire was targeted
at illegal position.
This commit is contained in:
Pasi Kallinen
2017-08-24 09:04:54 +03:00
parent c7d13d6fa3
commit d1b4253307
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/read.c
+4 -3
View File
@@ -930,7 +930,7 @@ is_valid_stinking_cloud_pos(x, y, showmsg)
int x, y; int x, y;
boolean showmsg; boolean showmsg;
{ {
if (get_valid_stinking_cloud_pos(x,y)) { if (!get_valid_stinking_cloud_pos(x,y)) {
if (showmsg) if (showmsg)
You("smell rotten eggs."); You("smell rotten eggs.");
return FALSE; return FALSE;
@@ -1594,12 +1594,13 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
pline("Where do you want to center the explosion?"); pline("Where do you want to center the explosion?");
getpos_sethilite(display_stinking_cloud_positions, get_valid_stinking_cloud_pos); getpos_sethilite(display_stinking_cloud_positions, get_valid_stinking_cloud_pos);
(void) getpos(&cc, TRUE, "the desired position"); (void) getpos(&cc, TRUE, "the desired position");
if (is_valid_stinking_cloud_pos(cc.x, cc.y, FALSE)) { if (!is_valid_stinking_cloud_pos(cc.x, cc.y, FALSE)) {
/* try to reach too far, get burned */ /* try to reach too far, get burned */
cc.x = u.ux; cc.x = u.ux;
cc.y = u.uy; cc.y = u.uy;
} }
} else { }
if (cc.x == u.ux && cc.y == u.uy) {
pline_The("scroll erupts in a tower of flame!"); pline_The("scroll erupts in a tower of flame!");
iflags.last_msg = PLNMSG_TOWER_OF_FLAME; /* for explode() */ iflags.last_msg = PLNMSG_TOWER_OF_FLAME; /* for explode() */
burn_away_slime(); burn_away_slime();