From 443ecf03313097f0e6cce0ef4ee9a980d0325430 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sun, 27 Feb 2022 01:13:50 +0100
Subject: [PATCH] intra:: correct cleanup of intra maps

---
 cell.cpp  |  6 ++++++
 intra.cpp | 15 +++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/cell.cpp b/cell.cpp
index 2f64e3bb..5d07129b 100644
--- a/cell.cpp
+++ b/cell.cpp
@@ -1293,6 +1293,12 @@ EX vector<cell*> build_shortest_path(cell *c1, cell *c2) {
   }
 
 EX void clearCellMemory() {
+  #if MAXMDIM >= 4
+  if(intra::in) {
+    intra::erase_all_maps();
+    return;
+    }
+  #endif
   for(int i=0; i<isize(allmaps); i++) 
     if(allmaps[i])
       delete allmaps[i];
diff --git a/intra.cpp b/intra.cpp
index 6071b8c6..54893dfa 100644
--- a/intra.cpp
+++ b/intra.cpp
@@ -763,6 +763,21 @@ EX void kill(int id) {
   println(hlog, isize(to_remove), " connections and ", isize(to_erase_cell), " cells erased");
   }
 
+EX void erase_all_maps() {
+  println(hlog, "erase_all_maps called");
+  data[current].gd.storegame();
+  in = false;
+  for(int i=0; i<isize(data); i++) {
+    current = i;
+    ginf[gProduct] = data[i].gi;
+    data[i].gd.restoregame();
+    clearCellMemory();
+    }
+  intra_id.clear();
+  connections.clear();
+  data.clear();
+  }
+
 EX set<cell*> need_to_save;
 
 EX void prepare_need_to_save() {