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

Split level temperature message into function

Browse Source
This commit is contained in:
Pasi Kallinen
2023-03-05 12:34:33 +02:00
parent 3cd6b00ab7
commit db0441bf02
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/do.c
View File

@@ -20,6 +20,7 @@ static boolean u_stuck_cannot_go(const char *);
static NHFILE *currentlevel_rewrite(void); static NHFILE *currentlevel_rewrite(void);
static void familiar_level_msg(void); static void familiar_level_msg(void);
static void final_level(void); static void final_level(void);
static void temperature_change_msg(schar);
/* static boolean badspot(coordxy,coordxy); */ /* static boolean badspot(coordxy,coordxy); */
@@ -1830,16 +1831,7 @@ goto_level(
} }
} }
if (prev_temperature != gl.level.flags.temperature) { temperature_change_msg(prev_temperature);
if (gl.level.flags.temperature)
hellish_smoke_mesg();
else if (prev_temperature > 0)
pline_The("heat %s gone.",
In_hell(&u.uz0)
? "and smoke are" : "is");
else if (prev_temperature < 0)
You("are out of the cold.");
}
/* this was originally done earlier; moved here to be logged after /* this was originally done earlier; moved here to be logged after
any achievement related to entering a dungeon branch any achievement related to entering a dungeon branch
@@ -1903,6 +1895,22 @@ hellish_smoke_mesg(void)
olfaction(gy.youmonst.data) ? "smell" : "sense"); olfaction(gy.youmonst.data) ? "smell" : "sense");
} }
/* give a message when the level temperature is different from previous */
static void
temperature_change_msg(schar prev_temperature)
{
if (prev_temperature != gl.level.flags.temperature) {
if (gl.level.flags.temperature)
hellish_smoke_mesg();
else if (prev_temperature > 0)
pline_The("heat %s gone.",
In_hell(&u.uz0)
? "and smoke are" : "is");
else if (prev_temperature < 0)
You("are out of the cold.");
}
}
/* usually called from goto_level(); might be called from Sting_effects() */ /* usually called from goto_level(); might be called from Sting_effects() */
void void
maybe_lvltport_feedback(void) maybe_lvltport_feedback(void)