Merge branch 'NetHack-3.6'

This commit is contained in:
nhmall
2019-10-02 09:36:36 -04:00
2 changed files with 2 additions and 1 deletions
+1
View File
@@ -156,6 +156,7 @@ uarmh null pointer dereference if a helm of opposite alignment came off due
to being polymorphed to being polymorphed
verb tense was inappropriate in some messages when a mon/pet had a name verb tense was inappropriate in some messages when a mon/pet had a name
ending in 's' ending in 's'
orctown booty items should have been initialized in mksobj()
Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository
+1 -1
View File
@@ -698,7 +698,7 @@ const char *gang;
{ {
struct obj *otmp; struct obj *otmp;
otmp = mksobj_migr_to_species(otyp, (unsigned long) M2_ORC, FALSE, FALSE); otmp = mksobj_migr_to_species(otyp, (unsigned long) M2_ORC, TRUE, FALSE);
if (otmp && gang) { if (otmp && gang) {
new_oname(otmp, strlen(gang) + 1); /* removes old name if present */ new_oname(otmp, strlen(gang) + 1); /* removes old name if present */
Strcpy(ONAME(otmp), gang); Strcpy(ONAME(otmp), gang);