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

Merge branch 'keni-staticfn' into NetHack-3.7

Browse Source
This commit is contained in:
nhkeni
2024-03-16 09:38:21 -04:00
parent c91d8d9450 9c0ed8ae63
commit 54c3dd35ac
116 changed files with 3952 additions and 3955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
src/read.c
View File

@@ -8,51 +8,51 @@
#define Your_Own_Role(mndx) ((mndx) == gu.urole.mnum)
#define Your_Own_Race(mndx) ((mndx) == gu.urace.mnum)
static boolean learnscrolltyp(short);
static void cap_spe(struct obj *);
static char *erode_obj_text(struct obj *, char *);
static char *hawaiian_design(struct obj *, char *);
static int read_ok(struct obj *);
static void stripspe(struct obj *);
static void p_glow1(struct obj *);
static void p_glow2(struct obj *, const char *);
static void forget(int);
static int maybe_tame(struct monst *, struct obj *);
static boolean can_center_cloud(coordxy, coordxy);
static void display_stinking_cloud_positions(boolean);
static void seffect_enchant_armor(struct obj **);
static void seffect_destroy_armor(struct obj **);
static void seffect_confuse_monster(struct obj **);
static void seffect_scare_monster(struct obj **);
static void seffect_remove_curse(struct obj **);
static void seffect_create_monster(struct obj **);
static void seffect_enchant_weapon(struct obj **);
static void seffect_taming(struct obj **);
static void seffect_genocide(struct obj **);
static void seffect_light(struct obj **);
static void seffect_charging(struct obj **);
static void seffect_amnesia(struct obj **);
static void seffect_fire(struct obj **);
static void seffect_earth(struct obj **);
static void seffect_punishment(struct obj **);
static void seffect_stinking_cloud(struct obj **);
static void seffect_blank_paper(struct obj **);
static void seffect_teleportation(struct obj **);
static void seffect_gold_detection(struct obj **);
static void seffect_food_detection(struct obj **);
static void seffect_identify(struct obj **);
static void seffect_magic_mapping(struct obj **);
staticfn boolean learnscrolltyp(short);
staticfn void cap_spe(struct obj *);
staticfn char *erode_obj_text(struct obj *, char *);
staticfn char *hawaiian_design(struct obj *, char *);
staticfn int read_ok(struct obj *);
staticfn void stripspe(struct obj *);
staticfn void p_glow1(struct obj *);
staticfn void p_glow2(struct obj *, const char *);
staticfn void forget(int);
staticfn int maybe_tame(struct monst *, struct obj *);
staticfn boolean can_center_cloud(coordxy, coordxy);
staticfn void display_stinking_cloud_positions(boolean);
staticfn void seffect_enchant_armor(struct obj **);
staticfn void seffect_destroy_armor(struct obj **);
staticfn void seffect_confuse_monster(struct obj **);
staticfn void seffect_scare_monster(struct obj **);
staticfn void seffect_remove_curse(struct obj **);
staticfn void seffect_create_monster(struct obj **);
staticfn void seffect_enchant_weapon(struct obj **);
staticfn void seffect_taming(struct obj **);
staticfn void seffect_genocide(struct obj **);
staticfn void seffect_light(struct obj **);
staticfn void seffect_charging(struct obj **);
staticfn void seffect_amnesia(struct obj **);
staticfn void seffect_fire(struct obj **);
staticfn void seffect_earth(struct obj **);
staticfn void seffect_punishment(struct obj **);
staticfn void seffect_stinking_cloud(struct obj **);
staticfn void seffect_blank_paper(struct obj **);
staticfn void seffect_teleportation(struct obj **);
staticfn void seffect_gold_detection(struct obj **);
staticfn void seffect_food_detection(struct obj **);
staticfn void seffect_identify(struct obj **);
staticfn void seffect_magic_mapping(struct obj **);
#ifdef MAIL_STRUCTURES
static void seffect_mail(struct obj **);
staticfn void seffect_mail(struct obj **);
#endif /* MAIL_STRUCTURES */
static void set_lit(coordxy, coordxy, genericptr);
static void do_class_genocide(void);
static void do_stinking_cloud(struct obj *, boolean);
static boolean create_particular_parse(char *,
staticfn void set_lit(coordxy, coordxy, genericptr);
staticfn void do_class_genocide(void);
staticfn void do_stinking_cloud(struct obj *, boolean);
staticfn boolean create_particular_parse(char *,
struct _create_particular_data *);
static boolean create_particular_creation(struct _create_particular_data *);
staticfn boolean create_particular_creation(struct _create_particular_data *);
static boolean
staticfn boolean
learnscrolltyp(short scrolltyp)
{
if (!objects[scrolltyp].oc_name_known) {
@@ -74,7 +74,7 @@ learnscroll(struct obj *sobj)
}
/* max spe is +99, min is -99 */
static void
staticfn void
cap_spe(struct obj *obj)
{
if (obj) {
@@ -83,7 +83,7 @@ cap_spe(struct obj *obj)
}
}
static char *
staticfn char *
erode_obj_text(struct obj *otmp, char *buf)
{
int erosion = greatest_erosion(otmp);
@@ -218,7 +218,7 @@ hawaiian_motif(struct obj *shirt, char *buf)
return buf;
}
static char *
staticfn char *
hawaiian_design(struct obj *shirt, char *buf)
{
static const char *const hawaiian_bgs[] = {
@@ -309,7 +309,7 @@ assign_candy_wrapper(struct obj *obj)
}
/* getobj callback for object to read */
static int
staticfn int
read_ok(struct obj *obj)
{
if (!obj)
@@ -644,7 +644,7 @@ doread(void)
RESTORE_WARNING_FORMAT_NONLITERAL
static void
staticfn void
stripspe(struct obj *obj)
{
if (obj->blessed || obj->spe <= 0) {
@@ -659,13 +659,13 @@ stripspe(struct obj *obj)
}
}
static void
staticfn void
p_glow1(struct obj *otmp)
{
pline("%s briefly.", Yobjnam2(otmp, Blind ? "vibrate" : "glow"));
}
static void
staticfn void
p_glow2(struct obj *otmp, const char *color)
{
pline("%s%s%s for a moment.", Yobjnam2(otmp, Blind ? "vibrate" : "glow"),
@@ -999,7 +999,7 @@ recharge(struct obj *obj, int curse_bless)
* Other things are subject to flags:
* howmuch & ALL_SPELLS = forget all spells
*/
static void
staticfn void
forget(int howmuch)
{
struct monst *mtmp;
@@ -1023,7 +1023,7 @@ forget(int howmuch)
}
/* monster is hit by scroll of taming's effect */
static int
staticfn int
maybe_tame(struct monst *mtmp, struct obj *sobj)
{
int was_tame = mtmp->mtame;
@@ -1058,7 +1058,7 @@ valid_cloud_pos(coordxy x, coordxy y)
/* Callback for getpos_sethilite, also used in determining whether a scroll
* should have its regular effects, or not because it was out of range.
*/
static boolean
staticfn boolean
can_center_cloud(coordxy x, coordxy y)
{
if (!valid_cloud_pos(x, y))
@@ -1066,7 +1066,7 @@ can_center_cloud(coordxy x, coordxy y)
return (cansee(x, y) && distu(x, y) < 32);
}
static void
staticfn void
display_stinking_cloud_positions(boolean on_off)
{
coordxy x, y, dx, dy;
@@ -1093,7 +1093,7 @@ display_stinking_cloud_positions(boolean on_off)
}
}
static void
staticfn void
seffect_enchant_armor(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1243,7 +1243,7 @@ seffect_enchant_armor(struct obj **sobjp)
Blind ? "again" : "unexpectedly");
}
static void
staticfn void
seffect_destroy_armor(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1291,7 +1291,7 @@ seffect_destroy_armor(struct obj **sobjp)
}
}
static void
staticfn void
seffect_confuse_monster(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1346,7 +1346,7 @@ seffect_confuse_monster(struct obj **sobjp)
}
}
static void
staticfn void
seffect_scare_monster(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1381,7 +1381,7 @@ seffect_scare_monster(struct obj **sobjp)
}
}
static void
staticfn void
seffect_remove_curse(struct obj **sobjp)
{
struct obj *sobj = *sobjp; /* scroll or fake spellbook */
@@ -1500,7 +1500,7 @@ seffect_remove_curse(struct obj **sobjp)
update_inventory();
}
static void
staticfn void
seffect_create_monster(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1519,7 +1519,7 @@ seffect_create_monster(struct obj **sobjp)
*/
}
static void
staticfn void
seffect_enchant_weapon(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1569,7 +1569,7 @@ seffect_enchant_weapon(struct obj **sobjp)
cap_spe(uwep);
}
static void
staticfn void
seffect_taming(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1612,7 +1612,7 @@ seffect_taming(struct obj **sobjp)
}
}
static void
staticfn void
seffect_genocide(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1631,7 +1631,7 @@ seffect_genocide(struct obj **sobjp)
do_genocide((!scursed) | (2 * !!Confusion));
}
static void
staticfn void
seffect_light(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1678,7 +1678,7 @@ seffect_light(struct obj **sobjp)
}
}
static void
staticfn void
seffect_charging(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1720,7 +1720,7 @@ seffect_charging(struct obj **sobjp)
recharge(otmp, scursed ? -1 : sblessed ? 1 : 0);
}
static void
staticfn void
seffect_amnesia(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1740,7 +1740,7 @@ seffect_amnesia(struct obj **sobjp)
exercise(A_WIS, FALSE);
}
static void
staticfn void
seffect_fire(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1809,7 +1809,7 @@ seffect_fire(struct obj **sobjp)
#undef ZT_SPELL_O_FIRE
}
static void
staticfn void
seffect_earth(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1866,7 +1866,7 @@ seffect_earth(struct obj **sobjp)
}
}
static void
staticfn void
seffect_punishment(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1881,7 +1881,7 @@ seffect_punishment(struct obj **sobjp)
punish(sobj);
}
static void
staticfn void
seffect_stinking_cloud(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1895,7 +1895,7 @@ seffect_stinking_cloud(struct obj **sobjp)
do_stinking_cloud(sobj, already_known);
}
static void
staticfn void
seffect_blank_paper(struct obj **sobjp UNUSED)
{
if (Blind)
@@ -1905,7 +1905,7 @@ seffect_blank_paper(struct obj **sobjp UNUSED)
gk.known = TRUE;
}
static void
staticfn void
seffect_teleportation(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1925,7 +1925,7 @@ seffect_teleportation(struct obj **sobjp)
}
}
static void
staticfn void
seffect_gold_detection(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1936,7 +1936,7 @@ seffect_gold_detection(struct obj **sobjp)
*sobjp = 0; /* failure: strange_feeling() -> useup() */
}
static void
staticfn void
seffect_food_detection(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1945,7 +1945,7 @@ seffect_food_detection(struct obj **sobjp)
*sobjp = 0; /* nothing detected: strange_feeling -> useup */
}
static void
staticfn void
seffect_identify(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -1992,7 +1992,7 @@ seffect_identify(struct obj **sobjp)
}
}
static void
staticfn void
seffect_magic_mapping(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -2044,7 +2044,7 @@ seffect_magic_mapping(struct obj **sobjp)
}
#ifdef MAIL_STRUCTURES
static void
staticfn void
seffect_mail(struct obj **sobjp)
{
struct obj *sobj = *sobjp;
@@ -2357,7 +2357,7 @@ static struct litmon *gremlins = 0;
/*
* Low-level lit-field update routine.
*/
static void
staticfn void
set_lit(coordxy x, coordxy y, genericptr_t val)
{
struct monst *mtmp;
@@ -2513,7 +2513,7 @@ litroom(
return;
}
static void
staticfn void
do_class_genocide(void)
{
int i, j, immunecnt, gonecnt, goodcnt, class, feel_dead = 0;
@@ -2950,7 +2950,7 @@ unpunish(void)
/* prompt the player to create a stinking cloud and then create it if they
give a location */
static void
staticfn void
do_stinking_cloud(struct obj *sobj, boolean mention_stinking)
{
coord cc;
@@ -3005,7 +3005,7 @@ cant_revive(
return FALSE;
}
static boolean
staticfn boolean
create_particular_parse(
char *str,
struct _create_particular_data *d)
@@ -3120,7 +3120,7 @@ create_particular_parse(
return FALSE;
}
static boolean
staticfn boolean
create_particular_creation(
struct _create_particular_data *d)
{