Reset monsters' peaceful statuses^Chen loading bones. Fixes C343-66.

sgrunt · Apr 15, 2012 · f490ac4 · f490ac4
1 parent 35d257e
commit f490ac4
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/restore.c b/src/restore.c
@@ -297,6 +297,18 @@ boolean ghostly;
 			}
 		}
 
+		if (ghostly) {
+		        /* these cases are from makemon.c */
+		        mtmp->mpeaceful = peace_minded(mtmp);
+			if (is_unicorn(mtmp->data) &&
+			    sgn(u.ualign.type) == sgn(mtmp->data->maligntyp))
+			    mtmp->mpeaceful = TRUE;
+			else if (mtmp->data->mlet == S_ORC &&
+			         Race_if(PM_ELF))
+		            mtmp->mpeaceful = FALSE;
+			set_malign(mtmp);
+		}
+
 		if (mtmp->isshk) restshk(mtmp, ghostly);
 		if (mtmp->ispriest) restpriest(mtmp, ghostly);