Preserve player_race across chained changes to the shape

May resolve #426 .
NickMcConnell · Jun 12, 2024 · bfa0a54 · bfa0a54
1 parent ec2db66
commit bfa0a54
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/mon-util.c b/src/mon-util.c
@@ -1734,9 +1734,12 @@ bool monster_change_shape(struct monster *mon)
 
 	/* Set the race */
 	if (race) {
-		if (!mon->original_race) mon->original_race = mon->race;
+		if (!mon->original_race) {
+			mon->original_race = mon->race;
+			assert(!mon->original_player_race);
+			mon->original_player_race = mon->player_race;
+		}
 		mon->race = race;
-		mon->original_player_race = mon->player_race;
 		if (rf_has(race->flags, RF_PLAYER)) {
 			mon->player_race = get_player_race();
 		} else {