- fixed file existence check in TRNSLATE parser.

ZDoom · Mar 17, 2020 · 15d4fb8 · 15d4fb8
1 parent 828cba1
commit 15d4fb8
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/src/r_data/r_translate.cpp b/src/r_data/r_translate.cpp
@@ -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(','));