From 09c25824ce1b973e477c4f31fe149a1de8941be8 Mon Sep 17 00:00:00 2001
From: AliceLR <petrifiedrowan@gmail.com>
Date: Sat, 2 Dec 2023 02:28:22 -0700
Subject: [PATCH] Add v1 effect durations tests, fix title board edge case.

---
 src/utils/downver.c                    |   8 +++++
 src/world.c                            |  41 +++++++++++++++++--------
 testworlds/1.00/006 firewalker_dur.mzx | Bin 0 -> 4918 bytes
 testworlds/1.00/006 firewalker_dur.txt |   3 ++
 testworlds/1.00/007 wind_dur.mzx       | Bin 0 -> 4969 bytes
 testworlds/1.00/007 wind_dur.txt       |   3 ++
 6 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 testworlds/1.00/006 firewalker_dur.mzx
 create mode 100644 testworlds/1.00/006 firewalker_dur.txt
 create mode 100644 testworlds/1.00/007 wind_dur.mzx
 create mode 100644 testworlds/1.00/007 wind_dur.txt

diff --git a/src/utils/downver.c b/src/utils/downver.c
index a213556f3..dad2ccbf0 100644
--- a/src/utils/downver.c
+++ b/src/utils/downver.c
@@ -270,6 +270,14 @@ static void convert_293_to_292_board_info(struct downver_state *dv,
         save_prop_s_to_asciiz(ident, BOARD_NAME_SIZE, &prop, dest);
         break;
 
+      case BPROP_BLIND_DUR:
+      case BPROP_FIREWALKER_DUR:
+      case BPROP_FREEZE_TIME_DUR:
+      case BPROP_SLOW_TIME_DUR:
+      case BPROP_WIND_DUR:
+        /* Added in 2.93 */
+        break;
+
       default:
         save_prop_p(ident, &prop, dest);
         break;
diff --git a/src/world.c b/src/world.c
index 410095850..75d56fcb8 100644
--- a/src/world.c
+++ b/src/world.c
@@ -2508,7 +2508,8 @@ static int load_world_zip(struct world *mzx_world, struct zip_archive *zp,
 
 
 // Hack- forward declaration since this should stay near change_board.
-static void synchronize_current_board(struct world *mzx_world);
+static void v1_store_globals_to_board(struct world *mzx_world);
+static void v1_load_globals_from_board(struct world *mzx_world);
 
 int save_world(struct world *mzx_world, const char *file, boolean savegame,
  int world_version)
@@ -2577,7 +2578,7 @@ int save_world(struct world *mzx_world, const char *file, boolean savegame,
   }
 
   // Synchronize global variables in the current board.
-  synchronize_current_board(mzx_world);
+  v1_store_globals_to_board(mzx_world);
 
 #ifdef CONFIG_EDITOR
   if(world_version == MZX_VERSION_PREV)
@@ -2928,6 +2929,8 @@ static void load_world(struct world *mzx_world, struct zip_archive *zp,
     mzx_world->current_board = NULL;
     set_current_board_ext(mzx_world,
      mzx_world->board_list[mzx_world->current_board_id]);
+    // change_board expects this to have been done, if applicable.
+    v1_load_globals_from_board(mzx_world);
   }
 
   // If this is a pre-port world, limit the number of samples
@@ -3169,7 +3172,7 @@ void try_load_world(struct world *mzx_world, struct zip_archive **zp,
 }
 
 
-static void synchronize_current_board(struct world *mzx_world)
+static void v1_store_globals_to_board(struct world *mzx_world)
 {
   struct board *cur_board = mzx_world->current_board;
 
@@ -3185,12 +3188,28 @@ static void synchronize_current_board(struct world *mzx_world)
   }
 }
 
+static void v1_load_globals_from_board(struct world *mzx_world)
+{
+  struct board *cur_board = mzx_world->current_board;
+
+  // MegaZeux 1.x- status durations were board local, restore the saved copies.
+  if(mzx_world->version < V200 && cur_board)
+  {
+    mzx_world->blind_dur = cur_board->blind_dur_v1;
+    mzx_world->firewalker_dur = cur_board->firewalker_dur_v1;
+    mzx_world->freeze_time_dur = cur_board->freeze_time_dur_v1;
+    mzx_world->slow_time_dur = cur_board->slow_time_dur_v1;
+    mzx_world->wind_dur = cur_board->wind_dur_v1;
+  }
+}
+
 void change_board(struct world *mzx_world, int board_id)
 {
   // Set the current board during gameplay.
   struct board *cur_board = mzx_world->current_board;
 
-  synchronize_current_board(mzx_world);
+  // Save globals back to the current board.
+  v1_store_globals_to_board(mzx_world);
 
   // Is this board temporary? Clear it
   if(mzx_world->temporary_board)
@@ -3219,15 +3238,8 @@ void change_board(struct world *mzx_world, int board_id)
     cur_board = dup_board;
   }
 
-  // MegaZeux 1.x- status durations were board local, restore the saved copies.
-  if(mzx_world->version < V200)
-  {
-    mzx_world->blind_dur = cur_board->blind_dur_v1;
-    mzx_world->firewalker_dur = cur_board->firewalker_dur_v1;
-    mzx_world->freeze_time_dur = cur_board->freeze_time_dur_v1;
-    mzx_world->slow_time_dur = cur_board->slow_time_dur_v1;
-    mzx_world->wind_dur = cur_board->wind_dur_v1;
-  }
+  // Load globals from the current board.
+  v1_load_globals_from_board(mzx_world);
 }
 
 void change_board_set_values(struct world *mzx_world)
@@ -3423,6 +3435,9 @@ boolean reload_world(struct world *mzx_world, const char *file, boolean *faded)
   default_global_data(mzx_world);
   *faded = false;
 
+  // Hack: 1.x seems to not clear some things...
+  v1_load_globals_from_board(mzx_world);
+
   // Now that the world's loaded, fix the save path.
   {
     char save_name[MAX_PATH];
diff --git a/testworlds/1.00/006 firewalker_dur.mzx b/testworlds/1.00/006 firewalker_dur.mzx
new file mode 100644
index 0000000000000000000000000000000000000000..94080325445e45733630685b58f67ae778114911
GIT binary patch
literal 4918
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
MM*bOF^o()%A6|HoXaE2J

literal 0
HcmV?d00001

diff --git a/testworlds/1.00/006 firewalker_dur.txt b/testworlds/1.00/006 firewalker_dur.txt
new file mode 100644
index 000000000..ab7c8ae45
--- /dev/null
+++ b/testworlds/1.00/006 firewalker_dur.txt	
@@ -0,0 +1,3 @@
+Title: Firewalker Duration Test
+Author: Alice Rowan
+Desc: Make sure the board firewalker duration value is loaded.
diff --git a/testworlds/1.00/007 wind_dur.mzx b/testworlds/1.00/007 wind_dur.mzx
new file mode 100644
index 0000000000000000000000000000000000000000..386063e919ddffa2185de0e86c318f3d71b76db2
GIT binary patch
literal 4969
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

literal 0
HcmV?d00001

diff --git a/testworlds/1.00/007 wind_dur.txt b/testworlds/1.00/007 wind_dur.txt
new file mode 100644
index 000000000..6582edc33
--- /dev/null
+++ b/testworlds/1.00/007 wind_dur.txt	
@@ -0,0 +1,3 @@
+Title: Wind Duration Test
+Author: Alice Rowan
+Desc: Make sure the board wind duration value is loaded.