Moved pray.c globals to instance_globals.

include/decl.h

@@ -464,6 +464,14 @@ struct instance_globals {
 
     /* muse.c */
     boolean m_using; /* kludge to use mondided instead of killed */
+    int trapx;
+    int trapy;
+    boolean zap_oseen; /* for wands which use mbhitm and are zapped at
+                        * players.  We usually want an oseen local to
+                        * the function, but this is impossible since the
+                        * function mbhitm has to be compatible with the
+                        * normal zap routines, and those routines don't
+                        * remember who zapped the wand. */
 
     /* objname.c */
     /* distantname used by distant_name() to pass extra information to
@@ -498,6 +506,13 @@ struct instance_globals {
     int potion_nothing;
     int potion_unkn;
 
+    /* pray.c */
+    /* values calculated when prayer starts, and used when completed */
+    aligntyp p_aligntyp;
+    int p_trouble;
+    int p_type; /* (-1)-3: (-1)=really naughty, 3=really good */
+
+
     /* read.c */
     boolean known;
 

include/extern.h

@@ -1432,6 +1432,7 @@ E boolean FDECL(angry_guards, (BOOLEAN_P));
 E void NDECL(pacify_guards);
 E void FDECL(decide_to_shapeshift, (struct monst *, int));
 E boolean FDECL(vamp_stone, (struct monst *));
+E void NDECL(monst_globals_init);
 
 /* ### mondata.c ### */
 
@@ -1504,8 +1505,6 @@ E boolean FDECL(undesirable_disp, (struct monst *, XCHAR_P, XCHAR_P));
 
 /* ### monst.c ### */
 
-E void NDECL(monst_init);
-
 /* ### monstr.c ### */
 
 E void NDECL(monstr_init);