fix(zq): avoid overwriting screen bookmarks on quest load

ZQuestClassic · Apr 3, 2024 · 771f801 · 771f801
1 parent c71f993
commit 771f801
Showing 1 changed file with 38 additions and 0 deletions.
diff --git a/src/zq/zq_class.cpp b/src/zq/zq_class.cpp
@@ -6733,6 +6733,25 @@ int32_t load_quest(const char *filename, bool show_progress)
 			Map.clear();
 			Map.setCurrMap(vbound(zinit.last_map,0,map_count-1));
 			Map.setCurrScr(zinit.last_screen);
+			extern int32_t current_mappage;
+			current_mappage = 0;
+			bool found_default = false;
+			for(int q = 0; q < MAX_MAPPAGE_BTNS; ++q)
+			{
+				auto &pg = map_page[q];
+				if(pg.map == Map.getCurrMap() && pg.screen == Map.getCurrScr())
+				{
+					current_mappage = q;
+					break;
+				}
+				else if(found_default || pg.map > 1 || (pg.map == 1 && pg.screen > 0))
+					continue;
+				else
+				{
+					current_mappage = q;
+					found_default = true;
+				}
+			}
 			refresh(rALL);
 			refresh_pal();
 			set_rules(quest_rules);
@@ -6790,6 +6809,25 @@ int32_t load_tileset(const char *filename, dword tsetflags)
 			Map.clear();
 			Map.setCurrMap(vbound(zinit.last_map,0,map_count-1));
 			Map.setCurrScr(zinit.last_screen);
+			extern int32_t current_mappage;
+			current_mappage = 0;
+			bool found_default = false;
+			for(int q = 0; q < MAX_MAPPAGE_BTNS; ++q)
+			{
+				auto &pg = map_page[q];
+				if(pg.map == Map.getCurrMap() && pg.screen == Map.getCurrScr())
+				{
+					current_mappage = q;
+					break;
+				}
+				else if(found_default || pg.map > 1 || (pg.map == 1 && pg.screen > 0))
+					continue;
+				else
+				{
+					current_mappage = q;
+					found_default = true;
+				}
+			}
 			refresh(rALL);
 			refresh_pal();
 			set_rules(quest_rules);