From 6dd73e43fd9357d2fd0b0ef43e37b9d69a35494c Mon Sep 17 00:00:00 2001
From: SanyaWaffles <SanyaWaffles@users.noreply.github.com>
Date: Sat, 1 Dec 2018 01:31:25 -0500
Subject: [PATCH] =?UTF-8?q?Attempts=20to=20fix=20errors=20introduced=20by?=
 =?UTF-8?q?=20merging=20of=20asmjit=20branch=20and=20wea=E2=80=A6=20(#649)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Attempts to fix errors introduced by merging of asmjit branch and weapons scripting branch

* This didn't work. The others should work though.

* fix scriptutil.cpp:(.text+0x18d): undefined reference to `PClass::FindActor(FName)'

* Attempt to fix compilation on macOS
---
 src/m_cheat.cpp             | 1 +
 src/m_cheat.h               | 2 ++
 src/posix/cocoa/i_system.mm | 3 ---
 src/scriptutil.cpp          | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/m_cheat.cpp b/src/m_cheat.cpp
index f9c0f6783..73fc5e814 100644
--- a/src/m_cheat.cpp
+++ b/src/m_cheat.cpp
@@ -53,6 +53,7 @@
 #include "a_morph.h"
 #include "g_levellocals.h"
 #include "vm.h"
+#include "zstring.h"
 
 // [RH] Actually handle the cheat. The cheat code in st_stuff.c now just
 // writes some bytes to the network data stream, and the network code
diff --git a/src/m_cheat.h b/src/m_cheat.h
index a6bb5ab68..f2160b729 100644
--- a/src/m_cheat.h
+++ b/src/m_cheat.h
@@ -1,6 +1,8 @@
 #ifndef __M_CHEAT_H__
 #define __M_CHEAT_H__
 
+#include "zstring.h"
+
 //
 // CHEAT SEQUENCE PACKAGE
 //
diff --git a/src/posix/cocoa/i_system.mm b/src/posix/cocoa/i_system.mm
index 8ceaaf359..870d4b8bb 100644
--- a/src/posix/cocoa/i_system.mm
+++ b/src/posix/cocoa/i_system.mm
@@ -141,10 +141,7 @@ static void I_FatalError(const char* const error, va_list ap)
 
 		char errortext[MAX_ERRORTEXT];
 		int index;
-		va_list argptr;
-		va_start(argptr, error);
 		index = vsnprintf(errortext, MAX_ERRORTEXT, error, ap);
-		va_end(argptr);
 
 		extern void Mac_I_FatalError(const char*);
 		Mac_I_FatalError(errortext);
diff --git a/src/scriptutil.cpp b/src/scriptutil.cpp
index f5d88087b..3ba2ce451 100644
--- a/src/scriptutil.cpp
+++ b/src/scriptutil.cpp
@@ -29,6 +29,7 @@
 #include "vm.h"
 #include "scriptutil.h"
 #include "p_acs.h"
+#include "actor.h"
 
 
 static TArray<VMValue> parameters;