use proper access functions to ResourceData.

ZDoom · Dec 10, 2023 · 7d0ad48 · 7d0ad48
1 parent 4da196a
commit 7d0ad48
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/common/fonts/hexfont.cpp b/src/common/fonts/hexfont.cpp
@@ -63,7 +63,7 @@ struct HexDataSource
 		FScanner sc;
 
 		auto data = resf->Read(index);
-		sc.OpenMem("newconsolefont.hex", (const char*)data.data(), data.size());
+		sc.OpenMem("newconsolefont.hex", data.string(), data.size());
 		sc.SetCMode(true);
 		glyphdata.Push(0);	// ensure that index 0 can be used as 'not present'.
 		while (sc.GetString())

diff --git a/src/common/menu/savegamemanager.cpp b/src/common/menu/savegamemanager.cpp
@@ -306,7 +306,7 @@ unsigned FSavegameManagerBase::ExtractSaveData(int index)
 
 		auto data = resf->Read(info);
 		FSerializer arc;
-		if (!arc.OpenReader((const char*)data.data(), data.size()))
+		if (!arc.OpenReader(data.string(), data.size()))
 		{
 			return index;
 		}

diff --git a/src/g_game.cpp b/src/g_game.cpp
@@ -2013,7 +2013,7 @@ void G_DoLoadGame ()
 
 	auto data = resfile->Read(info);
 	FSerializer arc;
-	if (!arc.OpenReader((char*)data.data(), data.size()))
+	if (!arc.OpenReader(data.string(), data.size()))
 	{
 		LoadGameError("TXT_FAILEDTOREADSG");
 		return;
@@ -2088,7 +2088,7 @@ void G_DoLoadGame ()
 	}
 
 	data = resfile->Read(info);
-	if (!arc.OpenReader((char*)data.data(), data.size()))
+	if (!arc.OpenReader(data.string(), data.size()))
 	{
 		LoadGameError("TXT_SGINFOERR");
 		return;

diff --git a/src/menu/loadsavemenu.cpp b/src/menu/loadsavemenu.cpp
@@ -84,7 +84,7 @@ void FSavegameManager::ReadSaveStrings()
 					}
 					auto data = savegame->Read(info);
 					FSerializer arc;
-					if (arc.OpenReader((const char*)data.data(), data.size()))
+					if (arc.OpenReader(data.string(), data.size()))
 					{
 						int savever = 0;
 						arc("Save Version", savever);