zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix compile errors

Browse source
This commit is contained in:
Magnus Norddahl 2018-11-18 03:28:57 +01:00
parent 292cf93fa7
commit 4e0c5cf16c
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_dehacked.cpp
View file

@ -676,7 +676,7 @@ static void CreateFaceFunc(EmitterArray &emitters, int value1, int value2)
static void CreateScratchFunc(EmitterArray &emitters, int value1, int value2) static void CreateScratchFunc(EmitterArray &emitters, int value1, int value2)
{ // A_CustomMeleeAttack { // A_CustomMeleeAttack
emitters.AddParameterIntConst(value1); // damage 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(0); // miss sound
emitters.AddParameterIntConst(NAME_None); // damage type emitters.AddParameterIntConst(NAME_None); // damage type
emitters.AddParameterIntConst(true); // bleed 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) // misc1 = sound, misc2 = attenuation none (true) or normal (false)
static void CreatePlaySoundFunc(EmitterArray &emitters, int value1, int value2) static void CreatePlaySoundFunc(EmitterArray &emitters, int value1, int value2)
{ // A_PlaySound { // 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.AddParameterIntConst(CHAN_BODY); // channel
emitters.AddParameterFloatConst(1); // volume emitters.AddParameterFloatConst(1); // volume
emitters.AddParameterIntConst(false); // looping emitters.AddParameterIntConst(false); // looping

1
src/scripting/backend/vmbuilder.h
View file

@ -3,6 +3,7 @@
#include "dobject.h" #include "dobject.h"
#include "vmintern.h" #include "vmintern.h"
#include <vector>
class VMFunctionBuilder; class VMFunctionBuilder;
class FxExpression; class FxExpression;