zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-22 03:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

use proper access functions to ResourceData.

Browse source
This commit is contained in:
Christoph Oelckers 2023-12-10 10:32:16 +01:00
parent 4da196a416
commit 7d0ad4897f
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/fonts/hexfont.cpp
View file

@ -63,7 +63,7 @@ struct HexDataSource
FScanner sc; FScanner sc;
auto data = resf->Read(index); 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); sc.SetCMode(true);
glyphdata.Push(0); // ensure that index 0 can be used as 'not present'. glyphdata.Push(0); // ensure that index 0 can be used as 'not present'.
while (sc.GetString()) while (sc.GetString())

2
src/common/menu/savegamemanager.cpp
View file

@ -306,7 +306,7 @@ unsigned FSavegameManagerBase::ExtractSaveData(int index)
auto data = resf->Read(info); auto data = resf->Read(info);
FSerializer arc; FSerializer arc;
if (!arc.OpenReader((const char*)data.data(), data.size())) if (!arc.OpenReader(data.string(), data.size()))
{ {
return index; return index;
} }

4
src/g_game.cpp
View file

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

2
src/menu/loadsavemenu.cpp
View file

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