mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-10 23:01:59 +00:00
Merge remote-tracking branch 'remotes/zdoom/master'
This commit is contained in:
commit
ce714ac519
2 changed files with 6 additions and 1 deletions
|
@ -5567,6 +5567,11 @@ doplaysound: if (funcIndex == ACSF_PlayActorSound)
|
||||||
if (argCount >= 2)
|
if (argCount >= 2)
|
||||||
{
|
{
|
||||||
const char *a, *b;
|
const char *a, *b;
|
||||||
|
// If the string indicies are the same, then they are the same string.
|
||||||
|
if (args[0] == args[1])
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
a = FBehavior::StaticLookupString(args[0]);
|
a = FBehavior::StaticLookupString(args[0]);
|
||||||
b = FBehavior::StaticLookupString(args[1]);
|
b = FBehavior::StaticLookupString(args[1]);
|
||||||
|
|
||||||
|
|
|
@ -1132,7 +1132,7 @@ FUNC(LS_Teleport_Line)
|
||||||
|
|
||||||
static void ThrustThingHelper(AActor *it, DAngle angle, double force, INTBOOL nolimit)
|
static void ThrustThingHelper(AActor *it, DAngle angle, double force, INTBOOL nolimit)
|
||||||
{
|
{
|
||||||
it->VelFromAngle(angle, force);
|
it->Thrust(angle, force);
|
||||||
if (!nolimit)
|
if (!nolimit)
|
||||||
{
|
{
|
||||||
it->Vel.X = clamp(it->Vel.X, -MAXMOVE, MAXMOVE);
|
it->Vel.X = clamp(it->Vel.X, -MAXMOVE, MAXMOVE);
|
||||||
|
|
Loading…
Reference in a new issue