Revert "Initial check in of icontext."

This reverts commit 5bbe3cd6bb52456072c42c50bd7ed039d24c03d2.

diff --git a/include/decl.h b/include/decl.h
index 2cc7f965cc0d121540707f366c96f9543dc08778..5e211f0533625678f0c269b15447d020af0faefe 100644 (file)
--- a/include/decl.h
+++ b/include/decl.h
@@ -439,20 +439,8 @@ struct early_opt {
     boolean valallowed;
 };
 
-/* instance_context holds per game instance data that does not need to be
- * persisted upon game exit.  This game instance data is one of the first
- * 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 */
-};
-
-E struct instance_context icontext;
-
-E void icontext_init();
+/* encumbrance */
+E int oldcap;
 
 
 #undef E

diff --git a/src/decl.c b/src/decl.c
index edfeb3a60441c2d5aa449b029926005306487b99..10f67f7dee2f5f84310d2bcb3539a460077cfaed 100644 (file)
--- a/src/decl.c
+++ b/src/decl.c
@@ -215,6 +215,9 @@ NEARDATA struct monst *migrating_mons = (struct monst *) 0;
 
 NEARDATA struct mvitals mvitals[NUMMONS];
 
+/* originally from pickup.c */
+int oldcap = 0; /* encumbrance */
+
 NEARDATA struct c_color_names c_color_names = {
     "black",  "amber", "golden", "light blue", "red",   "green",
     "silver", "blue",  "purple", "white",      "orange"
@@ -526,6 +529,8 @@ decl_early_init()
     ZERO(ubirthday);
     ZERO(urealtime);
 
+    ZERO(oldcap);
+
     ZEROARRAY(lastseentyp);
 
     ZEROPTR(invent);
@@ -607,18 +612,4 @@ decl_early_init()
 }
 #endif
 
-const struct instance_context icontext_initial_state = {
-    0, /* oldcap - last encumberance in pickup.c */
-};
-
-struct instance_context icontext;
-
-void 
-icontext_init() 
-{
-    icontext = icontext_initial_state;
-
-    decl_early_init();
-};
-
 /*decl.c*/

diff --git a/src/pickup.c b/src/pickup.c
index 83d5eb2735abc742a63d0ad037d288526fc559ec..b32640dbd8c5910b6cee19f6849f9ddecd035a79 100644 (file)
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -1558,7 +1558,7 @@ encumber_msg()
 {
     int newcap = near_capacity();
 
-    if (icontext.oldcap < newcap) {
+    if (oldcap < newcap) {
         switch (newcap) {
         case 1:
             Your("movements are slowed slightly because of your load.");
@@ -1576,7 +1576,7 @@ encumber_msg()
             break;
         }
         context.botl = 1;
-    } else if (icontext.oldcap > newcap) {
+    } else if (oldcap > newcap) {
         switch (newcap) {
         case 0:
             Your("movements are now unencumbered.");
@@ -1595,7 +1595,7 @@ encumber_msg()
         context.botl = 1;
     }
 
-    icontext.oldcap = newcap;
+    oldcap = newcap;
     return newcap;
 }
 

diff --git a/sys/share/pcmain.c b/sys/share/pcmain.c
index 932ec971e5aa7b48cb35e4452f904cbcebaebaf9..9ffbeca51c00f65939a3edd5130f646126e4e60a 100644 (file)
--- a/sys/share/pcmain.c
+++ b/sys/share/pcmain.c
@@ -97,7 +97,9 @@ char *argv[];
 
     nethack_enter(argc, argv);
 
-    icontext_init();
+#ifdef PLAYAGAIN
+    decl_early_init();
+#endif
     sys_early_init();
 
 #if defined(WIN32) && defined(TTY_GRAPHICS)

diff --git a/sys/winnt/stubs.c b/sys/winnt/stubs.c
index 9e16c6dce274cfdf2d67d248584ad83d379c3e3f..ff3cf591959eed4dbdc7fe8589bffecf89ceb931 100644 (file)
--- a/sys/winnt/stubs.c
+++ b/sys/winnt/stubs.c
@@ -37,7 +37,9 @@ char *argv[];
 {
     boolean resuming;
 
-    icontext_init();
+#ifdef PLAYAGAIN
+    decl_early_init();
+#endif
     sys_early_init();
     Strcpy(default_window_sys, "tty");
     resuming = pcmain(argc, argv);

diff --git a/win/win32/winhack.c b/win/win32/winhack.c
index ef48d6b639a4df1e96957e7b9786a316b1d48ed8..6db66261e260eecca6e77d791cbd0d54de2575b2 100644 (file)
--- a/win/win32/winhack.c
+++ b/win/win32/winhack.c
@@ -97,7 +97,9 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
 
     win10_init();
 
-    icontext_init();
+#ifdef PLAYAGAIN
+    decl_early_init();
+#endif
     sys_early_init();
 
     /* init applicatio structure */