Mercurial > hg > early-roguelike

diff srogue/sticks.c @ 311:28e22fb35989

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix one more batch of compiler warnings. A few of these were potential bugs.
author John "Elwin" Edwards
date Tue, 04 May 2021 21:03:47 -0400
parents e52a8a7ad4c5
children
line wrap: on
line diff
--- a/srogue/sticks.c	Mon May 03 19:05:37 2021 -0400
+++ b/srogue/sticks.c	Tue May 04 21:03:47 2021 -0400
@@ -230,19 +230,20 @@
 			tp = THINGPTR(item);
 			omonst = tp->t_indx;
 			if (wh == WS_POLYM && !curse) {
+				int newmonst;
 				detach(mlist, item);
 				discard(item);
 				oldch = tp->t_oldch;
 				delta.y = y;
 				delta.x = x;
-				monster = rnd_mon(FALSE, TRUE);
-				item = new_monster(monster, &delta, FALSE);
+				newmonst = rnd_mon(FALSE, TRUE);
+				item = new_monster(newmonst, &delta, FALSE);
 				if (!(tp->t_flags & ISRUN))
 					runto(&delta, &hero);
 				if (isalpha(mvwinch(cw, y, x)))
-					mvwaddch(cw, y, x, monsters[monster].m_show);
+					mvwaddch(cw, y, x, monsters[newmonst].m_show);
 				tp->t_oldch = oldch;
-				ws_know[WS_POLYM] |= (monster != omonst);
+				ws_know[WS_POLYM] |= (newmonst != omonst);
 			}
 			else if (wh == WS_MINVIS && !bless) {
 				tp->t_flags |= ISINVIS;