SVN r518 (trunk)

This commit is contained in:
Christoph Oelckers 2007-04-25 14:20:35 +00:00
parent 9deec29b34
commit 8e229fa2b6
2 changed files with 3 additions and 1 deletions

View file

@ -4999,7 +4999,7 @@ int DLevelScript::RunScript ()
while ( (actor = iterator.Next ()) ) while ( (actor = iterator.Next ()) )
{ {
state = RUNTIME_TYPE(activator)->ActorInfo->FindState (statelist.Size(), &statelist[0], !!STACK(1)); state = RUNTIME_TYPE(actor)->ActorInfo->FindState (statelist.Size(), &statelist[0], !!STACK(1));
if (state != NULL) if (state != NULL)
{ {
actor->SetState (state); actor->SetState (state);

View file

@ -1426,6 +1426,7 @@ FUNC(LS_Thing_Stop)
if (it != NULL) if (it != NULL)
{ {
it->momx = it->momy = it->momz = 0; it->momx = it->momy = it->momz = 0;
if (it->player != NULL) it->player->momx = it->player->momy = 0;
ok = true; ok = true;
} }
} }
@ -1436,6 +1437,7 @@ FUNC(LS_Thing_Stop)
while ( (target = iterator.Next ()) ) while ( (target = iterator.Next ()) )
{ {
target->momx = target->momy = target->momz = 0; target->momx = target->momy = target->momz = 0;
if (target->player != NULL) target->player->momx = target->player->momy = 0;
ok = true; ok = true;
} }
} }