Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make magic teleportation attempts detectable even when teleportation is disabled (bug #3765) #2082

Merged
merged 1 commit into from
Feb 22, 2019

Conversation

Capostrophic
Copy link
Collaborator

Bug 3765

Add teleportation effects to the list even if they're not going to work due to teleportation being disabled. Disabled teleportation handling was moved from checkEffectTarget to applyInstantEffect. This allows them to be detected by scripting, and also allows teleportation magic VFX to play properly even if teleportation is disabled, which is what I observe in Morrowind.

Also I reduced Intervention effects code duplication.

Works in my testing of a script that simply checks player->getEffect sEffectMark every frame to show a messagebox:
screenshot033

@psi29a psi29a merged commit cc214cf into OpenMW:master Feb 22, 2019
@Capostrophic Capostrophic deleted the teleporting branch February 22, 2019 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants