mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-11 15:22:16 +00:00
Merge branch 'master' of https://github.com/rheit/zdoom
This commit is contained in:
commit
68501dc784
3 changed files with 15 additions and 2 deletions
|
@ -5397,6 +5397,7 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args, const
|
||||||
FName damagetype = argCount > 5 && args[5]? FName(FBehavior::StaticLookupString(args[5])) : NAME_None;
|
FName damagetype = argCount > 5 && args[5]? FName(FBehavior::StaticLookupString(args[5])) : NAME_None;
|
||||||
fixed_t range = argCount > 6 && args[6]? args[6] : MISSILERANGE;
|
fixed_t range = argCount > 6 && args[6]? args[6] : MISSILERANGE;
|
||||||
int flags = argCount > 7 && args[7]? args[7] : 0;
|
int flags = argCount > 7 && args[7]? args[7] : 0;
|
||||||
|
int pufftid = argCount > 8 && args[8]? args[8] : 0;
|
||||||
|
|
||||||
int fhflags = 0;
|
int fhflags = 0;
|
||||||
if (flags & FHF_NORANDOMPUFFZ) fhflags |= LAF_NORANDOMPUFFZ;
|
if (flags & FHF_NORANDOMPUFFZ) fhflags |= LAF_NORANDOMPUFFZ;
|
||||||
|
@ -5404,7 +5405,12 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args, const
|
||||||
|
|
||||||
if (args[0] == 0)
|
if (args[0] == 0)
|
||||||
{
|
{
|
||||||
P_LineAttack(activator, angle, range, pitch, damage, damagetype, pufftype, fhflags);
|
AActor *puff = P_LineAttack(activator, angle, range, pitch, damage, damagetype, pufftype, fhflags);
|
||||||
|
if (puff != NULL && pufftid != 0)
|
||||||
|
{
|
||||||
|
puff->tid = pufftid;
|
||||||
|
puff->AddToHash();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -5413,7 +5419,12 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args, const
|
||||||
|
|
||||||
while ((source = it.Next()) != NULL)
|
while ((source = it.Next()) != NULL)
|
||||||
{
|
{
|
||||||
P_LineAttack(source, angle, range, pitch, damage, damagetype, pufftype, fhflags);
|
AActor *puff = P_LineAttack(source, angle, range, pitch, damage, damagetype, pufftype, fhflags);
|
||||||
|
if (puff != NULL && pufftid != 0)
|
||||||
|
{
|
||||||
|
puff->tid = pufftid;
|
||||||
|
puff->AddToHash();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -370,6 +370,7 @@ Names
|
||||||
"doom.wad"
|
"doom.wad"
|
||||||
"doom1.wad"
|
"doom1.wad"
|
||||||
"heretic.wad"
|
"heretic.wad"
|
||||||
|
"hereticsr.wad"
|
||||||
"heretic1.wad"
|
"heretic1.wad"
|
||||||
"hexen.wad"
|
"hexen.wad"
|
||||||
"hexdd.wad"
|
"hexdd.wad"
|
||||||
|
|
|
@ -448,6 +448,7 @@ OptionMenu "CustomizeControls"
|
||||||
Control "Strafe right", "+moveright"
|
Control "Strafe right", "+moveright"
|
||||||
Control "Turn left", "+left"
|
Control "Turn left", "+left"
|
||||||
Control "Turn right", "+right"
|
Control "Turn right", "+right"
|
||||||
|
Control "Quick Turn", "turn180"
|
||||||
Control "Jump", "+jump"
|
Control "Jump", "+jump"
|
||||||
Control "Crouch", "+crouch"
|
Control "Crouch", "+crouch"
|
||||||
Control "Crouch Toggle", "crouch"
|
Control "Crouch Toggle", "crouch"
|
||||||
|
|
Loading…
Reference in a new issue