Skip to content

move former_rank[] out of monst, into mextra #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k21971 merged 6 commits into from
Feb 5, 2025
Merged

move former_rank[] out of monst, into mextra #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8aa320c
move former_rank[] out of monst, into mextra
nhmall Feb 2, 2025
0ec85f2
remove field from monst
nhmall Feb 2, 2025
c30035b
update per suggestion from paxed
nhmall Feb 2, 2025
3a3de40
update parentmid during mextra former init
nhmall Feb 2, 2025
6f60ba2
use ebones struct naming that some variants use
nhmall Feb 4, 2025
b5d1f98
Merge branch 'master' into change-former-rank
nhmall Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions include/mondata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,6 @@
|| objects[(obj)->otyp].oc_material == VEGGY \
|| ((obj)->otyp == CORPSE && (obj)->corpsenm == PM_LICHEN))))

#define is_bones_monster(ptr) \
((ptr) == &mons[PM_GHOST] || (ptr) == &mons[PM_GHOUL] \
|| (ptr) == &mons[PM_VAMPIRE] || (ptr) == &mons[PM_WRAITH] \
|| (ptr) == &mons[PM_GREEN_SLIME] || (ptr)->mlet == S_MUMMY)

#ifdef PMNAME_MACROS
#define pmname(ptr,g) ((((g) == MALE || (g) == FEMALE) && (ptr)->pmnames[g]) \
? (ptr)->pmnames[g] : (ptr)->pmnames[NEUTRAL])
Expand Down
3 changes: 0 additions & 3 deletions include/monst.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,6 @@ struct monst {
struct obj *mw; /* mon's weapon */
long misc_worn_check; /* mon's wornmask */
xint16 weapon_check; /* flag for whether to try switching weapons */

char former_rank[25]; /* for bones' ghost rank in their former life */

int meating; /* monster is eating timeout */
struct mextra *mextra; /* point to mextra struct */
};
Expand Down
18 changes: 8 additions & 10 deletions src/do_name.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,13 +954,14 @@ x_monnam(
} else if (do_name && has_mgivenname(mtmp)) {
char *name = MGIVENNAME(mtmp);

#if 0
/* hardfought */
if (has_ebones(mtmp)) {
#endif
if (mdat == &mons[PM_GHOST]) {
Sprintf(eos(buf), "%s ghost", s_suffix(name));
name_at_start = TRUE;
if (has_ebones(mtmp)) {
if (mdat == &mons[PM_GHOST]) {
Sprintf(eos(buf), "%s ghost", s_suffix(name));
name_at_start = TRUE;
} else {
Sprintf(eos(buf), "%s the %s", name, pm_name);
name_at_start = TRUE;
}
} else if (called) {
Sprintf(eos(buf), "%s called %s", pm_name, name);
name_at_start = (boolean) type_is_pname(mdat);
Expand All @@ -980,9 +981,6 @@ x_monnam(
Strcat(buf, name);
name_at_start = TRUE;
}
#if 0 /* hardfought */
}
#endif
} else if (is_mplayer(mdat) && !In_endgame(&u.uz)) {
char pbuf[BUFSZ];

Expand Down
8 changes: 0 additions & 8 deletions src/end.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,14 +254,6 @@ done_in_by(struct monst *mtmp, int how)
: "%s imitating %s",
realnm, shape);
mptr = mtmp->data; /* reset for mimicker case */
#if 0 /* hardfought */
} else if (has_ebones(mtmp)) {
Strcpy(buf, m_monnam(mtmp));
#endif
} else if (mptr == &mons[PM_GHOST]) {
Strcat(buf, "ghost");
if (has_mgivenname(mtmp))
Sprintf(eos(buf), " of %s", MGIVENNAME(mtmp));
} else if (mtmp->isshk) {
const char *shknm = shkname(mtmp),
*honorific = shkname_is_pname(mtmp) ? ""
Expand Down
4 changes: 0 additions & 4 deletions src/mon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3641,8 +3641,6 @@ xkilled(
/* malign was already adjusted for u.ualign.type and randomization */
adjalign(mtmp->malign);

#if 0 /* HARDFOUGHT-only at present */
#ifdef LIVELOG
if (has_ebones(mtmp)) {
livelog_printf(LL_UMONST, "destroyed %s, %s former %s",
livelog_mon_nam(mtmp),
Expand All @@ -3651,8 +3649,6 @@ xkilled(
EBONES(mtmp)->mnum,
EBONES(mtmp)->female));
}
#endif /* LIVELOG */
#endif
return;
}

Expand Down