zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/j-palomo/zdoom

This commit is contained in:
Christoph Oelckers 2014-10-21 14:28:31 +02:00
parent 09e0758507 82255c4dfd
commit ccbdcfea81
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/p_acs.cpp
View File

@ -5619,15 +5619,27 @@ doplaysound: if (funcIndex == ACSF_PlayActorSound)
wallMask = args[6]; wallMask = args[6];
} }
bool forceTID = 0;
if (argCount >= 8)
{
if (args[7] != 0)
forceTID = 1;
}
AActor* pickedActor = P_LinePickActor(actor, args[1] << 16, args[3], args[2] << 16, actorMask, wallMask); AActor* pickedActor = P_LinePickActor(actor, args[1] << 16, args[3], args[2] << 16, actorMask, wallMask);
if (pickedActor == NULL) { if (pickedActor == NULL) {
return 0; return 0;
} }
if (!(forceTID) && (args[4] == 0) && (pickedActor->tid == 0))
return 0;
if ((pickedActor->tid == 0) || (forceTID))
{
pickedActor->RemoveFromHash(); pickedActor->RemoveFromHash();
pickedActor->tid = args[4]; pickedActor->tid = args[4];
pickedActor->AddToHash(); pickedActor->AddToHash();
}
return 1; return 1;
} }
break; break;