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

found_artifact() groundwork

Browse Source 
Lay groundwork for generating a log event when finding an artifact
on the floor or carried by a monster.  This part should not produce
any change in behavior.

Move g.artidisco[] and g.artiexist[] out of the instance_globals
struct back to local within artifact.c.  They are both initialized
at the start of a game (and only used in that file) so don't need
to be part of any bulk reinitialization if restart-instead-of-exit
ever gets implemented.

Convert artiexist[] from an array of booleans to an array of structs
containing a pair of bitfields.  artiexist[].exists is a direct
replacement for the boolean; artiexist[].found is new but not put to
any significant use yet.  If will be used to suppress the future
found-an-artifact event for cases where a more specific event (like
crowning or divine gift as #offer reward) is already produced.

Remove g.via_naming altogether and add an extra argument to oname()
calls to replace it.

Add an extra argument to artifact_exists() calls.
This commit is contained in:
PatR
2022-03-07 02:06:55 -08:00
parent 90fc7402b8
commit d37fa4138a
20 changed files with 137 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sp_lev.c
View File

@@ -2152,7 +2152,7 @@ create_object(object* o, struct mkroom* croom)
/* set_corpsenm() took care of egg hatch and corpse timers */
if (named) {
otmp = oname(otmp, o->name.str);
otmp = oname(otmp, o->name.str, ONAME_NO_FLAGS);
if (otmp->otyp == SPE_NOVEL) {
/* needs to be an existing title */
(void) lookup_novel(o->name.str, &otmp->novelidx);
@@ -2215,7 +2215,7 @@ create_object(object* o, struct mkroom* croom)
} else {
obj_extract_self(otmp);
if (otmp->oartifact)
artifact_exists(otmp, safe_oname(otmp), FALSE);
artifact_exists(otmp, safe_oname(otmp), FALSE, FALSE);
obfree(otmp, NULL);
return;
}