From 3d7b4d946bfc984be9a0388a21b73f2cd7a73e38 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 8 Jan 2019 10:13:41 +0200 Subject: [PATCH] - fixed build of optimized targets Undefined symbols for architecture x86_64: "AActor::__GetLevel() const", referenced from: FModelRenderer::RenderModel(float, float, float, FSpriteModelFrame*, AActor*, double) in models.cpp.o FCajunMaster::RemoveAllBots(bool) in b_game.cpp.o AF_AAmbientSound_Tick(VMValue*, int, VMReturn*, int) in s_advsound.cpp.o V_AddPlayerBlend(player_t*, float*, float, int) in v_blend.cpp.o ModActorFlag(AActor*, FString const&, bool, bool) in thingdef_properties.cpp.o --- src/b_game.cpp | 1 + src/r_data/models/models.cpp | 1 + src/s_advsound.cpp | 1 + src/scripting/thingdef_properties.cpp | 1 + src/v_blend.cpp | 1 + 5 files changed, 5 insertions(+) diff --git a/src/b_game.cpp b/src/b_game.cpp index 99b8c83f54..b38351fe8f 100644 --- a/src/b_game.cpp +++ b/src/b_game.cpp @@ -93,6 +93,7 @@ Everything that is changed is marked (maybe commented) with "Added by MC" #include "events.h" #include "vm.h" #include "g_levellocals.h" +#include "actorinlines.h" static FRandom pr_botspawn ("BotSpawn"); diff --git a/src/r_data/models/models.cpp b/src/r_data/models/models.cpp index 25074a4c99..c33c18450d 100644 --- a/src/r_data/models/models.cpp +++ b/src/r_data/models/models.cpp @@ -42,6 +42,7 @@ #include "r_data/models/models_ue1.h" #include "r_data/models/models_obj.h" #include "i_time.h" +#include "actorinlines.h" #ifdef _MSC_VER #pragma warning(disable:4244) // warning C4244: conversion from 'double' to 'float', possible loss of data diff --git a/src/s_advsound.cpp b/src/s_advsound.cpp index c03ec79b09..a3ed4fe27c 100644 --- a/src/s_advsound.cpp +++ b/src/s_advsound.cpp @@ -47,6 +47,7 @@ #include "g_levellocals.h" #include "r_data/sprites.h" #include "vm.h" +#include "actorinlines.h" // MACROS ------------------------------------------------------------------ diff --git a/src/scripting/thingdef_properties.cpp b/src/scripting/thingdef_properties.cpp index b20cd1d567..c70e5a9af2 100644 --- a/src/scripting/thingdef_properties.cpp +++ b/src/scripting/thingdef_properties.cpp @@ -54,6 +54,7 @@ #include "a_keys.h" #include "g_levellocals.h" #include "types.h" +#include "actorinlines.h" //========================================================================== // diff --git a/src/v_blend.cpp b/src/v_blend.cpp index faefff3d7b..630dec6dc5 100644 --- a/src/v_blend.cpp +++ b/src/v_blend.cpp @@ -44,6 +44,7 @@ #include "d_player.h" #include "g_levellocals.h" #include "vm.h" +#include "actorinlines.h" CVAR( Float, blood_fade_scalar, 1.0f, CVAR_ARCHIVE ) // [SP] Pulled from Skulltag - changed default from 0.5 to 1.0 CVAR( Float, pickup_fade_scalar, 1.0f, CVAR_ARCHIVE ) // [SP] Uses same logic as blood_fade_scalar except for pickups