mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-26 22:11:43 +00:00
Attempts to fix errors introduced by merging of asmjit branch and wea… (#649)
* 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
This commit is contained in:
parent
c41603c171
commit
6dd73e43fd
4 changed files with 4 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
#ifndef __M_CHEAT_H__
|
||||
#define __M_CHEAT_H__
|
||||
|
||||
#include "zstring.h"
|
||||
|
||||
//
|
||||
// CHEAT SEQUENCE PACKAGE
|
||||
//
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include "vm.h"
|
||||
#include "scriptutil.h"
|
||||
#include "p_acs.h"
|
||||
#include "actor.h"
|
||||
|
||||
|
||||
static TArray<VMValue> parameters;
|
||||
|
|
Loading…
Reference in a new issue