check.

include/decl.h

@@ -192,7 +192,6 @@ E NEARDATA char dogname[];
 E NEARDATA char catname[];
 E NEARDATA char horsename[];
 E char preferred_pet;
-E int petname_used;
 
 E const char *occtxt; /* defined when occupation != NULL */
 E const char *nomovemsg;
@@ -444,10 +443,15 @@ struct early_opt {
  * things initialized during the initialization of the game engine.
  * It is initialized with icontext_initial_state found in decl.c */
 
-#define PLAYAGAIN
-
 struct instance_context {
     int oldcap; /* encumberance - pickup.c */
+    int petname_used; /* user preferred pet name has been used - dog.c */
+    int jumping_is_magic; /* current jump result of magic - apply.c */
+    int polearm_range_min; /* apply.c */
+    int polearm_range_max; /* apply.c */
+    int spec_dbon_applies; /* coordinate effects from spec_dbon() with 
+                            * messages in artifact_hit() - artifact.c */
+    int mrank_sz; /* loaded by max_rank_sz - botl.c */
 };
 
 E struct instance_context icontext;