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

Split level rnd mon generation into separate function

Browse Source
This commit is contained in:
Pasi Kallinen
2026-04-04 16:08:58 +03:00
parent 5f1163c11a
commit c5efbf6cf7
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/allmain.c
View File

@@ -13,7 +13,7 @@
staticfn void moveloop_preamble(boolean); staticfn void moveloop_preamble(boolean);
staticfn void u_calc_moveamt(int); staticfn void u_calc_moveamt(int);
staticfn void maybe_generate_rnd_mon(void);
staticfn void maybe_do_tutorial(void); staticfn void maybe_do_tutorial(void);
#ifdef POSITIONBAR #ifdef POSITIONBAR
staticfn void do_positionbar(void); staticfn void do_positionbar(void);
@@ -156,6 +156,16 @@ u_calc_moveamt(int wtcap)
u.umovement = 0; u.umovement = 0;
} }
/* small chance of generating a new random monster */
staticfn void
maybe_generate_rnd_mon(void)
{
if (!rn2(u.uevent.udemigod ? 25
: (depth(&u.uz) > depth(&stronghold_level)) ? 50
: 70))
(void) makemon((struct permonst *) 0, 0, 0, NO_MM_FLAGS);
}
#if defined(MICRO) || defined(WIN32) #if defined(MICRO) || defined(WIN32)
static int mvl_abort_lev; static int mvl_abort_lev;
#endif #endif
@@ -226,11 +236,7 @@ moveloop_core(void)
/* occasionally add another monster; since this takes /* occasionally add another monster; since this takes
place after movement has been allotted, the new place after movement has been allotted, the new
monster effectively loses its first turn */ monster effectively loses its first turn */
if (!rn2(u.uevent.udemigod ? 25 maybe_generate_rnd_mon();
: (depth(&u.uz) > depth(&stronghold_level)) ? 50
: 70))
(void) makemon((struct permonst *) 0, 0, 0,
NO_MM_FLAGS);
u_calc_moveamt(mvl_wtcap); u_calc_moveamt(mvl_wtcap);
settrack(); settrack();