nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

pull request #714 - dosacrifice() change

Browse Source 
Move some #offer code into a separate routine to eliminate one 'goto'.

Closes #714
This commit is contained in:
PatR
2022-04-08 09:41:27 -07:00
parent 81a4c2ed4c 8497b1c8ec
commit 8094a59abb
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/pray.c
View File

@@ -19,6 +19,7 @@ static void fry_by_god(aligntyp, boolean);
static void gods_angry(aligntyp);
static void gods_upset(aligntyp);
static void consume_offering(struct obj *);
static void offer_too_soon(aligntyp);
static boolean water_prayer(boolean);
static boolean blocked_boulder(int, int);
@@ -1410,6 +1411,25 @@ consume_offering(struct obj *otmp)
exercise(A_WIS, TRUE);
}
static void
offer_too_soon(aligntyp altaralign)
{
if (altaralign == A_NONE && Inhell)
/* hero has left Moloch's Sanctum so is in the process
of getting away with the Amulet (outside of Gehennom,
fall through to the "ashamed" feedback) */
gods_upset(A_NONE);
else
You_feel("%s.",
Hallucination
? "homesick"
/* if on track, give a big hint */
: (altaralign == u.ualign.type)
? "an urge to return to the surface"
/* else headed towards celestial disgrace */
: "ashamed");
}
/* the #offer command - sacrifice something to the gods */
int
dosacrifice(void)
@@ -1601,21 +1621,7 @@ dosacrifice(void)
if (otmp->otyp == AMULET_OF_YENDOR) {
if (!highaltar) {
too_soon:
if (altaralign == A_NONE && Inhell)
/* hero has left Moloch's Sanctum so is in the process
of getting away with the Amulet (outside of Gehennom,
fall through to the "ashamed" feedback) */
gods_upset(A_NONE);
else
You_feel("%s.",
Hallucination
? "homesick"
/* if on track, give a big hint */
: (altaralign == u.ualign.type)
? "an urge to return to the surface"
/* else headed towards celestial disgrace */
: "ashamed");
offer_too_soon(altaralign);
return ECMD_TIME;
} else {
/* The final Test. Did you win? */
@@ -1673,8 +1679,10 @@ dosacrifice(void)
} /* real Amulet */
if (otmp->otyp == FAKE_AMULET_OF_YENDOR) {
if (!highaltar && !otmp->known)
goto too_soon;
if (!highaltar && !otmp->known) {
offer_too_soon(altaralign);
return ECMD_TIME;
}
You_hear("a nearby thunderclap.");
if (!otmp->known) {
You("realize you have made a %s.",