Fix intermittent crash when entering Vault City.

* Fix VC Entrance_Door_Ptr * Fix abbey playerTmpBox2 error * Fix ncr2 lenny_obj * Add comments and todo for workarounds. --------- Co-authored-by: burner1024 <[email protected]>
BGforgeNet · Feb 22, 2024 · 12dcff2 · 12dcff2
1 parent 4a4b31c
commit 12dcff2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/scripts_src/abbey/abbey.ssl b/scripts_src/abbey/abbey.ssl
@@ -17,6 +17,14 @@ procedure start;
 procedure map_enter_p_proc;
 procedure map_update_p_proc;
 
+/*
+  TODO: this is a temporary workaround for a ghost object in .map file.
+  It should be removed once the map file is fixed.
+  See https://github.com/BGforgeNet/Fallout2_Restoration_Project/pull/260
+*/
+export variable playerTmpBox2;
+/* end todo */
+
 export variable abbey_bill_box_obj;
 
 procedure start

diff --git a/scripts_src/maps/ncr2.ssl b/scripts_src/maps/ncr2.ssl
@@ -46,6 +46,13 @@ export variable i_fergus_obj        := 0;
 export variable i_gunther_obj       := 0;
 export variable i_emitter_carlson_obj := 0;
 
+/*
+  TODO: this is a temporary workaround for a ghost object in .map file.
+  It should be removed once the map file is fixed.
+  See https://github.com/BGforgeNet/Fallout2_Restoration_Project/pull/260
+*/
+export variable lenny_obj     := 0;
+/* end todo */
 
 procedure start;
 procedure map_enter_p_proc;

diff --git a/scripts_src/maps/vctyctyd.ssl b/scripts_src/maps/vctyctyd.ssl
@@ -19,6 +19,14 @@ procedure start;
 procedure map_enter_p_proc;
 procedure map_update_p_proc;
 
+/*
+  TODO: this is a temporary workaround for a ghost object in .map file.
+  It should be removed once the map file is fixed.
+  See https://github.com/BGforgeNet/Fallout2_Restoration_Project/pull/260
+*/
+export variable Entrance_Door_Ptr;
+/* end todo */
+
 export variable vault_city_harry_box;
 export variable vault_city_courtyard_temp_box;
 export variable plow1;