From fba07614de4b9b535d7aaa27b7e17b327f724b09 Mon Sep 17 00:00:00 2001 From: hatcatter Date: Mon, 31 Jul 2023 11:10:00 +0200 Subject: [PATCH 1/3] Revert "Fix: Elven race wasn't getting the correct symbol." --- hackem_changelog.txt | 1 + src/mon.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hackem_changelog.txt b/hackem_changelog.txt index 124b098ce..d63534aed 100644 --- a/hackem_changelog.txt +++ b/hackem_changelog.txt @@ -16,6 +16,7 @@ Hardfought hotfixes (released July 30, 2023) +Revert Fix: Elven race wasn't getting the correct symbol. Fix: Memory leaks when get_faux_artifact_obj is used. Fix: Object lookup used total weight of a item stack in player's possession - not the base weight. Fix: Object lookup leaking info for object's in player's possession. diff --git a/src/mon.c b/src/mon.c index 0e80e33e3..1d8f5ecbd 100644 --- a/src/mon.c +++ b/src/mon.c @@ -6931,7 +6931,6 @@ short raceidx; rptr->ralign = 0; if (mtmp->mnum == PM_KNIGHT || mtmp->mnum == PM_YEOMAN) rptr->ralign = 3; - mtmp->data->mlet = S_HUMAN; break; case PM_GIANT: /* Giants get a clobber attack */ From 33fab5c30b927986f7d6284e0e645918454079dc Mon Sep 17 00:00:00 2001 From: hatcatter Date: Mon, 31 Jul 2023 11:11:34 +0200 Subject: [PATCH 2/3] Revert "Fix: Human NPCs didn't have the correct symbol. Fixes #396." --- hackem_changelog.txt | 1 + src/mon.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hackem_changelog.txt b/hackem_changelog.txt index d63534aed..e09aa15d7 100644 --- a/hackem_changelog.txt +++ b/hackem_changelog.txt @@ -16,6 +16,7 @@ Hardfought hotfixes (released July 30, 2023) +Revert Fix: Human NPCs didn't have the correct symbol. Fixes #396. Revert Fix: Elven race wasn't getting the correct symbol. Fix: Memory leaks when get_faux_artifact_obj is used. Fix: Object lookup used total weight of a item stack in player's possession - not the base weight. diff --git a/src/mon.c b/src/mon.c index 1d8f5ecbd..a3e67bec3 100644 --- a/src/mon.c +++ b/src/mon.c @@ -6996,7 +6996,6 @@ short raceidx; rptr->ralign = rn2(2) ? 3 : rn2(2) ? 0 : -3; if (mtmp->mnum == PM_JEDI) rptr->ralign = 3; - mtmp->data->mlet = S_HUMAN; break; case PM_ILLITHID: /* Illithids get a tentacle attack */ From 74581f8c7ed947571641221ccb301de514697535 Mon Sep 17 00:00:00 2001 From: hatcatter Date: Mon, 31 Jul 2023 11:14:13 +0200 Subject: [PATCH 3/3] Revert "mplayer symbols reflect their actual race." This caused weird symbols for soldiers. --- hackem_changelog.txt | 1 + src/mon.c | 18 ------------------ 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/hackem_changelog.txt b/hackem_changelog.txt index e09aa15d7..432383aeb 100644 --- a/hackem_changelog.txt +++ b/hackem_changelog.txt @@ -16,6 +16,7 @@ Hardfought hotfixes (released July 30, 2023) +Revert mplayer symbols reflect their actual race. Revert Fix: Human NPCs didn't have the correct symbol. Fixes #396. Revert Fix: Elven race wasn't getting the correct symbol. Fix: Memory leaks when get_faux_artifact_obj is used. diff --git a/src/mon.c b/src/mon.c index a3e67bec3..f7680c896 100644 --- a/src/mon.c +++ b/src/mon.c @@ -6907,8 +6907,6 @@ short raceidx; if (mtmp->mnum == PM_HEALER || mtmp->mnum == PM_VALKYRIE || mtmp->mnum == PM_YEOMAN) rptr->ralign = 0; - - mtmp->data->mlet = S_CENTAUR; break; case PM_DOPPELGANGER: rptr->ralign = 0; @@ -6922,8 +6920,6 @@ short raceidx; rptr->ralign = 0; if (mtmp->mnum == PM_KNIGHT) rptr->ralign = 3; - - mtmp->data->mlet = S_HUMANOID; break; case PM_ELF: rptr->ralign = rn2(3) ? 3 : 0; @@ -6954,8 +6950,6 @@ short raceidx; rptr->ralign = rn2(2) ? 0 : 3; if (mtmp->mnum == PM_BARBARIAN || mtmp->mnum == PM_WIZARD) rptr->ralign = rn2(2) ? 0 : -3; - - mtmp->data->mlet = S_GIANT; break; case PM_GNOME: rptr->ralign = 0; @@ -6964,8 +6958,6 @@ short raceidx; if (mtmp->mnum == PM_RANGER || mtmp->mnum == PM_ROGUE || mtmp->mnum == PM_WIZARD || mtmp->mnum == PM_PIRATE) rptr->ralign = rn2(3) ? 0 : -3; - - mtmp->data->mlet = S_GNOME; break; case PM_HOBBIT: rptr->ralign = 0; @@ -6974,8 +6966,6 @@ short raceidx; if (mtmp->mnum == PM_ARCHEOLOGIST || mtmp->mnum == PM_PRIEST || mtmp->mnum == PM_PRIESTESS || mtmp->mnum == PM_YEOMAN) rptr->ralign = rn2(3) ? 0 : 3; - - mtmp->data->mlet = S_HUMANOID; break; case PM_HUMAN: if (mtmp->mnum == PM_CONVICT || mtmp->mnum == PM_NECROMANCER) @@ -7005,21 +6995,15 @@ short raceidx; rptr->mattk[2].damd = 1; rptr->ralign = -3; - - mtmp->data->mlet = S_HUMANOID; break; case PM_ORC: rptr->ralign = -3; - - mtmp->data->mlet = S_ORC; break; case PM_TORTLE: rptr->ralign = 0; if (mtmp->mnum == PM_ARCHEOLOGIST || mtmp->mnum == PM_MONK || mtmp->mnum == PM_PRIEST || mtmp->mnum == PM_PRIESTESS) rptr->ralign = rn2(4) ? 3 : 0; - - mtmp->data->mlet = S_LIZARD; break; case PM_VAMPIRIC: /* Vampires get a bite attack */ @@ -7029,8 +7013,6 @@ short raceidx; rptr->mattk[2].damd = 6; rptr->ralign = -3; - - mtmp->data->mlet = S_VAMPIRE; break; }