From 29f6dd23b9d7f9d6ab2f14b94b984a75f5b78553 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 1 Jul 2021 09:24:33 +0300 Subject: [PATCH] - fixed compilation with GCC and Clang src/playsim/p_maputl.cpp:1691:42: error: too many arguments provided to function-like macro invocation src/gamedata/d_dehacked.cpp:2385:62: error: cannot pass non-trivial object of type 'FString' to variadic function; --- src/gamedata/d_dehacked.cpp | 2 +- src/playsim/p_maputl.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gamedata/d_dehacked.cpp b/src/gamedata/d_dehacked.cpp index 7efb82fea4..a80b8e1244 100644 --- a/src/gamedata/d_dehacked.cpp +++ b/src/gamedata/d_dehacked.cpp @@ -2382,7 +2382,7 @@ static int PatchCodePtrs (int dummy) if (!symname.CompareNoCase(MBFCodePointers[i].alias)) { symname = MBFCodePointers[i].name.GetChars(); - DPrintf(DMSG_SPAMMY, "%s --> %s\n", MBFCodePointers[i].alias, MBFCodePointers[i].name.GetChars()); + DPrintf(DMSG_SPAMMY, "%s --> %s\n", MBFCodePointers[i].alias.GetChars(), MBFCodePointers[i].name.GetChars()); ismbfcp = true; break; } diff --git a/src/playsim/p_maputl.cpp b/src/playsim/p_maputl.cpp index 34fde50451..68ab182e3b 100644 --- a/src/playsim/p_maputl.cpp +++ b/src/playsim/p_maputl.cpp @@ -1688,7 +1688,7 @@ int P_CheckFov(AActor* t1, AActor* t2, double fov) return absangle(t1->AngleTo(t2), t1->Angles.Yaw) <= fov; } -DEFINE_ACTION_FUNCTION(AActor, CheckFov, P_CheckFov) +DEFINE_ACTION_FUNCTION_NATIVE(AActor, CheckFov, P_CheckFov) { PARAM_SELF_PROLOGUE(AActor); PARAM_POINTER(t, AActor);