From 4e0c5cf16cdeefd909f349b97c82f25502622b40 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sun, 18 Nov 2018 03:28:57 +0100 Subject: [PATCH] - fix compile errors --- src/d_dehacked.cpp | 4 ++-- src/scripting/backend/vmbuilder.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/d_dehacked.cpp b/src/d_dehacked.cpp index d3bd4334f5..aaac4b8792 100644 --- a/src/d_dehacked.cpp +++ b/src/d_dehacked.cpp @@ -676,7 +676,7 @@ static void CreateFaceFunc(EmitterArray &emitters, int value1, int value2) static void CreateScratchFunc(EmitterArray &emitters, int value1, int value2) { // A_CustomMeleeAttack emitters.AddParameterIntConst(value1); // damage - emitters.AddParameterIntConst(value2 ? SoundMap[value2 - 1] : 0); // hit sound + emitters.AddParameterIntConst(value2 ? (int)SoundMap[value2 - 1] : 0); // hit sound emitters.AddParameterIntConst(0); // miss sound emitters.AddParameterIntConst(NAME_None); // damage type emitters.AddParameterIntConst(true); // bleed @@ -685,7 +685,7 @@ static void CreateScratchFunc(EmitterArray &emitters, int value1, int value2) // misc1 = sound, misc2 = attenuation none (true) or normal (false) static void CreatePlaySoundFunc(EmitterArray &emitters, int value1, int value2) { // A_PlaySound - emitters.AddParameterIntConst(value1 ? SoundMap[value1 - 1] : 0); // soundid + emitters.AddParameterIntConst(value1 ? (int)SoundMap[value1 - 1] : 0); // soundid emitters.AddParameterIntConst(CHAN_BODY); // channel emitters.AddParameterFloatConst(1); // volume emitters.AddParameterIntConst(false); // looping diff --git a/src/scripting/backend/vmbuilder.h b/src/scripting/backend/vmbuilder.h index 38e05de9bb..eb28f20d97 100644 --- a/src/scripting/backend/vmbuilder.h +++ b/src/scripting/backend/vmbuilder.h @@ -3,6 +3,7 @@ #include "dobject.h" #include "vmintern.h" +#include class VMFunctionBuilder; class FxExpression;