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

Revert "Moved read.c globals to instance_globals."

Browse Source 
This reverts commit d37a91a6b8.
This commit is contained in:
nhmall
2018-11-23 22:16:56 -05:00
parent 2fb68024fe
commit 04fe16d938
4 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/detect.c
View File

@@ -11,6 +11,8 @@
#include "hack.h"
#include "artifact.h"
extern boolean known; /* from read.c */
STATIC_DCL boolean NDECL(unconstrain_map);
STATIC_DCL void NDECL(reconstrain_map);
STATIC_DCL void FDECL(browse_map, (int, const char *));
@@ -305,7 +307,7 @@ register struct obj *sobj;
boolean stale, ugold = FALSE, steedgold = FALSE;
int ter_typ = TER_DETECT | TER_OBJ;
g.known = stale = clear_stale_map(COIN_CLASS,
known = stale = clear_stale_map(COIN_CLASS,
(unsigned) (sobj->blessed ? GOLD : 0));
/* look for gold carried by monsters (might be in a container) */
@@ -316,7 +318,7 @@ register struct obj *sobj;
if (mtmp == u.usteed) {
steedgold = TRUE;
} else {
g.known = TRUE;
known = TRUE;
goto outgoldmap; /* skip further searching */
}
} else {
@@ -326,7 +328,7 @@ register struct obj *sobj;
if (mtmp == u.usteed) {
steedgold = TRUE;
} else {
g.known = TRUE;
known = TRUE;
goto outgoldmap; /* skip further searching */
}
}
@@ -336,17 +338,17 @@ register struct obj *sobj;
/* look for gold objects */
for (obj = fobj; obj; obj = obj->nobj) {
if (sobj->blessed && o_material(obj, GOLD)) {
g.known = TRUE;
known = TRUE;
if (obj->ox != u.ux || obj->oy != u.uy)
goto outgoldmap;
} else if (o_in(obj, COIN_CLASS)) {
g.known = TRUE;
known = TRUE;
if (obj->ox != u.ux || obj->oy != u.uy)
goto outgoldmap;
}
}
if (!g.known) {
if (!known) {
/* no gold found on floor or monster's inventory.
adjust message if you have gold in your inventory */
if (sobj) {
@@ -482,7 +484,7 @@ register struct obj *sobj;
}
if (!ct && !ctu) {
g.known = stale && !confused;
known = stale && !confused;
if (stale) {
docrt();
You("sense a lack of %s nearby.", what);
@@ -510,7 +512,7 @@ register struct obj *sobj;
}
return !stale;
} else if (!ct) {
g.known = TRUE;
known = TRUE;
You("%s %s nearby.", sobj ? "smell" : "sense", what);
if (sobj && sobj->blessed) {
if (!u.uedibility)
@@ -521,7 +523,7 @@ register struct obj *sobj;
struct obj *temp;
int ter_typ = TER_DETECT | TER_OBJ;
g.known = TRUE;
known = TRUE;
cls();
(void) unconstrain_map();
for (obj = fobj; obj; obj = obj->nobj)