zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed file existence check in TRNSLATE parser.

This commit is contained in:
Christoph Oelckers 2020-03-17 07:57:59 +01:00
parent 828cba13a1
commit 15d4fb8fcd
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/r_data/r_translate.cpp
View File

@ -1550,29 +1550,29 @@ void R_ParseTrnslate()
do
{
sc.MustGetToken(TK_StringConst);
try
int pallump = Wads.CheckNumForFullName(sc.String, true, ns_global);
if (pallump >= 0) //
{
int pallump = Wads.CheckNumForFullName(sc.String, true, ns_global);
if (pallump) //
int start = 0;
if (sc.CheckToken(','))
{
int start = 0;
if (sc.CheckToken(','))
{
sc.MustGetValue(false);
start = sc.Number;
}
uint8_t palette[768];
int numcolors = ReadPalette(pallump, palette);
NewTranslation.AddColors(start, numcolors, palette);
sc.MustGetValue(false);
start = sc.Number;
}
else
uint8_t palette[768];
int numcolors = ReadPalette(pallump, palette);
NewTranslation.AddColors(start, numcolors, palette);
}
else
{
try
{
NewTranslation.AddToTranslation(sc.String);
}
}
catch (CRecoverableError & err)
{
sc.ScriptMessage("Error in translation '%s':\n" TEXTCOLOR_YELLOW "%s\n", sc.String, err.GetMessage());
catch (CRecoverableError & err)
{
sc.ScriptMessage("Error in translation '%s':\n" TEXTCOLOR_YELLOW "%s\n", sc.String, err.GetMessage());
}
}
} while (sc.CheckToken(','));