fix(zq): correctly handle variable length title in all dmap reading/writing

6bd8a9a added support for variable length dmap titles, but only for the
main dmap reading/writing code. This functionality is duplicated across
dmap import/export and other places, but wasn't updated.

Author: connorjclark

src/qst.cpp

@@ -4612,6 +4612,9 @@ void clear_screen(mapscr *temp_scr)
 	temp_scr->zero_memory();
 }
 
+// NOTE: when modifying this, you need to also update:
+//    readonedmap, readdmaps, and FFScript::read_dmaps
+// (and their associated write functions)
 int32_t readdmaps(PACKFILE *f, zquestheader *Header, word, word, word start_dmap, word max_dmaps)
 {
 	bool should_skip = legacy_skip_flags && get_bit(legacy_skip_flags, skip_dmaps);
@@ -4806,13 +4809,10 @@ int32_t readdmaps(PACKFILE *f, zquestheader *Header, word, word, word start_dmap
 			}
 			else
 			{
-				std::string tmptitle;
-				if (!p_getwstr(&tmptitle, f))
+				if (!p_getwstr(&tempDMap.title, f))
 				{
 					return qe_invalid;
 				}
-				tempDMap.title.reserve(tmptitle.size());
-				tempDMap.title = tmptitle;
 			}
 
 			if(!p_getstr(tempDMap.intro,sizeof(DMaps[0].intro)-1,f))

src/zc/ffscript.cpp

@@ -48770,10 +48770,10 @@ void FFScript::write_dmaps(PACKFILE *f, int32_t vers_id)
 				Z_scripterrlog("do_savegamestructs FAILED to read DMAP NODE: %d",15);
 			}
 
-			if(!pfwrite(&DMaps[i].title,sizeof(DMaps[0].title),f))
-			{
-				Z_scripterrlog("do_savegamestructs FAILED to read DMAP NODE: %d",16);
-			}
+			if(!p_putwstr(DMaps[i].title,f))
+            {
+                Z_scripterrlog("do_savegamestructs FAILED to read DMAP NODE: %d",16);
+            }
 
 			if(!pfwrite(&DMaps[i].intro,sizeof(DMaps[0].intro),f))
 			{
@@ -48958,7 +48958,7 @@ void FFScript::read_dmaps(PACKFILE *f, int32_t vers_id)
 				Z_scripterrlog("do_savegamestructs FAILED to read DMAP NODE: %d",15);
 			}
 
-			if(!pfread((&DMaps[i].title),sizeof(DMaps[0].title),f))
+			if (!p_getwstr(&DMaps[i].title, f))
 			{
 				Z_scripterrlog("do_savegamestructs FAILED to read DMAP NODE: %d",16);
 			}

src/zq/zquest.cpp

@@ -14558,8 +14558,8 @@ int32_t writesomedmaps(PACKFILE *f, int32_t first, int32_t last, int32_t max)
             {
                 new_return(17);
             }
-            
-            if(!pfwrite(&DMaps[i].title,sizeof(DMaps[0].title),f))
+
+			if(!p_putwstr(DMaps[i].title,f))
             {
                 new_return(18);
             }
@@ -14753,8 +14753,7 @@ int32_t readsomedmaps(PACKFILE *f)
 	dword section_cversion = 0;
 	int32_t zversion = 0;
 	int32_t zbuild = 0;
-	dmap tempdmap;
-	tempdmap.clear();
+	dmap tempdmap{};
 
 	int32_t first = 0, last = 0, max = 0, count = 0;
 	int32_t datatype_version = 0;
@@ -14899,11 +14898,23 @@ int32_t readsomedmaps(PACKFILE *f)
 		    {
 			return 0;
 		    }
-		    
-		    if(!pfread(&tempdmap.title,sizeof(DMaps[0].title),f))
-		    {
-			return 0;
-		    }
+
+			if (section_version<20)
+			{
+				char title[22];
+				if (!p_getstr(title, sizeof(title) - 1, f))
+				{
+					return 0;
+				}
+				tempdmap.title.assign(title);
+			}
+			else
+			{
+				if (!p_getwstr(&tempdmap.title, f))
+				{
+					return 0;
+				}
+			}
 
 		    if(!pfread(&tempdmap.intro,sizeof(DMaps[0].intro),f))
 		    {
@@ -15085,6 +15096,7 @@ int32_t readsomedmaps(PACKFILE *f)
 					}
 				}
 			}
+			DMaps[i].clear();
 			DMaps[i] = tempdmap;
 	    }
 
@@ -15374,8 +15386,7 @@ int32_t readonedmap(PACKFILE *f, int32_t index)
 	dword section_cversion = 0;
 	int32_t zversion = 0;
 	int32_t zbuild = 0;
-	dmap tempdmap;
-	tempdmap.clear();
+	dmap tempdmap{};
 	int32_t datatype_version = 0;
 	int32_t first = 0;
 	int32_t last = 0;
@@ -15511,7 +15522,24 @@ int32_t readonedmap(PACKFILE *f, int32_t index)
             {
                 return 0;
             }
-            
+
+			if (section_version<20)
+			{
+				char title[22];
+				if (!p_getstr(title, sizeof(title) - 1, f))
+				{
+					return 0;
+				}
+				tempdmap.title.assign(title);
+			}
+			else
+			{
+				if (!p_getwstr(&tempdmap.title, f))
+				{
+					return 0;
+				}
+			}
+
             if(!pfread(&tempdmap.title,sizeof(DMaps[0].title),f))
             {
                 return 0;