From 8a7502c00d805acc4d4bb354cdcbcb8829920146 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 14 Sep 2020 22:44:21 +0200 Subject: [PATCH] =?UTF-8?q?-=20I=20wish,=20MSVC=20flagged=20struct=20param?= =?UTF-8?q?s=20to=20variadic=20functions=20properly=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit XCode reported these as errors. --- source/build/src/defs.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/build/src/defs.cpp b/source/build/src/defs.cpp index 3d21b3cf8..363ced099 100644 --- a/source/build/src/defs.cpp +++ b/source/build/src/defs.cpp @@ -847,7 +847,7 @@ static int32_t defsparser(scriptfile *script) script->filename, scriptfile_getlinum(script,texturetokptr)); if (texstatus == -(3<<8)) Printf("Error: \"%s\" has more than one tile, in tilefromtexture definition near line %s:%d\n", - fn, script->filename, scriptfile_getlinum(script,texturetokptr)); + fn.GetChars(), script->filename, scriptfile_getlinum(script,texturetokptr)); if (texstatus < 0) break; @@ -986,7 +986,7 @@ static int32_t defsparser(scriptfile *script) script->filename, scriptfile_getlinum(script,cmdtokptr)); if (texstatus == -(3<<8)) Printf("Error: \"%s\" has more than one tile, in importtile definition near line %s:%d\n", - fn, script->filename, scriptfile_getlinum(script,cmdtokptr)); + fn.GetChars(), script->filename, scriptfile_getlinum(script,cmdtokptr)); if (texstatus < 0) break; @@ -2648,7 +2648,7 @@ static int32_t defsparser(scriptfile *script) FileReader fil = fileSystem.OpenFileReader(fn); if (!fil.isOpen()) { - Printf("Error: basepalette: Failed opening \"%s\" on line %s:%d\n", fn, + Printf("Error: basepalette: Failed opening \"%s\" on line %s:%d\n", fn.GetChars(), script->filename, scriptfile_getlinum(script,cmdtokptr)); break; } @@ -2820,7 +2820,7 @@ static int32_t defsparser(scriptfile *script) FileReader fil = fileSystem.OpenFileReader(fn); if (!fil.isOpen()) { - Printf("Error: palookup: Failed opening \"%s\" on line %s:%d\n", fn, + Printf("Error: palookup: Failed opening \"%s\" on line %s:%d\n", fn.GetChars(), script->filename, scriptfile_getlinum(script,cmdtokptr)); break; } @@ -3105,7 +3105,7 @@ static int32_t defsparser(scriptfile *script) FileReader fil = fileSystem.OpenFileReader(fn); if (!fil.isOpen()) { - Printf("Error: blendtable: Failed opening \"%s\" on line %s:%d\n", fn, + Printf("Error: blendtable: Failed opening \"%s\" on line %s:%d\n", fn.GetChars(), script->filename, scriptfile_getlinum(script,cmdtokptr)); break; }