Fixes a issue where PerformingLoad was not flagged when starting the …

…loading process in Vinifera_Get_All.

src/vinifera/vinifera_hooks.cpp

@@ -102,6 +102,7 @@ static void _Print_CRCs_Intercept(EventClass *ev)
 }
 
 
+#if 0
 /**
  *  This function is for intercepting the call to Clear_Scenarion in Load_All
  *  to flag that we are performing a load operation, which stops the game from
@@ -120,6 +121,7 @@ static void _On_Load_Clear_Scenario_Intercept()
      */
     Vinifera_PerformingLoad = true;
 }
+#endif
 
 
 /**
@@ -998,5 +1000,5 @@ void Vinifera_Hooks()
     Patch_Call(0x005B1363, &_Print_CRCs_Intercept);
     Patch_Call(0x005B5340, &_Print_CRCs_Intercept);
 
-    Patch_Call(0x005D6BEC, &_On_Load_Clear_Scenario_Intercept); // Load_All
+    //Patch_Call(0x005D6BEC, &_On_Load_Clear_Scenario_Intercept); // Load_All
 }

src/vinifera/vinifera_saveload.cpp

@@ -479,6 +479,15 @@ bool Vinifera_Get_All(IStream *pStm, bool load_net)
     DEBUG_INFO("About to call Clear_Scenario()...\n");
     Clear_Scenario();
 
+    /**
+     *  Now the scenario data has been cleaned up, we can now tell the extension
+     *  hooks that we will be creating the extension classes via the class factories.
+     * 
+     *  Fixes #issue-951, this line was not copied over when the loading process
+     *  was reimplemented.
+     */
+    Vinifera_PerformingLoad = true;
+
     /**
      *  Load the scenario global information.
      */