diff --git a/src/p_acs.cpp b/src/p_acs.cpp index 30b9a4dd7..4ec709539 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -4999,7 +4999,7 @@ int DLevelScript::RunScript () 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) { actor->SetState (state); diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp index bc4fa25d7..62c490f8d 100644 --- a/src/p_lnspec.cpp +++ b/src/p_lnspec.cpp @@ -1426,6 +1426,7 @@ FUNC(LS_Thing_Stop) if (it != NULL) { it->momx = it->momy = it->momz = 0; + if (it->player != NULL) it->player->momx = it->player->momy = 0; ok = true; } } @@ -1436,6 +1437,7 @@ FUNC(LS_Thing_Stop) while ( (target = iterator.Next ()) ) { target->momx = target->momy = target->momz = 0; + if (target->player != NULL) target->player->momx = target->player->momy = 0; ok = true; } }