From e24ff0ac9ced10a6beafb41889e5f04a53c0cf0a Mon Sep 17 00:00:00 2001 From: emily Date: Mon, 19 Apr 2021 12:10:30 +0200 Subject: [PATCH] Don't warn about UDMF comments or user fields --- src/maploader/udmf.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/maploader/udmf.cpp b/src/maploader/udmf.cpp index b96f2f71b..5eebbf61e 100644 --- a/src/maploader/udmf.cpp +++ b/src/maploader/udmf.cpp @@ -761,7 +761,7 @@ public: ReadUserKey(ukey); loader->MapThingsUserData.Push(ukey); } - else + else if (stricmp("comment", key.GetChars())) { DPrintf(DMSG_WARNING, "Unknown UDMF thing key %s\n", key.GetChars()); } @@ -944,6 +944,8 @@ public: continue; default: + if (!stricmp("comment", key.GetChars())) + continue; break; } @@ -1115,7 +1117,8 @@ public: break; default: - DPrintf(DMSG_WARNING, "Unknown UDMF linedef key %s\n", key.GetChars()); + if (strnicmp("user_", key.GetChars(), 5)) + DPrintf(DMSG_WARNING, "Unknown UDMF linedef key %s\n", key.GetChars()); break; } @@ -1229,6 +1232,8 @@ public: continue; default: + if (!stricmp("comment", key.GetChars())) + continue; break; } @@ -1430,7 +1435,8 @@ public: break; default: - DPrintf(DMSG_WARNING, "Unknown UDMF sidedef key %s\n", key.GetChars()); + if (strnicmp("user_", key.GetChars(), 5)) + DPrintf(DMSG_WARNING, "Unknown UDMF sidedef key %s\n", key.GetChars()); break; } @@ -1547,6 +1553,8 @@ public: continue; default: + if (!stricmp("comment", key.GetChars())) + continue; break; } @@ -1935,7 +1943,8 @@ public: break; default: - DPrintf(DMSG_WARNING, "Unknown UDMF sector key %s\n", key.GetChars()); + if (strnicmp("user_", key.GetChars(), 5)) + DPrintf(DMSG_WARNING, "Unknown UDMF sector key %s\n", key.GetChars()); break; } if ((namespace_bits & (Zd | Zdt)) && !strnicmp("user_", key.GetChars(), 5))