From 12dcff2526c7e74eb7caae6a92038fb377de0812 Mon Sep 17 00:00:00 2001 From: Aleksandr Bochkarev Date: Wed, 21 Feb 2024 23:34:18 -0800 Subject: [PATCH] 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 --- scripts_src/abbey/abbey.ssl | 8 ++++++++ scripts_src/maps/ncr2.ssl | 7 +++++++ scripts_src/maps/vctyctyd.ssl | 8 ++++++++ 3 files changed, 23 insertions(+) diff --git a/scripts_src/abbey/abbey.ssl b/scripts_src/abbey/abbey.ssl index ac0f01cff5..509253dd45 100644 --- 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 index 7f9c30d3b5..6e3230451b 100644 --- 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 index 96f00f639f..1b09536841 100644 --- 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;